setuptools upstream has added an annoying huge deprecation warning
for some license-related settings in pyproject.toml (and maybe also
setup.py) and to avoid it, downstream projects have to move to a
syntax which is only supported by newer setuptools, so we're going
to need to update or do annoying patches in an increasing number of
ports, so I'd like to update setuptools.
unfortunately, it changes a lot of file/directory names when building
other packages - license files move to a subdir, distribution names
are normalized resulting in at least those containing . changing to _.
I'm working on the bulk diff needed for this, but when that's done,
and assuming no big other fallout in the bulk, I'm keen to update
setuptools asap afterwards to stop the huge diff rotting (I am expecting
to need to update plists in 600+ ports) so would appreciate any other
feedback on this so I can address anything if necessary.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/Makefile,v
diff -u -p -r1.60 Makefile
--- Makefile 9 Jan 2025 11:53:28 -0000 1.60
+++ Makefile 26 Apr 2025 14:13:02 -0000
@@ -1,15 +1,15 @@
COMMENT= simplified packaging system for Python modules
# py-types-setuptools should have a matching version
-MODPY_DISTV= 75.6.0
+MODPY_DISTV= 79.0.1
DISTNAME= setuptools-${MODPY_DISTV}
PKGNAME= py-${DISTNAME}
-REVISION= 0
EPOCH= 0
CATEGORIES= devel
+# https://github.com/pypa/setuptools
HOMEPAGE= https://setuptools.readthedocs.io/en/latest/
MAINTAINER= Kurt Mosiejczuk <k...@openbsd.org>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/distinfo,v
diff -u -p -r1.22 distinfo
--- distinfo 6 Jan 2025 11:05:29 -0000 1.22
+++ distinfo 26 Apr 2025 14:13:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (setuptools-75.6.0.tar.gz) =
gZkiJVjffIYhavT4TDDps0ph2LoZNmzJFEJM29KCUvY=
-SIZE (setuptools-75.6.0.tar.gz) = 1337429
+SHA256 (setuptools-79.0.1.tar.gz) =
EoznuPM8MHn9GwZ+y7QFGmboUm57ZfbOwHXfxlDd+og=
+SIZE (setuptools-79.0.1.tar.gz) = 1367909
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/pkg/PLIST,v
diff -u -p -r1.25 PLIST
--- pkg/PLIST 9 Jan 2025 11:53:28 -0000 1.25
+++ pkg/PLIST 26 Apr 2025 14:13:02 -0000
@@ -19,11 +19,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pkg_resources/py.typed
lib/python${MODPY_VERSION}/site-packages/setuptools/
lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/LICENSE
lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/licenses/LICENSE
lib/python${MODPY_VERSION}/site-packages/setuptools-${MODPY_DISTV}.dist-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/setuptools/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}/
@@ -47,6 +48,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}_reqs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}_shutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}_shutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}_static.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}_static.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}archive_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}archive_util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}build_meta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -225,12 +228,50 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}py38.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}py38.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}numpy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}numpy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}py39.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/${MODPY_PYCACHE}py39.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/py38.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/numpy.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compat/py39.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}cygwin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}cygwin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}msvc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}msvc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}unix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}zos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/${MODPY_PYCACHE}zos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/base.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/cygwin.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/errors.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/msvc.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_cygwin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_cygwin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_mingw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_mingw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_msvc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_msvc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_unix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/${MODPY_PYCACHE}test_unix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/test_base.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/test_cygwin.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/test_mingw.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/test_msvc.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/tests/test_unix.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/unix.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/compilers/C/zos.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/core.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/cygwinccompiler.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_distutils/debug.py
@@ -259,6 +300,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/_path.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_reqs.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_shutil.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_static.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/autocommand/
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/
@@ -412,7 +454,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/platformdirs/unix.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/platformdirs/version.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/platformdirs/windows.py
-lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/ruff.toml
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/typeguard/
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/INSTALLER
