CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 10 Aug 2024 06:24:25 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 10 06:24:25 UTC 2024

Modified Files:
        pkgsrc/devel/py-test-fixture-config: distinfo
        pkgsrc/devel/py-test-fixture-config/patches: patch-common_setup.py
        pkgsrc/devel/py-test-shutil: Makefile PLIST distinfo
        pkgsrc/devel/py-test-shutil/patches: patch-common_setup.py
        pkgsrc/devel/py-test-virtualenv: distinfo
        pkgsrc/devel/py-test-virtualenv/patches: patch-common_setup.py

Log Message:
*: fix build with latest setuptools


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-test-fixture-config/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/py-test-fixture-config/patches/patch-common_setup.py
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-test-shutil/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-test-shutil/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-test-shutil/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/py-test-shutil/patches/patch-common_setup.py
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-test-virtualenv/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/py-test-virtualenv/patches/patch-common_setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-test-fixture-config/distinfo
diff -u pkgsrc/devel/py-test-fixture-config/distinfo:1.7 pkgsrc/devel/py-test-fixture-config/distinfo:1.8
--- pkgsrc/devel/py-test-fixture-config/distinfo:1.7    Tue Oct 26 10:19:08 2021
+++ pkgsrc/devel/py-test-fixture-config/distinfo        Sat Aug 10 06:24:24 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:19:08 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/08/10 06:24:24 wiz Exp $
 
 BLAKE2s (pytest-fixture-config-1.7.0.tar.gz) = f1e7c0fff170086a7222a3bdf7441a941be2757864aa0943364d6a4d648d5ecf
 SHA512 (pytest-fixture-config-1.7.0.tar.gz) = c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
 Size (pytest-fixture-config-1.7.0.tar.gz) = 9884 bytes
-SHA1 (patch-common_setup.py) = 5c74ba132a8d3482a07480687b5d27b0481007a7
+SHA1 (patch-common_setup.py) = 32f5e35d4e7cc5dc95bb175ccbc2db6e48e9212c

Index: pkgsrc/devel/py-test-fixture-config/patches/patch-common_setup.py
diff -u pkgsrc/devel/py-test-fixture-config/patches/patch-common_setup.py:1.1 pkgsrc/devel/py-test-fixture-config/patches/patch-common_setup.py:1.2
--- pkgsrc/devel/py-test-fixture-config/patches/patch-common_setup.py:1.1       Sat Mar 24 07:14:59 2018
+++ pkgsrc/devel/py-test-fixture-config/patches/patch-common_setup.py   Sat Aug 10 06:24:24 2024
@@ -1,10 +1,19 @@
-$NetBSD: patch-common_setup.py,v 1.1 2018/03/24 07:14:59 adam Exp $
+$NetBSD: patch-common_setup.py,v 1.2 2024/08/10 06:24:24 wiz Exp $
 
+Fix build with latest setuptools.
 Do not depend on setuptools-git.
 
---- common_setup.py.orig       2018-03-24 07:08:04.000000000 +0000
+--- common_setup.py.orig       2019-05-28 06:32:17.000000000 +0000
 +++ common_setup.py
-@@ -72,6 +72,5 @@ def common_setup(src_dir):
+@@ -38,7 +38,6 @@ class EggInfo(EggInfoCommand):
+     def run(self):
+         if self.distribution.extras_require is None:
+             self.distribution.extras_require = {}
+-        self.distribution.extras_require['tests'] = self.distribution.tests_require
+         EggInfoCommand.run(self)
+ 
+ 
+@@ -72,6 +71,5 @@ def common_setup(src_dir):
              license='MIT license',
              platforms=['unix', 'linux'],
              cmdclass={'test': PyTest, 'egg_info': EggInfo},

Index: pkgsrc/devel/py-test-shutil/Makefile
diff -u pkgsrc/devel/py-test-shutil/Makefile:1.7 pkgsrc/devel/py-test-shutil/Makefile:1.8
--- pkgsrc/devel/py-test-shutil/Makefile:1.7    Tue Apr 25 14:42:41 2023
+++ pkgsrc/devel/py-test-shutil/Makefile        Sat Aug 10 06:24:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/04/25 14:42:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/08/10 06:24:24 wiz Exp $
 
 DISTNAME=      pytest-shutil-1.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,6 +11,8 @@ HOMEPAGE=     https://github.com/manahl/pyte
 COMMENT=       Unix shell and environment tools for py.test
 LICENSE=       mit
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2
 DEPENDS+=      ${PYPKGPREFIX}-execnet-[0-9]*:../../devel/py-execnet
 DEPENDS+=      ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
@@ -23,5 +25,5 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
 
 USE_LANGUAGES= # none
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-test-shutil/PLIST
diff -u pkgsrc/devel/py-test-shutil/PLIST:1.1 pkgsrc/devel/py-test-shutil/PLIST:1.2
--- pkgsrc/devel/py-test-shutil/PLIST:1.1       Sat Mar 24 06:49:39 2018
+++ pkgsrc/devel/py-test-shutil/PLIST   Sat Aug 10 06:24:24 2024
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2018/03/24 06:49:39 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2024/08/10 06:24:24 wiz Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/pytest_shutil/__init__.py
 ${PYSITELIB}/pytest_shutil/__init__.pyc
 ${PYSITELIB}/pytest_shutil/__init__.pyo

