From 61129c7e8ef224a05d09760f5b1da359d630e2d9 Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Wed, 12 Feb 2020 22:52:27 +0100 Subject: [PATCH 01/10] py-distlib: Add port --- python/py-distlib/Portfile | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 python/py-distlib/Portfile diff --git a/python/py-distlib/Portfile b/python/py-distlib/Portfile new file mode 100644 index 0000000000000..d69e28f83e9c9 --- /dev/null +++ b/python/py-distlib/Portfile @@ -0,0 +1,29 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 + +PortSystem 1.0 +PortGroup python 1.0 + +name py-distlib +version 0.3.0 +revision 0 +maintainers {@rubendibattista gmail.com:rubendibattista} openmaintainer +platforms darwin +supported_archs noarch +description Low-level components of distutils2/packaging, augmented \ + with higher-level APIs for making packaging easier. +long_description ${description} +homepage https://bitbucket.org/pypa/distlib + +license PSF +use_zip yes + +checksums rmd160 ac1c0dd3f48183155bdc302c1f172ad1f34e7d87 \ + sha256 2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21 \ + size 571953 + +python.versions 27 34 35 36 37 38 + +if {${name} ne ${subport}} { + depends_build-append port:py${python.version}-setuptools + livecheck.type none +} From 7ed3192b9a9d53fddd3a894d1af060aeff33834e Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Thu, 13 Feb 2020 16:18:02 +0100 Subject: [PATCH 02/10] py-importlib-resources: Add port --- python/py-importlib-resources/Portfile | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 python/py-importlib-resources/Portfile diff --git a/python/py-importlib-resources/Portfile b/python/py-importlib-resources/Portfile new file mode 100644 index 0000000000000..906193caf4ab6 --- /dev/null +++ b/python/py-importlib-resources/Portfile @@ -0,0 +1,29 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 + +PortSystem 1.0 +PortGroup python 1.0 + +name py-importlib-resources +version 1.0.2 +revision 0 +maintainers {@rubendibattista gmail.com:rubendibattista} openmaintainer +platforms darwin +supported_archs noarch +description A backport of Python 3.7’s standard library importlib.resources module for Python 2.7, and 3.4 through 3.6. +long_description ${description} +homepage http://importlib-resources.readthedocs.io +distfiles importlib_resources-${version}.tar.gz + +license PSF + +checksums rmd160 ccbed771125ab62eda228842bc87339dd9aa21a8 \ + sha256 d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078 \ + size 23602 + +python.versions 27 34 35 36 + +if {${name} ne ${subport}} { + depends_build-append port:py${python.version}-setuptools \ + port:py${python.version}-wheel + livecheck.type none +} From 331eced541fc764f52a55baa6385d05ae4e25760 Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Thu, 13 Feb 2020 18:32:16 +0100 Subject: [PATCH 03/10] py-setuptools: Bump version to 45.2.0 --- python/py-setuptools/Portfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python/py-setuptools/Portfile b/python/py-setuptools/Portfile index 3d4f2eb0f7ef9..6975cf3370d7f 100644 --- a/python/py-setuptools/Portfile +++ b/python/py-setuptools/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup python 1.0 name py-setuptools -version 43.0.0 +version 45.2.0 categories-append devel # License status is murky. The current maintainer decided to relicense as # MIT, but he doesn't appear to have obtained the permission of previous @@ -25,9 +25,10 @@ supported_archs noarch homepage https://pypi.org/project/setuptools/ use_zip yes -checksums md5 792983f474cd2bd314fa3af28813cdb6 \ - rmd160 b0c380d5789a76b43c409d35f3250efd8577fd91 \ - sha256 db45ebb4a4b3b95ff0aca3ce5fe1e820ce17be393caf8902c78aa36240e8c378 +checksums md5 0c956eea142af9c2b02d72e3c042af30 \ + rmd160 2b6691453a582db383321c5342ae5ae5eedd870b \ + sha256 89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f \ + size 859896 python.versions 26 27 33 34 35 36 37 38 python.link_binaries no From da49c1fc3f40736882d4ae324d9ed5c8b3816b5e Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Thu, 13 Feb 2020 18:32:37 +0100 Subject: [PATCH 04/10] py-setuptools_scm: Add toml dependency --- python/py-setuptools_scm/Portfile | 6 ++++-- python/py-toml/Portfile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/python/py-setuptools_scm/Portfile b/python/py-setuptools_scm/Portfile index 7ea8e11f97489..607d333c32c82 100644 --- a/python/py-setuptools_scm/Portfile +++ b/python/py-setuptools_scm/Portfile @@ -11,7 +11,7 @@ platforms darwin license MIT supported_archs noarch -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 maintainers {stromnov @stromnov} openmaintainer @@ -25,7 +25,9 @@ checksums rmd160 4c63618354c506cb64dd75bd1ca605d00342c1ce \ size 46272 if {${name} ne ${subport}} { - depends_lib-append port:py${python.version}-setuptools + depends_build-append port:py${python.version}-setuptools \ + + depends_run-append port:py${python.version}-toml # https://trac.macports.org/ticket/57199 use_configure yes diff --git a/python/py-toml/Portfile b/python/py-toml/Portfile index 2f87b6a2fdb54..fd0d62df6b152 100644 --- a/python/py-toml/Portfile +++ b/python/py-toml/Portfile @@ -20,7 +20,7 @@ checksums rmd160 8f619d6251935a9b17370ec8e0b71050d2937451 \ sha256 229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c \ size 16719 -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 if {${name} ne ${subport}} { depends_build port:py${python.version}-setuptools From a64577e35387a5c0ef8f9166dfd04b7b7930e4cd Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Wed, 12 Feb 2020 22:52:42 +0100 Subject: [PATCH 05/10] py-virtualenv: Bump version to 20.0.5 Also adds dependencies needed for v20.0.5 --- python/py-appdirs/Portfile | 2 +- python/py-filelock/Portfile | 2 +- python/py-importlib-metadata/Portfile | 2 +- python/py-six/Portfile | 2 +- python/py-virtualenv/Portfile | 40 +++++++++++++++++++++------ 5 files changed, 35 insertions(+), 13 deletions(-) diff --git a/python/py-appdirs/Portfile b/python/py-appdirs/Portfile index ed5059f2660fe..61b1ef2371214 100644 --- a/python/py-appdirs/Portfile +++ b/python/py-appdirs/Portfile @@ -25,7 +25,7 @@ checksums rmd160 5c20593d89aa579dc571d533efeeb8ee72eb0d58 \ sha256 9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 \ size 12700 -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 if {$subport ne $name} { depends_test-append \ diff --git a/python/py-filelock/Portfile b/python/py-filelock/Portfile index 47371c4a3c928..96277b5baf106 100644 --- a/python/py-filelock/Portfile +++ b/python/py-filelock/Portfile @@ -24,7 +24,7 @@ checksums rmd160 f4045fa508760a35480bef08ea89f2a102dc249a \ sha256 18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59 \ size 8549 -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 if {${name} ne ${subport}} { depends_build-append port:py${python.version}-setuptools diff --git a/python/py-importlib-metadata/Portfile b/python/py-importlib-metadata/Portfile index 909d33e307e6f..955ce24e86042 100644 --- a/python/py-importlib-metadata/Portfile +++ b/python/py-importlib-metadata/Portfile @@ -11,7 +11,7 @@ categories-append devel platforms darwin license Apache -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 maintainers {stromnov @stromnov} openmaintainer diff --git a/python/py-six/Portfile b/python/py-six/Portfile index 40dc472209346..ff6a88abe92e1 100644 --- a/python/py-six/Portfile +++ b/python/py-six/Portfile @@ -28,7 +28,7 @@ checksums rmd160 8ca284d5893a99685f0b218c4e47f4e74f5bb080 \ sha256 236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a \ size 33857 -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 if {${name} ne ${subport}} { depends_test-append \ diff --git a/python/py-virtualenv/Portfile b/python/py-virtualenv/Portfile index ec394b06d2da1..ec096a751fa5d 100644 --- a/python/py-virtualenv/Portfile +++ b/python/py-virtualenv/Portfile @@ -5,7 +5,7 @@ PortGroup python 1.0 PortGroup select 1.0 name py-virtualenv -version 16.7.9 +version 20.0.5 revision 0 categories-append devel @@ -19,24 +19,46 @@ long_description virtualenv is a tool to create isolated Python \ environments. homepage https://virtualenv.pypa.io -master_sites pypi:v/${python.rootname} -distname ${python.rootname}-${version} -checksums rmd160 1ec5152c8d82350fd24358cfa0d112fdf70e7094 \ - sha256 0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3 \ - size 5121717 +checksums rmd160 225a529e632c9fd4281601d11fe8179976157525 \ + sha256 531b142e300d405bb9faedad4adbeb82b4098b918e35209af2adef3129274aae \ + size 7978815 # keep older Python versions here, do add the EOL version to the list below python.versions 27 34 35 36 37 38 if {${name} ne ${subport}} { # add EOL warnings - if {${python.version} in "34"} { + if {${python.version} in "27 34"} { PortGroup deprecated 1.0 + deprecated.eol_version yes } - depends_lib-append port:py${python.version}-setuptools + depends_build-append port:py${python.version}-setuptools \ + port:py${python.version}-setuptools_scm + + depends_lib-append port:py${python.version}-appdirs \ + port:py${python.version}-distlib \ + port:py${python.version}-filelock \ + port:py${python.version}-six + + if {${python.version} < 33} { + depends_lib-append port:py${python.version}-contextlib2 + } + + if {${python.version} < 34} { + depends_lib-append port:py${python.version}-pathlib2 + } + + if {${python.version} < 37} { + depends_lib-append port:py${python.version}-importlib-resources + } + + if {${python.version} < 38} { + depends_lib-append port:py${python.version}-importlib-metadata + } + depends_run-append port:virtualenv_select @@ -46,7 +68,7 @@ if {${name} ne ${subport}} { post-destroot { set docdir ${prefix}/share/doc/${subport} xinstall -d ${destroot}${docdir}/docs/changelog - xinstall -m 0644 -W ${worksrcpath} README.rst LICENSE.txt AUTHORS.txt \ + xinstall -m 0644 -W ${worksrcpath} README.md LICENSE \ ${destroot}${docdir} xinstall -m 0644 {*}[glob -directory ${worksrcpath}/docs *.rst] \ ${destroot}${docdir}/docs From 86ea7586ecd8574e1d265f903f14ec354bcd0b59 Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Sun, 16 Feb 2020 11:45:01 +0100 Subject: [PATCH 06/10] py-wheel: Re-add Py34 dependency for py-importlib-resources --- python/py-wheel/Portfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/py-wheel/Portfile b/python/py-wheel/Portfile index 55e382d4d3f99..1214da0183730 100644 --- a/python/py-wheel/Portfile +++ b/python/py-wheel/Portfile @@ -22,7 +22,7 @@ checksums rmd160 c8cde8bb1dfd7ed8e237cd53d1a370fdcef1ea0f \ sha256 8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96 \ size 58330 -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 if {${name} ne ${subport}} { depends_build-append \ From 9386e28ad72a5e05f70030f2c2f5758d37d6f52c Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Sun, 16 Feb 2020 11:46:19 +0100 Subject: [PATCH 07/10] py-zipp: Re-add python34 compatibility for py34-importlib-metadata --- python/py-zipp/Portfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/py-zipp/Portfile b/python/py-zipp/Portfile index c46361d6fe738..93e47a239236b 100644 --- a/python/py-zipp/Portfile +++ b/python/py-zipp/Portfile @@ -10,7 +10,7 @@ categories-append devel platforms darwin license MIT -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 maintainers {stromnov @stromnov} openmaintainer From 16a7b0edb9ed9e712248f3604a55f217ff5dcff7 Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Sun, 16 Feb 2020 12:10:45 +0100 Subject: [PATCH 08/10] py-virtualenv: Add last version compatible with Python 3.4 --- python/py-setuptools/Portfile | 37 ++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/python/py-setuptools/Portfile b/python/py-setuptools/Portfile index 6975cf3370d7f..01c5d3f48e0f2 100644 --- a/python/py-setuptools/Portfile +++ b/python/py-setuptools/Portfile @@ -34,19 +34,34 @@ python.versions 26 27 33 34 35 36 37 38 python.link_binaries no if {$subport ne $name} { - if {${python.version} == 26} { - version 36.8.0 - revision 0 - checksums md5 3ecaa938a4c95a74dfbcd6340a47c7c5 \ - rmd160 457c838b9fb09cf0bf9ba519a098e1c009710aa3 \ - sha256 b2aa5a00e9e4fd20f3c3dd412d490921746efe14bda34d53973c4a59ab05b35d - } elseif {${python.version} == 33} { - version 39.2.0 - revision 0 - checksums rmd160 6070de164cf74412fe7c9a9d04031112b06cfc2a \ - sha256 f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2 + + switch ${python.version} { + 26 { + version 36.8.0 + revision 0 + checksums md5 3ecaa938a4c95a74dfbcd6340a47c7c5 \ + rmd160 457c838b9fb09cf0bf9ba519a098e1c009710aa3 \ + sha256 b2aa5a00e9e4fd20f3c3dd412d490921746efe14bda34d53973c4a59ab05b35d + } + + 33 { + version 39.2.0 + revision 0 + checksums rmd160 6070de164cf74412fe7c9a9d04031112b06cfc2a \ + sha256 f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2 + } + + 34 { + version 43.0.0 + revision 0 + checksums rmd160 b0c380d5789a76b43c409d35f3250efd8577fd91 \ + sha256 db45ebb4a4b3b95ff0aca3ce5fe1e820ce17be393caf8902c78aa36240e8c378 \ + size 858857 + } } + + build.env-append SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 destroot.env-append SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 post-destroot { From 8d2ca1d16fc69144888c2c89332f9aaeddf06da3 Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Mon, 17 Feb 2020 14:07:59 +0100 Subject: [PATCH 09/10] py-more-itertools: Add Python 34 for compatibility with virtualenv --- python/py-more-itertools/Portfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/python/py-more-itertools/Portfile b/python/py-more-itertools/Portfile index 48939c92b8b08..71f81e778cb44 100644 --- a/python/py-more-itertools/Portfile +++ b/python/py-more-itertools/Portfile @@ -11,7 +11,7 @@ platforms darwin license MIT supported_archs noarch -python.versions 27 35 36 37 38 +python.versions 27 34 35 36 37 38 maintainers {stromnov @stromnov} openmaintainer @@ -38,5 +38,15 @@ if {${name} ne ${subport}} { depends_lib-append port:py${python.version}-six } + if {${python.version} eq 34} { + version 7.2.0 + revision 0 + distname ${python.rootname}-${version} + checksums rmd160 6670cda718be6be8f3ed1c993341eeb91d8a7d0d \ + sha256 409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832 \ + size 73429 + depends_lib-append port:py${python.version}-six + } + livecheck.type none } From e608638f6beab7a6d00a1d613d36598e18287c63 Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Tue, 17 Mar 2020 01:26:03 +0100 Subject: [PATCH 10/10] py-virtualenv: Bump to version 20.0.13 --- python/py-virtualenv/Portfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/py-virtualenv/Portfile b/python/py-virtualenv/Portfile index ec096a751fa5d..5a16eefe2f78b 100644 --- a/python/py-virtualenv/Portfile +++ b/python/py-virtualenv/Portfile @@ -5,7 +5,7 @@ PortGroup python 1.0 PortGroup select 1.0 name py-virtualenv -version 20.0.5 +version 20.0.13 revision 0 categories-append devel @@ -20,9 +20,9 @@ long_description virtualenv is a tool to create isolated Python \ homepage https://virtualenv.pypa.io -checksums rmd160 225a529e632c9fd4281601d11fe8179976157525 \ - sha256 531b142e300d405bb9faedad4adbeb82b4098b918e35209af2adef3129274aae \ - size 7978815 +checksums rmd160 c10bfef5f917116dfb96e09d5c8201be08ff1f34 \ + sha256 f3128d882383c503003130389bf892856341c1da12c881ae24d6358c82561b55 \ + size 7989904 # keep older Python versions here, do add the EOL version to the list below python.versions 27 34 35 36 37 38