diff --git a/.circleci/config.yml b/.circleci/config.yml index 552e894..9973c03 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -66,16 +66,6 @@ jobs: # - other => testing PyPi command: make deploy # ======================================================================================= - # Conda distribution. - # ======================================================================================= - conda-forge-deploy: - docker: - - image: python:3 - steps: - - checkout - - run: apt-get update && apt-get install -y git openssl hub - - run: make feedstock - # ======================================================================================= # Docker build. # ======================================================================================= docker-conda-cpu: @@ -165,32 +155,24 @@ workflows: - master requires: - sdist - - conda-forge-deploy: - filters: - branches: - only: - - master - requires: - - pypi-deploy - - hold: + - conda-forge-validation: type: approval requires: - pypi-deploy - - conda-forge-deploy filters: branches: only: - master - docker-conda-cpu: requires: - - hold + - conda-forge-validation filters: branches: only: - master - docker-conda-gpu: requires: - - hold + - conda-forge-validation filters: branches: only: diff --git a/Makefile b/Makefile index 9d4d471..33dce14 100644 --- a/Makefile +++ b/Makefile @@ -21,20 +21,6 @@ build: test: pytest -W ignore::FutureWarning -W ignore::DeprecationWarning -vv --forked -feedstock: build - $(eval VERSION = $(shell grep 'project_version = ' setup.py | cut -d' ' -f3 | sed "s/'//g")) - $(eval CHECKSUM = $(shell openssl sha256 dist/spleeter-$(VERSION).tar.gz | cut -d' ' -f2)) - git clone $(FEEDSTOCK_REPOSITORY) - sed 's/{% set version = "[0-9]*\.[0-9]*\.[0-9]*" %}/{% set version = "$(VERSION)" %}/g' $(FEEDSTOCK_RECIPE) - sed 's/sha256: [0-9a-z]*/sha: $(CHECKSUM)/g' $(FEEDSTOCK_RECIPE) - git config credential.helper 'cache --timeout=120' - git config user.email "research@deezer.com" - git config user.name "spleeter-ci" - git add recipe/spleeter/meta.yaml - git commit --allow-empty -m "feat: update spleeter version from CI" - git push -q https://$$FEEDSTOCK_TOKEN@github.com/deezer/$(FEEDSTOCK) - hub pull-request -m "Update spleeter version to $(VERSION)" - deploy: pip install twine twine upload --skip-existing dist/* \ No newline at end of file