diff --git a/server/pypi/packages/argon2-cffi-bindings/meta.yaml b/server/pypi/packages/argon2-cffi-bindings/meta.yaml new file mode 100644 index 0000000000..0997bd5e73 --- /dev/null +++ b/server/pypi/packages/argon2-cffi-bindings/meta.yaml @@ -0,0 +1,3 @@ +package: + name: argon2-cffi-bindings + version: "21.2.0" diff --git a/server/pypi/packages/argon2-cffi-bindings/patches/chaquopy.patch b/server/pypi/packages/argon2-cffi-bindings/patches/chaquopy.patch new file mode 100644 index 0000000000..faee577368 --- /dev/null +++ b/server/pypi/packages/argon2-cffi-bindings/patches/chaquopy.patch @@ -0,0 +1,11 @@ +--- src-original/src/_argon2_cffi_bindings/_ffi_build.py 2020-05-10 14:00:25.000000000 +0000 ++++ src/src/_argon2_cffi_bindings/_ffi_build.py 2021-02-27 16:03:58.134283521 +0000 +@@ -38,7 +38,7 @@ + else: + # Optimized version requires SSE2 extensions. They have been around since + # 2001 so we try to compile it on every recent-ish x86. +- optimized = target_platform in ("i686", "x86", "x86_64", "AMD64") ++ optimized = any(word in os.environ["HOST"] for word in ("i686", "x86", "x86_64", "AMD64")) # Chaquopy + + + ffi = FFI() diff --git a/server/pypi/packages/argon2-cffi/test.py b/server/pypi/packages/argon2-cffi-bindings/test.py similarity index 100% rename from server/pypi/packages/argon2-cffi/test.py rename to server/pypi/packages/argon2-cffi-bindings/test.py diff --git a/server/pypi/packages/argon2-cffi/meta.yaml b/server/pypi/packages/argon2-cffi/meta.yaml deleted file mode 100644 index 0a6f81f5fb..0000000000 --- a/server/pypi/packages/argon2-cffi/meta.yaml +++ /dev/null @@ -1,10 +0,0 @@ -package: - name: argon2-cffi - version: "20.1.0" - -build: - number: 1 - -requirements: - build: - - cffi 1.15.1 diff --git a/server/pypi/packages/argon2-cffi/patches/chaquopy.patch b/server/pypi/packages/argon2-cffi/patches/chaquopy.patch deleted file mode 100644 index e9b7bf770c..0000000000 --- a/server/pypi/packages/argon2-cffi/patches/chaquopy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src-original/setup.py 2020-05-10 14:00:25.000000000 +0000 -+++ src/setup.py 2021-02-27 16:03:58.134283521 +0000 -@@ -27,7 +27,7 @@ - else: - # Optimized version requires SSE2 extensions. They have been around since - # 2001 so we try to compile it on every recent-ish x86. -- optimized = platform.machine() in ("i686", "x86", "x86_64", "AMD64") -+ optimized = any(word in os.environ["HOST"] for word in ("i686", "x86", "x86_64", "AMD64")) # Chaquopy: was `platform.machine() in ("i686", ...)` - - CFFI_MODULES = ["src/argon2/_ffi_build.py:ffi"] - lib_base = os.path.join("extras", "libargon2", "src") diff --git a/server/pypi/packages/bitarray/meta.yaml b/server/pypi/packages/bitarray/meta.yaml index 45d6cdca18..b390c8d7da 100644 --- a/server/pypi/packages/bitarray/meta.yaml +++ b/server/pypi/packages/bitarray/meta.yaml @@ -1,3 +1,3 @@ package: name: bitarray - version: "2.8.2" + version: "2.8.4" diff --git a/server/pypi/packages/ephem/meta.yaml b/server/pypi/packages/ephem/meta.yaml index 7d1afb06af..2aacfdee25 100644 --- a/server/pypi/packages/ephem/meta.yaml +++ b/server/pypi/packages/ephem/meta.yaml @@ -1,6 +1,6 @@ package: name: ephem - version: "3.7.7.0" + version: "4.1.5" build: - number: 1 + number: 0 diff --git a/server/pypi/packages/lru-dict/meta.yaml b/server/pypi/packages/lru-dict/meta.yaml index 18cfd9e21e..3573b98ba8 100644 --- a/server/pypi/packages/lru-dict/meta.yaml +++ b/server/pypi/packages/lru-dict/meta.yaml @@ -1,6 +1,6 @@ package: name: lru-dict - version: "1.1.8" + version: "1.3.0" build: number: 0 diff --git a/server/pypi/packages/netifaces/meta.yaml b/server/pypi/packages/netifaces/meta.yaml index 9f5a46ed5a..de7218f6c6 100644 --- a/server/pypi/packages/netifaces/meta.yaml +++ b/server/pypi/packages/netifaces/meta.yaml @@ -1,6 +1,6 @@ package: name: netifaces - version: "0.10.9" + version: "0.11.0" build: - number: 1 + number: 0 diff --git a/server/pypi/packages/pyzbar/meta.yaml b/server/pypi/packages/pyzbar/meta.yaml index 46b1cd26dd..778a6e4c9d 100644 --- a/server/pypi/packages/pyzbar/meta.yaml +++ b/server/pypi/packages/pyzbar/meta.yaml @@ -1,7 +1,7 @@ # This is a pure-Python package, but we build it into a set of identical native-tagged wheels # to add a requirement for the native library which it uses. -{% set version = "0.1.8" %} +{% set version = "0.1.9" %} package: name: pyzbar diff --git a/server/pypi/packages/typed-ast/meta.yaml b/server/pypi/packages/typed-ast/meta.yaml index ec2b1754e3..0883152568 100644 --- a/server/pypi/packages/typed-ast/meta.yaml +++ b/server/pypi/packages/typed-ast/meta.yaml @@ -1,3 +1,3 @@ package: name: typed_ast - version: "1.5.4" + version: "1.5.5" diff --git a/server/pypi/pkgtest/app/build.gradle b/server/pypi/pkgtest/app/build.gradle index 21e80c19f8..16c86e4e6c 100644 --- a/server/pypi/pkgtest/app/build.gradle +++ b/server/pypi/pkgtest/app/build.gradle @@ -37,6 +37,7 @@ PACKAGE_GROUPS.add(defaultGroup) // Extra dependencies required to run the tests. Each entry is a pip requirement specifier. def SPACY_MODEL = "en_core_web_sm-2.2.5" ext.TEST_PACKAGES = [ + "argon2-cffi-bindings": ["argon2-cffi"], "backports-zoneinfo": ["tzdata"], "dlib": ["numpy"], "grpcio": ["protobuf"],