From 040a9fdcfbda892e4454b3148a585a8eb69a43e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 8 Jul 2020 15:54:46 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20restore=20old=20test=20suite=20fash?= =?UTF-8?q?ion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 285 ------------------------------------------- Makefile | 9 +- 2 files changed, 2 insertions(+), 292 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 30c5cfd..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,285 +0,0 @@ -version: 2 -jobs: - # ======================================================================================= - # Python 3.6 testing. - # ======================================================================================= - test-3.6: - docker: - - image: python:3.6 - working_directory: ~/spleeter - steps: - - checkout - - restore_cache: - key: models-{{ checksum "spleeter/model/__init__.py" }} - - run: apt-get update && apt-get install -y ffmpeg - - run: pip install -r requirements.txt && pip install pytest==5.4.3 pytest-xdist==1.32.0 pytest-forked==1.1.3 musdb museval - - run: make test - - save_cache: - key: models-{{ checksum "spleeter/model/__init__.py" }} - paths: - - "pretrained_models" - # ======================================================================================= - # Python 3.7 testing. - # ======================================================================================= - test-3.7: - docker: - - image: python:3.7 - working_directory: ~/spleeter - steps: - - checkout - - restore_cache: - key: models-{{ checksum "spleeter/model/__init__.py" }} - - run: apt-get update && apt-get install -y ffmpeg - - run: pip install -r requirements.txt && pip install pytest==5.4.3 pytest-xdist==1.32.0 pytest-forked==1.1.3 musdb museval - - run: make test - - save_cache: - key: models-{{ checksum "spleeter/model/__init__.py" }} - paths: - - "pretrained_models" - # ======================================================================================= - # Source distribution packaging. - # ======================================================================================= - sdist: - docker: - - image: python:3 - steps: - - checkout - - run: make build - - save_cache: - key: sdist-{{ .Branch }}-{{ checksum "setup.py" }} - paths: - - dist - sdist-gpu: - docker: - - image: python:3 - steps: - - checkout - - run: make build-gpu - - save_cache: - key: sdist-{{ .Branch }}-{{ checksum "setup.py" }} - paths: - - dist - # ======================================================================================= - # PyPi deployment. - # ======================================================================================= - pypi-deploy: - docker: - - image: python:3 - steps: - - checkout - - restore_cache: - key: sdist-{{ .Branch }}-{{ checksum "setup.py" }} - - run: - name: upload to PyPi - # TODO: Infer destination regarding of branch. - # - master => production PyPi - # - other => testing PyPi - command: make build deploy - pypi-deploy-gpu: - docker: - - image: python:3 - steps: - - checkout - - restore_cache: - key: sdist-{{ .Branch }}-{{ checksum "setup.py" }} - - run: - name: upload to PyPi - # TODO: Infer destination regarding of branch. - # - master => production PyPi - # - other => testing PyPi - command: make build-gpu deploy - # ======================================================================================= - # Docker build. - # ======================================================================================= - - docker-conda-cpu: - docker: - - image: docker:17.05.0-ce-git - steps: - - checkout - - setup_remote_docker - - run: docker build -t conda -f docker/conda.dockerfile . - - run: docker build --build-arg BASE=conda -t researchdeezer/spleeter:conda -f docker/spleeter-conda.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:conda --build-arg MODEL=2stems -t researchdeezer/spleeter:conda-2stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:conda --build-arg MODEL=4stems -t researchdeezer/spleeter:conda-4stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:conda --build-arg MODEL=5stems -t researchdeezer/spleeter:conda-5stems -f docker/spleeter-model.dockerfile . - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:conda separate -i /runtime/audio_example.mp3 -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:conda-2stems separate -i /runtime/audio_example.mp3 -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:conda-4stems separate -i /runtime/audio_example.mp3 -p spleeter:4stems -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:conda-5stems separate -i /runtime/audio_example.mp3 -p spleeter:5stems -o /tmp - - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - - run: docker push researchdeezer/spleeter:conda - - run: docker push researchdeezer/spleeter:conda-2stems - - run: docker push researchdeezer/spleeter:conda-4stems - - run: docker push researchdeezer/spleeter:conda-5stems - docker-conda-gpu: - docker: - - image: docker:17.05.0-ce-git - steps: - - checkout - - setup_remote_docker - - run: docker build -t conda -f docker/conda.dockerfile . - - run: docker build --build-arg BASE=conda -t conda-gpu -f docker/cuda-10-0.dockerfile . - - run: docker build --build-arg BASE=conda-gpu --build-arg SPLEETER_PACKAGE=spleeter-gpu -t researchdeezer/spleeter:conda-gpu -f docker/spleeter-conda.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:conda-gpu --build-arg MODEL=2stems -t researchdeezer/spleeter:conda-gpu-2stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:conda-gpu --build-arg MODEL=4stems -t researchdeezer/spleeter:conda-gpu-4stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:conda-gpu --build-arg MODEL=5stems -t researchdeezer/spleeter:conda-gpu-5stems -f docker/spleeter-model.dockerfile . - - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - - run: docker push researchdeezer/spleeter:conda-gpu - - run: docker push researchdeezer/spleeter:conda-gpu-2stems - - run: docker push researchdeezer/spleeter:conda-gpu-4stems - - run: docker push researchdeezer/spleeter:conda-gpu-5stems - docker-3.6-cpu: - docker: - - image: docker:17.05.0-ce-git - steps: - - checkout - - setup_remote_docker - - run: docker build --build-arg BASE=python:3.6 -t researchdeezer/spleeter:3.6 -f docker/spleeter.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.6 --build-arg MODEL=2stems -t researchdeezer/spleeter:3.6-2stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.6 --build-arg MODEL=4stems -t researchdeezer/spleeter:3.6-4stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.6 --build-arg MODEL=5stems -t researchdeezer/spleeter:3.6-5stems -f docker/spleeter-model.dockerfile . - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.6 separate -i /runtime/audio_example.mp3 -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.6-2stems separate -i /runtime/audio_example.mp3 -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.6-4stems separate -i /runtime/audio_example.mp3 -p spleeter:4stems -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.6-5stems separate -i /runtime/audio_example.mp3 -p spleeter:5stems -o /tmp - - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - - run: docker push researchdeezer/spleeter:3.6 - - run: docker push researchdeezer/spleeter:3.6-2stems - - run: docker push researchdeezer/spleeter:3.6-4stems - - run: docker push researchdeezer/spleeter:3.6-5stems - docker-3.6-gpu: - docker: - - image: docker:17.05.0-ce-git - steps: - - checkout - - setup_remote_docker - - run: docker build --build-arg BASE=python:3.6 -t cuda:3.6 -f docker/cuda-10-0.dockerfile . - - run: docker build --build-arg BASE=cuda:3.6 --build-arg SPLEETER_PACKAGE=spleeter-gpu -t researchdeezer/spleeter:3.6-gpu -f docker/spleeter.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.6-gpu --build-arg MODEL=2stems -t researchdeezer/spleeter:3.6-gpu-2stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.6-gpu --build-arg MODEL=4stems -t researchdeezer/spleeter:3.6-gpu-4stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.6-gpu --build-arg MODEL=5stems -t researchdeezer/spleeter:3.6-gpu-5stems -f docker/spleeter-model.dockerfile . - - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - - run: docker push researchdeezer/spleeter:3.6-gpu - - run: docker push researchdeezer/spleeter:3.6-gpu-2stems - - run: docker push researchdeezer/spleeter:3.6-gpu-4stems - - run: docker push researchdeezer/spleeter:3.6-gpu-5stems - docker-3.7-cpu: - docker: - - image: docker:17.05.0-ce-git - steps: - - checkout - - setup_remote_docker - - run: docker build --build-arg BASE=python:3.7 -t researchdeezer/spleeter:3.7 -f docker/spleeter.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.7 --build-arg MODEL=2stems -t researchdeezer/spleeter:3.7-2stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.7 --build-arg MODEL=4stems -t researchdeezer/spleeter:3.7-4stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.7 --build-arg MODEL=5stems -t researchdeezer/spleeter:3.7-5stems -f docker/spleeter-model.dockerfile . - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7 separate -i /runtime/audio_example.mp3 -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7-2stems separate -i /runtime/audio_example.mp3 -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7-4stems separate -i /runtime/audio_example.mp3 -p spleeter:4stems -o /tmp - - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7-5stems separate -i /runtime/audio_example.mp3 -p spleeter:5stems -o /tmp - - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - - run: docker tag researchdeezer/spleeter:3.7 researchdeezer/spleeter:latest - - run: docker push researchdeezer/spleeter:latest - - run: docker push researchdeezer/spleeter:3.7 - - run: docker push researchdeezer/spleeter:3.7-2stems - - run: docker push researchdeezer/spleeter:3.7-4stems - - run: docker push researchdeezer/spleeter:3.7-5stems - docker-3.7-gpu: - docker: - - image: docker:17.05.0-ce-git - steps: - - checkout - - setup_remote_docker - - run: docker build -t cuda:3.7 -f docker/cuda-10-0.dockerfile . - - run: docker build --build-arg BASE=cuda:3.7 --build-arg SPLEETER_PACKAGE=spleeter-gpu -t researchdeezer/spleeter:3.7-gpu -f docker/spleeter.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.7-gpu --build-arg MODEL=2stems -t researchdeezer/spleeter:3.7-gpu-2stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.7-gpu --build-arg MODEL=4stems -t researchdeezer/spleeter:3.7-gpu-4stems -f docker/spleeter-model.dockerfile . - - run: docker build --build-arg BASE=researchdeezer/spleeter:3.7-gpu --build-arg MODEL=5stems -t researchdeezer/spleeter:3.7-gpu-5stems -f docker/spleeter-model.dockerfile . - - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - - run: docker push researchdeezer/spleeter:3.7-gpu - - run: docker push researchdeezer/spleeter:3.7-gpu-2stems - - run: docker push researchdeezer/spleeter:3.7-gpu-4stems - - run: docker push researchdeezer/spleeter:3.7-gpu-5stems - - run: docker tag researchdeezer/spleeter:3.7-gpu researchdeezer/spleeter:gpu - - run: docker push researchdeezer/spleeter:gpu - -workflows: - version: 2 - spleeter-release-pipeline: - jobs: - - test-3.6 - - test-3.7 - - sdist: - requires: - - test-3.6 - - test-3.7 - - sdist-gpu: - requires: - - test-3.6 - - test-3.7 - - pypi-deploy: - filters: - branches: - only: - - master - requires: - - sdist - - pypi-deploy-gpu: - filters: - branches: - only: - - master - requires: - - sdist-gpu - - conda-forge-validation: - type: approval - requires: - - pypi-deploy - - pypi-deploy-gpu - filters: - branches: - only: - - master - - docker-conda-cpu: - requires: - - conda-forge-validation - filters: - branches: - only: - - master - - docker-conda-gpu: - requires: - - conda-forge-validation - filters: - branches: - only: - - master - - docker-3.6-cpu: - requires: - - pypi-deploy - filters: - branches: - only: - - master - - docker-3.6-gpu: - requires: - - pypi-deploy-gpu - filters: - branches: - only: - - master - - docker-3.7-cpu: - requires: - - pypi-deploy - filters: - branches: - only: - - master - - docker-3.7-gpu: - requires: - - pypi-deploy-gpu - filters: - branches: - only: - - master diff --git a/Makefile b/Makefile index a67a64d..4db4e36 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ FEEDSTOCK = spleeter-feedstock FEEDSTOCK_REPOSITORY = https://github.com/deezer/$(FEEDSTOCK) FEEDSTOCK_RECIPE = $(FEEDSTOCK)/recipe/spleeter/meta.yaml -PYTEST_CMD = pytest -W ignore::FutureWarning -W ignore::DeprecationWarning -vv +PYTEST_CMD = pytest -W ignore::FutureWarning -W ignore::DeprecationWarning -vv --forked all: clean build test deploy @@ -27,12 +27,7 @@ build-gpu: clean python3 setup.py sdist test: - #$(foreach file, $(wildcard tests/test_*.py), $(PYTEST_CMD) $(file);) - # deactivate this until we figure out why it fails on the CI container - #$(PYTEST_CMD) tests/test_eval.py - $(PYTEST_CMD) tests/test_ffmpeg_adapter.py - $(PYTEST_CMD) tests/test_github_model_provider.py - $(PYTEST_CMD) --boxed tests/test_separator.py + $(PYTEST_CMD) tests/ deploy: pip install twine