Index: pkgsrc/devel/py-test-shutil/distinfo
diff -u pkgsrc/devel/py-test-shutil/distinfo:1.8 pkgsrc/devel/py-test-shutil/distinfo:1.9
--- pkgsrc/devel/py-test-shutil/distinfo:1.8    Tue Apr 25 14:42:41 2023
+++ pkgsrc/devel/py-test-shutil/distinfo        Sat Aug 10 06:24:24 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2023/04/25 14:42:41 wiz Exp $
+$NetBSD: distinfo,v 1.9 2024/08/10 06:24:24 wiz Exp $
 
 BLAKE2s (pytest-shutil-1.7.0.tar.gz) = 18515173e63d9d303b94f421aa54601a6a21c169c524de5682ac22cb78b79980
 SHA512 (pytest-shutil-1.7.0.tar.gz) = 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
 Size (pytest-shutil-1.7.0.tar.gz) = 23497 bytes
-SHA1 (patch-common_setup.py) = 5cb1d52a64e86043fc26e7e898b6411b7ad69b41
+SHA1 (patch-common_setup.py) = e7507246a99ba99918647e05d0fbec72560eeae8

Index: pkgsrc/devel/py-test-shutil/patches/patch-common_setup.py
diff -u pkgsrc/devel/py-test-shutil/patches/patch-common_setup.py:1.1 pkgsrc/devel/py-test-shutil/patches/patch-common_setup.py:1.2
--- pkgsrc/devel/py-test-shutil/patches/patch-common_setup.py:1.1       Sat Mar 24 07:14:59 2018
+++ pkgsrc/devel/py-test-shutil/patches/patch-common_setup.py   Sat Aug 10 06:24:24 2024
@@ -1,10 +1,19 @@
-$NetBSD: patch-common_setup.py,v 1.1 2018/03/24 07:14:59 adam Exp $
+$NetBSD: patch-common_setup.py,v 1.2 2024/08/10 06:24:24 wiz Exp $
 
+Fix compat with latest setuptools.
 Do not depend on setuptools-git.
 
---- common_setup.py.orig       2018-03-24 07:10:19.000000000 +0000
+--- common_setup.py.orig       2019-05-28 06:32:17.000000000 +0000
 +++ common_setup.py
-@@ -72,6 +72,5 @@ def common_setup(src_dir):
+@@ -38,7 +38,6 @@ class EggInfo(EggInfoCommand):
+     def run(self):
+         if self.distribution.extras_require is None:
+             self.distribution.extras_require = {}
+-        self.distribution.extras_require['tests'] = self.distribution.tests_require
+         EggInfoCommand.run(self)
+ 
+ 
+@@ -72,6 +71,5 @@ def common_setup(src_dir):
              license='MIT license',
              platforms=['unix', 'linux'],
              cmdclass={'test': PyTest, 'egg_info': EggInfo},

Index: pkgsrc/devel/py-test-virtualenv/distinfo
diff -u pkgsrc/devel/py-test-virtualenv/distinfo:1.7 pkgsrc/devel/py-test-virtualenv/distinfo:1.8
--- pkgsrc/devel/py-test-virtualenv/distinfo:1.7        Tue Oct 26 10:19:10 2021
+++ pkgsrc/devel/py-test-virtualenv/distinfo    Sat Aug 10 06:24:25 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:19:10 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/08/10 06:24:25 wiz Exp $
 
 BLAKE2s (pytest-virtualenv-1.7.0.tar.gz) = 90405e1e819722b0e9f94e89a5cfaa14b2e7da58fe94194ff2fde3f80a4e7b17
 SHA512 (pytest-virtualenv-1.7.0.tar.gz) = 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
 Size (pytest-virtualenv-1.7.0.tar.gz) = 15767 bytes
-SHA1 (patch-common_setup.py) = 5cb1d52a64e86043fc26e7e898b6411b7ad69b41
+SHA1 (patch-common_setup.py) = 281711314054d76445ac3f4b3ebbb11615fe0949

Index: pkgsrc/devel/py-test-virtualenv/patches/patch-common_setup.py
diff -u pkgsrc/devel/py-test-virtualenv/patches/patch-common_setup.py:1.1 pkgsrc/devel/py-test-virtualenv/patches/patch-common_setup.py:1.2
--- pkgsrc/devel/py-test-virtualenv/patches/patch-common_setup.py:1.1   Sat Mar 24 07:14:59 2018
+++ pkgsrc/devel/py-test-virtualenv/patches/patch-common_setup.py       Sat Aug 10 06:24:25 2024
@@ -1,10 +1,19 @@
-$NetBSD: patch-common_setup.py,v 1.1 2018/03/24 07:14:59 adam Exp $
+$NetBSD: patch-common_setup.py,v 1.2 2024/08/10 06:24:25 wiz Exp $
 
+Fix build with latest setuptools.
 Do not depend on setuptools-git.
 
---- common_setup.py.orig       2018-03-24 07:10:19.000000000 +0000
+--- common_setup.py.orig       2019-05-28 06:32:19.000000000 +0000
 +++ common_setup.py
-@@ -72,6 +72,5 @@ def common_setup(src_dir):
+@@ -38,7 +38,6 @@ class EggInfo(EggInfoCommand):
+     def run(self):
+         if self.distribution.extras_require is None:
+             self.distribution.extras_require = {}
+-        self.distribution.extras_require['tests'] = self.distribution.tests_require
+         EggInfoCommand.run(self)
+ 
+ 
+@@ -72,6 +71,5 @@ def common_setup(src_dir):
              license='MIT license',
              platforms=['unix', 'linux'],
              cmdclass={'test': PyTest, 'egg_info': EggInfo},

Prev by Date: CVS commit: pkgsrc/math/py-theano-pymc
Next by Date: CVS commit: pkgsrc/chat/mautrix-telegram
Previous by Thread: CVS commit: pkgsrc/math/py-theano-pymc
Next by Thread: CVS commit: pkgsrc/chat/mautrix-telegram
Indexes:

Home | Main Index | Thread Index | Old Index