diff --git a/dev-python/pyasn1-modules/pyasn1_modules-0.2.8.recipe b/dev-python/pyasn1-modules/pyasn1_modules-0.4.2.recipe similarity index 51% rename from dev-python/pyasn1-modules/pyasn1_modules-0.2.8.recipe rename to dev-python/pyasn1-modules/pyasn1_modules-0.4.2.recipe index 8dffa05e2..4bd851e92 100644 --- a/dev-python/pyasn1-modules/pyasn1_modules-0.2.8.recipe +++ b/dev-python/pyasn1-modules/pyasn1_modules-0.4.2.recipe @@ -3,12 +3,12 @@ DESCRIPTION="A collection of ASN.1 modules expressed in form of pyasn1 \ classes. Includes protocols PDUs definition (SNMP, LDAP etc.) and various \ data structures (X.509, PKCS etc.)." HOMEPAGE="https://pypi.org/project/pyasn1-modules/" -COPYRIGHT="2011-2019 Ilya Etingof " +COPYRIGHT="2005-2020 Ilya Etingof " LICENSE="BSD (2-clause)" -REVISION="5" -SOURCE_URI="https://files.pythonhosted.org/packages/source/p/pyasn1-modules/pyasn1-modules-$portVersion.tar.gz" -SOURCE_DIR="pyasn1-modules-$portVersion" -CHECKSUM_SHA256="905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/source/${portName:0:1}/$portName/$portName-$portVersion.tar.gz" +CHECKSUM_SHA256="677091de870a80aae844b1ca6134f54652fa2c8c5a52aa396440ac3106e941e6" +SOURCE_DIR="pyasn1_modules-$portVersion" ARCHITECTURES="any" @@ -34,31 +34,41 @@ for pythonVersion in ${PYTHON_VERSIONS[@]}; do eval "REQUIRES_$pythonPackage=\" haiku + pyasn1_$pythonPackage # pyasn1>=0.6.1,<0.7.0 (requirements.txt says: >=0.4.7,<0.7.0) cmd:python$pythonVersion \"" BUILD_REQUIRES+=" + build_$pythonPackage + installer_$pythonPackage setuptools_$pythonPackage + wheel_$pythonPackage " BUILD_PREREQUIRES+=" cmd:python$pythonVersion " done +BUILD() +{ + # This is an "any" package, "building" it will create a + # "$portBaseName-$portVersion-py3-none-any.whl" file that can be installed + # on multiple Python versions, so we only need to build once. + python=python${PYTHON_VERSIONS[0]} + + $python -m build --wheel --skip-dependency-check --no-isolation +} + INSTALL() { for pythonVersion in ${PYTHON_VERSIONS[@]}; do pythonPackage=python${pythonVersion//.} python=python$pythonVersion - installLocation=$prefix/lib/$python/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - rm -rf build - - $python setup.py build install \ - --root=/ --prefix=$prefix + # wheel filename has the pattern: $portBaseName-$portVersion-*-none-any.whl + # with the asterisk being: "py2-py3" or "py3". + $python -m installer --p $prefix dist/$portName-$portVersion-*-none-any.whl packageEntries $pythonPackage \ $prefix/lib/python*