Received: by mail.netbsd.org (Postfix, from userid 605) id D008B84EA0; Thu, 25 Aug 2022 19:56:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1541784E63 for ; Thu, 25 Aug 2022 19:56:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GXFIWNOVFgE0 for ; Thu, 25 Aug 2022 19:56:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DA60C84CF8 for ; Thu, 25 Aug 2022 19:56:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D35C5F9EA; Thu, 25 Aug 2022 19:56:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1661457367270010" MIME-Version: 1.0 Date: Thu, 25 Aug 2022 19:56:07 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools/url2pkg/files/python To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20220825195607.D35C5F9EA@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1661457367270010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Thu Aug 25 19:56:07 UTC 2022 Modified Files: pkgsrc/pkgtools/url2pkg/files/python: url2pkg.py pkgsrc/pkgtools/url2pkg/files/python/distutils: __init__.py core.py extension.py version.py pkgsrc/pkgtools/url2pkg/files/python/setuptools: dist.py pkgsrc/pkgtools/url2pkg/files/python/setuptools/command: build_ext.py install.py sdist.py Log Message: pkgtools/url2pkg: fix line ends To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/url2pkg/files/python/url2pkg.py cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/pkgtools/url2pkg/files/python/distutils/__init__.py \ pkgsrc/pkgtools/url2pkg/files/python/distutils/core.py \ pkgsrc/pkgtools/url2pkg/files/python/distutils/extension.py \ pkgsrc/pkgtools/url2pkg/files/python/distutils/version.py cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/pkgtools/url2pkg/files/python/setuptools/dist.py cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/build_ext.py \ pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/install.py \ pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/sdist.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1661457367270010 Content-Disposition: inline Content-Length: 11293 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/url2pkg/files/python/url2pkg.py diff -u pkgsrc/pkgtools/url2pkg/files/python/url2pkg.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/url2pkg.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/url2pkg.py:1.1 Sat Jul 16 08:59:38 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/url2pkg.py Thu Aug 25 19:56:07 2022 @@ -1,40 +1,40 @@ -# $NetBSD: url2pkg.py,v 1.1 2022/07/16 08:59:38 rillig Exp $ -# -# Forwards the module metadata from distutils and setuptools to url2pkg. - -def print_depends(varname, depends): - for dep in depends: - print('%s\t%s%s' % (varname, dep.replace(' ', ''), '' if '>' in dep else '>=0')) - - -def print_var(varname, value): - if value != '': - print('var\t%s\t%s' % (varname, value)) - - -def print_cmd(cmd, arg): - print('\t'.join(('cmd', cmd, arg))) - - -def print_license(license_name): - if license_name == '': - return - print_cmd('license', license_name) - print_cmd( - 'license_default', - '%s # TODO: from setup.py; needs to be adjusted' % license_name) - - -def setup(**kwargs): - print_depends('DEPENDS', kwargs.get('requires', [])) # only for distutils.core - print_depends('DEPENDS', kwargs.get('install_requires', [])) - print_depends('TEST_DEPENDS', kwargs.get('tests_require', [])) - print_depends('BUILD_DEPENDS', kwargs.get('extras_require', {}).get('dev', [])) - print_depends('BUILD_DEPENDS', kwargs.get('setup_requires', [])) - print_var('COMMENT', kwargs.get('description', '').rstrip('.')) - print_var('HOMEPAGE', kwargs.get('url', '')) - print_license(kwargs.get('license', '')) - - # TODO: implement 'python_requires' - # example pkgsrc package: devel/py-futures - # example values: >=2.6, <3, >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.* +# $NetBSD: url2pkg.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# Forwards the module metadata from distutils and setuptools to url2pkg. + +def print_depends(varname, depends): + for dep in depends: + print('%s\t%s%s' % (varname, dep.replace(' ', ''), '' if '>' in dep else '>=0')) + + +def print_var(varname, value): + if value != '': + print('var\t%s\t%s' % (varname, value)) + + +def print_cmd(cmd, arg): + print('\t'.join(('cmd', cmd, arg))) + + +def print_license(license_name): + if license_name == '': + return + print_cmd('license', license_name) + print_cmd( + 'license_default', + '%s # TODO: from setup.py; needs to be adjusted' % license_name) + + +def setup(**kwargs): + print_depends('DEPENDS', kwargs.get('requires', [])) # only for distutils.core + print_depends('DEPENDS', kwargs.get('install_requires', [])) + print_depends('TEST_DEPENDS', kwargs.get('tests_require', [])) + print_depends('BUILD_DEPENDS', kwargs.get('extras_require', {}).get('dev', [])) + print_depends('BUILD_DEPENDS', kwargs.get('setup_requires', [])) + print_var('COMMENT', kwargs.get('description', '').rstrip('.')) + print_var('HOMEPAGE', kwargs.get('url', '')) + print_license(kwargs.get('license', '')) + + # TODO: implement 'python_requires' + # example pkgsrc package: devel/py-futures + # example values: >=2.6, <3, >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.* Index: pkgsrc/pkgtools/url2pkg/files/python/distutils/__init__.py diff -u pkgsrc/pkgtools/url2pkg/files/python/distutils/__init__.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/distutils/__init__.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/distutils/__init__.py:1.1 Sat Jul 16 08:59:39 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/distutils/__init__.py Thu Aug 25 19:56:07 2022 @@ -1,9 +1,9 @@ -# $NetBSD: __init__.py,v 1.1 2022/07/16 08:59:39 rillig Exp $ -# -# This is a drop-in replacement for the distutils Python module. Instead -# of actually searching for the dependencies, it extracts the dependency -# information and includes it in the generated pkgsrc package Makefile. -# -# https://docs.python.org/3/distutils/ -# As of Python 3.10, distutils is deprecated. -# The successor is setuptools. +# $NetBSD: __init__.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# This is a drop-in replacement for the distutils Python module. Instead +# of actually searching for the dependencies, it extracts the dependency +# information and includes it in the generated pkgsrc package Makefile. +# +# https://docs.python.org/3/distutils/ +# As of Python 3.10, distutils is deprecated. +# The successor is setuptools. Index: pkgsrc/pkgtools/url2pkg/files/python/distutils/core.py diff -u pkgsrc/pkgtools/url2pkg/files/python/distutils/core.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/distutils/core.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/distutils/core.py:1.1 Sat Jul 16 08:59:39 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/distutils/core.py Thu Aug 25 19:56:07 2022 @@ -1,18 +1,18 @@ -# $NetBSD: core.py,v 1.1 2022/07/16 08:59:39 rillig Exp $ -# -# Fake implementation of distutils.core. -# -# https://docs.python.org/3/distutils/apiref.html#module-distutils.core - -import url2pkg - - -# used by pkgsrc package devel/py-pysha3 1.0.2 -def setup(**kwargs): - url2pkg.setup(**kwargs) - - -# Originally from distutils.cmd. -# used by pkgsrc package devel/py-pysha3 1.0.2 -class Command: - pass +# $NetBSD: core.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# Fake implementation of distutils.core. +# +# https://docs.python.org/3/distutils/apiref.html#module-distutils.core + +import url2pkg + + +# used by pkgsrc package devel/py-pysha3 1.0.2 +def setup(**kwargs): + url2pkg.setup(**kwargs) + + +# Originally from distutils.cmd. +# used by pkgsrc package devel/py-pysha3 1.0.2 +class Command: + pass Index: pkgsrc/pkgtools/url2pkg/files/python/distutils/extension.py diff -u pkgsrc/pkgtools/url2pkg/files/python/distutils/extension.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/distutils/extension.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/distutils/extension.py:1.1 Sat Jul 16 08:59:39 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/distutils/extension.py Thu Aug 25 19:56:07 2022 @@ -1,10 +1,10 @@ -# $NetBSD: extension.py,v 1.1 2022/07/16 08:59:39 rillig Exp $ -# -# Fake implementation of distutils.extension -# -# https://docs.python.org/3/distutils/apiref.html#module-distutils.extension - -# used by pkgsrc package devel/py-pysha3 1.0.2 -class Extension: - def __init__(self, *args, **kwargs): - pass +# $NetBSD: extension.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# Fake implementation of distutils.extension +# +# https://docs.python.org/3/distutils/apiref.html#module-distutils.extension + +# used by pkgsrc package devel/py-pysha3 1.0.2 +class Extension: + def __init__(self, *args, **kwargs): + pass Index: pkgsrc/pkgtools/url2pkg/files/python/distutils/version.py diff -u pkgsrc/pkgtools/url2pkg/files/python/distutils/version.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/distutils/version.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/distutils/version.py:1.1 Sat Jul 16 08:59:39 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/distutils/version.py Thu Aug 25 19:56:07 2022 @@ -1,9 +1,9 @@ -# $NetBSD: version.py,v 1.1 2022/07/16 08:59:39 rillig Exp $ -# -# Fake implementation of distutils.version. -# -# https://docs.python.org/3/distutils/apiref.html#module-distutils.version - -# used by pkgsrc package wip/py-torch 1.12.0 -class LooseVersion: - pass +# $NetBSD: version.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# Fake implementation of distutils.version. +# +# https://docs.python.org/3/distutils/apiref.html#module-distutils.version + +# used by pkgsrc package wip/py-torch 1.12.0 +class LooseVersion: + pass Index: pkgsrc/pkgtools/url2pkg/files/python/setuptools/dist.py diff -u pkgsrc/pkgtools/url2pkg/files/python/setuptools/dist.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/setuptools/dist.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/setuptools/dist.py:1.1 Sat Jul 16 08:59:39 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/setuptools/dist.py Thu Aug 25 19:56:07 2022 @@ -1,7 +1,7 @@ -# $NetBSD: dist.py,v 1.1 2022/07/16 08:59:39 rillig Exp $ -# -# Fake implementation for setuptools.dist. - -# used by pkgsrc package wip/py-torch 1.12.0 -class Distribution: - pass +# $NetBSD: dist.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# Fake implementation for setuptools.dist. + +# used by pkgsrc package wip/py-torch 1.12.0 +class Distribution: + pass Index: pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/build_ext.py diff -u pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/build_ext.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/build_ext.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/build_ext.py:1.1 Sat Jul 16 08:59:39 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/build_ext.py Thu Aug 25 19:56:07 2022 @@ -1,7 +1,7 @@ -# $NetBSD: build_ext.py,v 1.1 2022/07/16 08:59:39 rillig Exp $ -# -# Fake implementation of setuptools.command.build_ext. -# -# https://github.com/pypa/setuptools/blob/main/setuptools/command/build_ext.py - -# used by pkgsrc package wip/pytorch 1.12.0 +# $NetBSD: build_ext.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# Fake implementation of setuptools.command.build_ext. +# +# https://github.com/pypa/setuptools/blob/main/setuptools/command/build_ext.py + +# used by pkgsrc package wip/pytorch 1.12.0 Index: pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/install.py diff -u pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/install.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/install.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/install.py:1.1 Sat Jul 16 08:59:39 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/install.py Thu Aug 25 19:56:07 2022 @@ -1,7 +1,7 @@ -# $NetBSD: install.py,v 1.1 2022/07/16 08:59:39 rillig Exp $ -# -# Fake implementation of setuptools.command.install. -# -# https://github.com/pypa/setuptools/blob/main/setuptools/command/install.py - -# used by pkgsrc package wip/pytorch 1.12.0 +# $NetBSD: install.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# Fake implementation of setuptools.command.install. +# +# https://github.com/pypa/setuptools/blob/main/setuptools/command/install.py + +# used by pkgsrc package wip/pytorch 1.12.0 Index: pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/sdist.py diff -u pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/sdist.py:1.1 pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/sdist.py:1.2 --- pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/sdist.py:1.1 Sat Jul 16 08:59:39 2022 +++ pkgsrc/pkgtools/url2pkg/files/python/setuptools/command/sdist.py Thu Aug 25 19:56:07 2022 @@ -1,7 +1,7 @@ -# $NetBSD: sdist.py,v 1.1 2022/07/16 08:59:39 rillig Exp $ -# -# Fake implementation of setuptools.command.sdist. -# -# https://github.com/pypa/setuptools/blob/main/setuptools/command/sdist.py - -# used by pkgsrc package wip/pytorch 1.12.0 +# $NetBSD: sdist.py,v 1.2 2022/08/25 19:56:07 rillig Exp $ +# +# Fake implementation of setuptools.command.sdist. +# +# https://github.com/pypa/setuptools/blob/main/setuptools/command/sdist.py + +# used by pkgsrc package wip/pytorch 1.12.0 --_----------=_1661457367270010--