diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index 15069b50..e6a1fb8e 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -29,7 +29,7 @@ jobs: - name: Set up QEMU for aarch64 on Linux if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: all @@ -62,7 +62,7 @@ jobs: CIBW_REPAIR_WHEEL_COMMAND_LINUX: > LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/dawdreamer:$PWD/thirdparty/libfaust/ubuntu-x86_64/Release/lib && pip install auditwheel-symbols && (auditwheel repair -w {dest_dir} {wheel} || auditwheel-symbols --manylinux 2014 {wheel}) CIBW_TEST_REQUIRES: -r test-requirements.txt soundfile flax - CIBW_TEST_COMMAND: "rm -rf dawdreamer/*.so* && cd {project}/tests && python -m pytest -v ." + CIBW_TEST_COMMAND: "rm -rf dawdreamer/*.so* && cd {project}/tests && pytest -v ." CIBW_ARCHS: auto64 CIBW_ARCHS_LINUX: "auto aarch64" # On an Linux Intel runner with qemu installed, build Intel and ARM wheels CIBW_TEST_SKIP: "*38* *39* *311*" # Only care about 310 (current Google Colab version) @@ -223,7 +223,7 @@ jobs: CIBW_ARCHS: auto64 CIBW_ARCHS_MACOS: ${{matrix.ARCHS}} CIBW_ENVIRONMENT_MACOS: ARCHS="${{matrix.ARCHS}}" - CIBW_TEST_SKIP: "*arm64*" + CIBW_TEST_SKIP: "*311* *arm64*" # Skip 311 because some vst effects output silence on GitHub Actions only - uses: actions/upload-artifact@v3 with: diff --git a/Dockerfile b/Dockerfile index 23b24a41..9a87e69a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,9 @@ FROM quay.io/pypa/manylinux2014_x86_64 ARG DEBIAN_FRONTEND=noninteractive +# get pip +RUN curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py" && python3.10 get-pip.py + # clone repo by copying in COPY . /DawDreamer @@ -16,18 +19,17 @@ RUN sh -v build_linux.sh # Setup python virtual environment and requirements WORKDIR /DawDreamer RUN python3.10 -m venv test-env -RUN source test-env/bin/activate -RUN python -m pip install librosa scipy numpy pytest build wheel +RUN /bin/bash -c "source test-env/bin/activate && pip install librosa scipy numpy pytest build wheel" # Build wheel WORKDIR /DawDreamer ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/DawDreamer/dawdreamer:/DawDreamer/thirdparty/libfaust/ubuntu-x86_64/Release/lib -RUN python -m build --wheel +RUN python3.10 -m build --wheel # Install wheel WORKDIR /DawDreamer -RUN python -m pip install dist/dawdreamer*.whl +RUN python3.10 -m pip install dist/dawdreamer*.whl # Run all Tests WORKDIR /DawDreamer/tests -RUN python -m pytest -v . \ No newline at end of file +RUN python3.10 -m pytest -v . \ No newline at end of file diff --git a/setup.py b/setup.py index 0b98ae39..e1ebd43c 100644 --- a/setup.py +++ b/setup.py @@ -137,14 +137,13 @@ def copytree(src, dst, symlinks=False, ignore=None): "Programming Language :: C++", "Programming Language :: Python", "Topic :: Multimedia :: Sound/Audio", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11" ], keywords='audio music sound', - python_requires=">=3.7", + python_requires=">=3.8", install_requires=[], packages=setuptools.find_packages(), py_modules=['dawdreamer'],