From 2c6c927f4718595f31d7c4e951c14596130aa2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Voituret?= <fvoituret@deezer.com>
Date: Tue, 19 Nov 2019 11:27:34 +0100
Subject: [PATCH] fix: conda deploy

---
 .circleci/config.yml | 34 +++++++++++++++++++---------------
 .gitignore           |  3 ++-
 Makefile             | 41 ++++++++++++++++++++++-------------------
 3 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 244ff1a..0cab9bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -77,25 +77,22 @@ jobs:
           name: upload to PyPi
           # TODO: Infer destination regarding of branch.
           #       - master => production PyPi
-          #       - development => testing PyPi
+          #       - other => testing PyPi
           command: make deploy
 
   # =======================================================================================
   # Conda distribution.
   # =======================================================================================
-  #conda-deploy:
-  #  docker:
-  #    - image: null # TODO: use circle ci python image.
-  #  steps:
-  #    - run:
-  #        name: checkout feedstock
-  #        command: git clone https://github.com/conda-forge/spleeter-feedstock
-  #    - run:
-  #        name: update version
-  #        command: sed -i 's///g'
-  #    - run:
-  #        name: deploy
-  #        command: git add recipe && git commit -m "" && git push
+  conda-forge-deploy:
+    docker:
+      - image: python:3
+    steps:
+      - run:
+          name: install dependencies
+          command: apt-get update && apt-get install -y git openssl hub
+      - run:
+          name: checkout feedstock
+          command: make feedstock
 workflows:
   version: 2
   spleeter-workflow:
@@ -112,4 +109,11 @@ workflows:
               only:
                 - master
           requires:
-            - sdist
\ No newline at end of file
+            - sdist
+      - conda-forge-deploy:
+          filters:
+            branches:
+              only:
+                - master
+          requires:
+            - pypi-deploy
diff --git a/.gitignore b/.gitignore
index 29d7036..3660fc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,4 +109,5 @@ __pycache__
 
 pretrained_models
 docs/build
-.vscode
\ No newline at end of file
+.vscode
+spleeter-feedstock/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index c2019ce..6bde98d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,33 +5,36 @@
 # @licence MIT Licence
 # =======================================================
 
+FFEDSTOCK = spleeter-feedstock
+FEEDSTOCK_REPOSITORY = https://github.com/deezer/$(FEEDSTOCK)
+FEEDSTOCK_RECIPE = $(FEEDSTOCK)/recipe/spleeter/meta.yaml
+
+all: clean build test deploy
+
 clean:
 	rm -Rf *.egg-info
 	rm -Rf dist
 
-
 build:
-	@echo "=== Build CPU bdist package" 
 	python3 setup.py sdist
-	@echo "=== CPU version checksum"
-	@openssl sha256 dist/*.tar.gz
 
-build-gpu:
-	@echo "=== Build GPU bdist package" 
-	python3 setup.py sdist --target gpu
-	@echo "=== GPU version checksum"
-	@openssl sha256 dist/*.tar.gz
-
-pip-dependencies:
-	pip install twine
-
-test: pip-dependencies
+test:
 	pytest -W ignore::FutureWarning -W ignore::DeprecationWarning -vv --forked
 
-test-distribution: pip-dependencies
-	bash tests/test_pypi_sdist.sh
+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-dependencies
-	twine upload dist/*
-
-all: clean test build build-gpu upload
+	pip install twine
+	twine upload dist/*
\ No newline at end of file