On Fri, Oct 23, 2020 at 01:20:09PM -0400, Kurt Mosiejczuk wrote:
> On Fri, Oct 23, 2020 at 12:41:49PM -0400, Daniel Dickman wrote:
> > I tried running "make test" under both of the python2 and python3 flavors.
> > Neither worked, but very possible could be something local on my end as my
> > tree has lots of local changes.
> > Under python2 it said it needed py-futures so I put this into the Makefile
> > .if !${FLAVOR:Mpython3}
> > TEST_DEPENDS+= devel/py-futures
> > .endif
> Puzzling but _now_ I get the same result here.
> > Under python3 it complained about "No module named 'packaging'"
> I don't get that. Are you perhaps not running PORTS_PRIVSEP? I think
> those tests are for pulling from the network and it skips them for me
> since it can't get to the network (since I'm running PORTS_PRIVSEP).
Ping. I've added py-packaging to TEST_DEPENDS to fix the issue daniel@ saw.
(I don't see it because the tests using py-packaging don't run when using
PORTS_PRIVSEP).
So this went throught a sparc64 bulk without issues.
ok?
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 17 Oct 2020 23:27:03 -0000 1.39
+++ Makefile 25 Oct 2020 19:25:19 -0000
@@ -2,13 +2,14 @@
COMMENT= simplified packaging system for Python modules
-MODPY_EGG_VERSION= 41.6.0
+# Must be <45.0 to support Python 2.7
+
+MODPY_EGG_VERSION= 44.1.1
DISTNAME= setuptools-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
EPOCH= 0
CATEGORIES= devel
EXTRACT_SUFX= .zip
-REVISION= 0
HOMEPAGE= https://setuptools.readthedocs.io/en/latest/
@@ -32,7 +33,12 @@ FLAVOR?=
# Not listed, but needed for tests
TEST_DEPENDS= devel/py-mock${MODPY_FLAVOR} \
devel/py-pip${MODPY_FLAVOR} \
- devel/py-wheel${MODPY_FLAVOR}
+ devel/py-wheel${MODPY_FLAVOR} \
+ sysutils/py-packaging${MODPY_FLAVOR}
+
+.if !${FLAVOR:Mpython3}
+TEST_DEPENDS+= devel/py-futures
+.endif
# Override automatic py-setuptools depend to avoid recursion
MODPY_SETUPUTILS_DEPEND=
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 19 Nov 2019 20:26:56 -0000 1.15
+++ distinfo 25 Oct 2020 19:25:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (setuptools-41.6.0.zip) = avphs5Hc0Wy4iQ7J9mzEAVqKMabhwrTgxGRRS+Gj1yI=
-SIZE (setuptools-41.6.0.zip) = 852541
+SHA256 (setuptools-44.1.1.zip) = xnqlXbUyoNrcTS4guplhy9PMyE1UTpApaZgiVCtaR2s=
+SIZE (setuptools-44.1.1.zip) = 858770
Index: patches/patch-setup_cfg
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/patches/patch-setup_cfg,v
retrieving revision 1.1
diff -u -p -r1.1 patch-setup_cfg
--- patches/patch-setup_cfg 19 Nov 2019 20:26:56 -0000 1.1
+++ patches/patch-setup_cfg 25 Oct 2020 19:25:19 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-setup_cfg,v 1.1 2019/11/
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
-@@ -49,7 +49,7 @@ classifiers =
+@@ -48,7 +48,7 @@ classifiers =
Topic :: Utilities
[options]
-zip_safe = True
+zip_safe = False
- python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
+ python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
py_modules = easy_install
packages = find:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-setuptools/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 19 Nov 2019 20:26:56 -0000 1.14
+++ pkg/PLIST 25 Oct 2020 19:25:19 -0000
@@ -66,16 +66,16 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}dep_util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}depends.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}dist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}extension.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}glibc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}glob.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}installer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}launch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}lib2to3_ex.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}monkey.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}msvc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}package_index.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}pep425tags.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py27compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py31compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/${MODPY_PYCACHE}py33compat.${MODPY_PYC_MAGIC_TAG}pyc
@@ -108,6 +108,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/${MODPY_PYCACHE}markers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/${MODPY_PYCACHE}requirements.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/${MODPY_PYCACHE}specifiers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/_compat.py
@@ -115,6 +116,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/markers.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/requirements.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/specifiers.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/tags.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/utils.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/packaging/version.py
lib/python${MODPY_VERSION}/site-packages/setuptools/_vendor/pyparsing.py
@@ -177,20 +179,20 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools/dep_util.py
lib/python${MODPY_VERSION}/site-packages/setuptools/depends.py
lib/python${MODPY_VERSION}/site-packages/setuptools/dist.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/errors.py
lib/python${MODPY_VERSION}/site-packages/setuptools/extension.py
lib/python${MODPY_VERSION}/site-packages/setuptools/extern/
lib/python${MODPY_VERSION}/site-packages/setuptools/extern/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools/extern/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/setuptools/extern/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/setuptools/glibc.py
lib/python${MODPY_VERSION}/site-packages/setuptools/glob.py
+lib/python${MODPY_VERSION}/site-packages/setuptools/installer.py
lib/python${MODPY_VERSION}/site-packages/setuptools/launch.py
lib/python${MODPY_VERSION}/site-packages/setuptools/lib2to3_ex.py
lib/python${MODPY_VERSION}/site-packages/setuptools/monkey.py
lib/python${MODPY_VERSION}/site-packages/setuptools/msvc.py
lib/python${MODPY_VERSION}/site-packages/setuptools/namespaces.py
lib/python${MODPY_VERSION}/site-packages/setuptools/package_index.py
-lib/python${MODPY_VERSION}/site-packages/setuptools/pep425tags.py
lib/python${MODPY_VERSION}/site-packages/setuptools/py27compat.py
lib/python${MODPY_VERSION}/site-packages/setuptools/py31compat.py
lib/python${MODPY_VERSION}/site-packages/setuptools/py33compat.py
