From 1b953805e721faf9fe20943de0c0a51fe004c8d7 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 25 Jul 2023 12:48:23 +0000 Subject: [PATCH] All tests passing --- server/pypi/build-wheel.py | 3 ++- server/pypi/packages/lameenc/meta.yaml | 4 ++-- server/pypi/pkgtest/app/build.gradle | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/pypi/build-wheel.py b/server/pypi/build-wheel.py index 024cab6921..bb21c66539 100755 --- a/server/pypi/build-wheel.py +++ b/server/pypi/build-wheel.py @@ -125,7 +125,8 @@ def unpack_and_build(self): assert_isdir(self.build_dir) else: ensure_empty(self.build_dir) - run(f"python{self.python} {PYPI_DIR}/create-build-env.py {build_env_dir}") + if self.python: + run(f"python{self.python} {PYPI_DIR}/create-build-env.py {build_env_dir}") self.unpack_source() self.apply_patches() diff --git a/server/pypi/packages/lameenc/meta.yaml b/server/pypi/packages/lameenc/meta.yaml index 84247f733e..e4684c8640 100644 --- a/server/pypi/packages/lameenc/meta.yaml +++ b/server/pypi/packages/lameenc/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.4.2" %} +{% set version = "1.5.1" %} package: name: lameenc @@ -6,7 +6,7 @@ package: version: "{{ version }}" source: - url: https://github.com/chrisstaite/lameenc/archive/refs/tags/v"{{ version }}".tar.gz + url: https://github.com/chrisstaite/lameenc/archive/refs/tags/v{{ version }}.tar.gz requirements: host: diff --git a/server/pypi/pkgtest/app/build.gradle b/server/pypi/pkgtest/app/build.gradle index 729dbb8cd4..49f8958e8e 100644 --- a/server/pypi/pkgtest/app/build.gradle +++ b/server/pypi/pkgtest/app/build.gradle @@ -79,7 +79,7 @@ android { } ndk { - abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" + abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64" } }