From 82ecaa3c67ac82766d0817d20ebb2aca74d6897a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:16:20 +0100 Subject: [PATCH 01/10] feat: add circleci configuration --- .circleci/config.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..9899f90 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,25 @@ +version: 2 +jobs: + test: + docker: + - image: circleci/python:3.6.1 + working_directory: ~/spleeter + steps: + - checkout + - run: + name: install spleeter + command: pip install . + - run: + name: test separation + command: spleeter separate -i audio_example.mp3 -o . + upload: + docker: + - image: circleci/python:3.6.1 + steps: + - checkout + - run: + name: package + command: python setup.py bdist + - run: + name: upload to PyPi + command: pip install twine && twine upload dist/* From f06bcf021124a5685c8f1b6c65b6f6166aa35e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:20:33 +0100 Subject: [PATCH 02/10] fix: add branch filtering --- .circleci/config.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9899f90..2f09241 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,9 +17,21 @@ jobs: - image: circleci/python:3.6.1 steps: - checkout - - run: + - run: name: package command: python setup.py bdist - run: name: upload to PyPi command: pip install twine && twine upload dist/* +workflows: + version: 2 + test-and-deploy: + jobs: + - test + - upload: + filters: + branches: + only: + - master + requires: + - test \ No newline at end of file From f5af33cdea5d617958451821f68f2f09df394205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:22:47 +0100 Subject: [PATCH 03/10] docs: add ci badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ed443b8..e8e76aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![PyPI version](https://badge.fury.io/py/spleeter.svg)](https://badge.fury.io/py/spleeter) ![Conda](https://img.shields.io/conda/dn/conda-forge/spleeter) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/spleeter) [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/deezer/spleeter/blob/master/spleeter.ipynb) +[![CircleCI](https://circleci.com/gh/deezer/spleeter/tree/master.svg?style=svg)](https://circleci.com/gh/deezer/spleeter/tree/master) [![PyPI version](https://badge.fury.io/py/spleeter.svg)](https://badge.fury.io/py/spleeter) ![Conda](https://img.shields.io/conda/dn/conda-forge/spleeter) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/spleeter) [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/deezer/spleeter/blob/master/spleeter.ipynb) ## About From e26e0ed2044002e89fb0fbf7d397a0009a9615e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:27:55 +0100 Subject: [PATCH 04/10] fix: add user scoped install --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f09241..4d803a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: - checkout - run: name: install spleeter - command: pip install . + command: pip install . --user - run: name: test separation command: spleeter separate -i audio_example.mp3 -o . @@ -22,7 +22,7 @@ jobs: command: python setup.py bdist - run: name: upload to PyPi - command: pip install twine && twine upload dist/* + command: pip install twine --user && twine upload dist/* workflows: version: 2 test-and-deploy: From a633c262653d6f5daa0e453464a7b9256a1251e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:30:41 +0100 Subject: [PATCH 05/10] fix: add direct module testing --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d803a7..5a8471f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: command: pip install . --user - run: name: test separation - command: spleeter separate -i audio_example.mp3 -o . + command: python -m spleeter separate -i audio_example.mp3 -o . upload: docker: - image: circleci/python:3.6.1 From 20deba57a676525b61eb550234ffdd3a4952fb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:32:52 +0100 Subject: [PATCH 06/10] fix: add ffmpeg install --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a8471f..f81689a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,9 +6,12 @@ jobs: working_directory: ~/spleeter steps: - checkout + - run: + name: install ffmpeg + command: sudo apt-get install ffmpeg - run: name: install spleeter - command: pip install . --user + command: sudo pip install . - run: name: test separation command: python -m spleeter separate -i audio_example.mp3 -o . From b12ea6f9775b968ea308237e2f9e845afb804e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:34:09 +0100 Subject: [PATCH 07/10] fix: add apt-get update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f81689a..724d634 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: - checkout - run: name: install ffmpeg - command: sudo apt-get install ffmpeg + command: sudo apt-get update && sudo apt-get install ffmpeg - run: name: install spleeter command: sudo pip install . From 3fc6ee474c4670d44550073b793cf9655fb9f2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:35:41 +0100 Subject: [PATCH 08/10] fix: switch docker image --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 724d634..25aecf3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,22 +2,22 @@ version: 2 jobs: test: docker: - - image: circleci/python:3.6.1 + - image: python:3 working_directory: ~/spleeter steps: - checkout - run: name: install ffmpeg - command: sudo apt-get update && sudo apt-get install ffmpeg + command: apt-get update && apt-get install ffmpeg - run: name: install spleeter - command: sudo pip install . + command: pip install . - run: name: test separation - command: python -m spleeter separate -i audio_example.mp3 -o . + command: spleeter separate -i audio_example.mp3 -o . upload: docker: - - image: circleci/python:3.6.1 + - image: python:3 steps: - checkout - run: @@ -25,7 +25,7 @@ jobs: command: python setup.py bdist - run: name: upload to PyPi - command: pip install twine --user && twine upload dist/* + command: pip install twine && twine upload dist/* workflows: version: 2 test-and-deploy: From ef1ad365406f47d0edb079471716db1ba0be9e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:36:41 +0100 Subject: [PATCH 09/10] fix: add auto validation --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 25aecf3..e780144 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: - checkout - run: name: install ffmpeg - command: apt-get update && apt-get install ffmpeg + command: apt-get update && apt-get install -y ffmpeg - run: name: install spleeter command: pip install . From 8f4de693298964c528d0f0a0e0bd3b9b9afef070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Wed, 6 Nov 2019 23:42:02 +0100 Subject: [PATCH 10/10] fix: add python constraint --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e780144..60745f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: test: docker: - - image: python:3 + - image: python:3.7 working_directory: ~/spleeter steps: - checkout