From bed9f627fdd37498db2bdf28cdc9122fed59ed65 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Mon, 14 Dec 2020 10:27:45 +0000
Subject: [PATCH 01/21] GitHub auto-releases

---
 .circleci/config.yml       | 20 +++++++++++++++++++-
 notebooker/_entrypoints.py |  2 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32564325..81992a27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,6 @@ defaults: &defaults
     environment:
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      # CODECOV_TOKEN: b0d35139-0a75-427a-907b-2c78a762f8f0
       VERSION: 0.1.0
       PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
       YARN_STATIC_DIR: notebooker/web/static/
@@ -171,9 +170,28 @@ jobs:
     docker:
     - image: cimg/python:3.7-node
     <<: *defaults
+  publish-github-release:
+    docker:
+      - image: cibuilds/github:0.10
+    steps:
+      - attach_workspace:
+          at: /tmp/circleci-artifacts
+      - run:
+          name: "Publish release on GitHub"
+          command: |
+            . ci/bin/activate
+            VERSION=$(notebooker-cli --version | cut -d ' ' -f 3)
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts
 workflows:
   version: 2
   build_all:
     jobs:
       - build_3_6
       - build_3_7
+      - publish-github-release:
+          requires:
+            - build_3_6
+            - build_3_7
+#          filters:
+#            branches:
+#              - master
diff --git a/notebooker/_entrypoints.py b/notebooker/_entrypoints.py
index 309d471b..14f28890 100644
--- a/notebooker/_entrypoints.py
+++ b/notebooker/_entrypoints.py
@@ -3,6 +3,7 @@
 
 import click
 
+from notebooker._version import __version__
 from notebooker.constants import DEFAULT_SERIALIZER
 from notebooker.execute_notebook import execute_notebook_entrypoint
 from notebooker.serialization import SERIALIZER_TO_CLI_OPTIONS
@@ -31,6 +32,7 @@ def filesystem_default_value(dirname):
 
 
 @click.group(cls=NotebookerEntrypoint)
+@click.version_option(__version__, prog_name="Notebooker")
 @click.option("--notebook-kernel-name", default=None, help="The name of the kernel which is running our notebook code.")
 @click.option(
     "--output-base-dir",

From 1804c8fd35eb9e4231a2ffdb07cda8dc54a4509e Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Tue, 15 Dec 2020 18:23:05 +0000
Subject: [PATCH 02/21] Update config.yml

---
 .circleci/config.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81992a27..7823caaa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -136,6 +136,10 @@ defaults: &defaults
           python setup.py bdist_egg
           python setup.py sdist
           cp -r ./dist /tmp/circleci-artifacts
+    - run:
+        name: Upload to PyPI
+        command: |
+          echo $VERSION > /tmp/circleci-artifacts/version.txt
     # - run:
     #     name: Build Docker image
     #     command: docker build -t $IMAGE_NAME:latest .
@@ -179,8 +183,7 @@ jobs:
       - run:
           name: "Publish release on GitHub"
           command: |
-            . ci/bin/activate
-            VERSION=$(notebooker-cli --version | cut -d ' ' -f 3)
+            VERSION=$(cat /tmp/circleci-artifacts/version.txt)
             ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts
 workflows:
   version: 2

From b52fcb6942ec7183bc8fda26fa4a3e730b59f16b Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Wed, 16 Dec 2020 09:24:09 +0000
Subject: [PATCH 03/21] Update config.yml

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7823caaa..91016681 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -139,7 +139,7 @@ defaults: &defaults
     - run:
         name: Upload to PyPI
         command: |
-          echo $VERSION > /tmp/circleci-artifacts/version.txt
+          echo $VERSION > $CIRCLE_ARTIFACTS/version.txt
     # - run:
     #     name: Build Docker image
     #     command: docker build -t $IMAGE_NAME:latest .
@@ -183,6 +183,7 @@ jobs:
       - run:
           name: "Publish release on GitHub"
           command: |
+            ls -ltra /tmp/circleci-artifacts
             VERSION=$(cat /tmp/circleci-artifacts/version.txt)
             ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts
 workflows:

From 99651bebc78b0cac17e252e52b482f6ffa2a3fd9 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 11:29:49 +0000
Subject: [PATCH 04/21] Update config.yml

---
 .circleci/config.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 91016681..73dd78ce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -135,7 +135,7 @@ defaults: &defaults
           python setup.py bdist_wheel --universal
           python setup.py bdist_egg
           python setup.py sdist
-          cp -r ./dist /tmp/circleci-artifacts
+          cp -r ./dist /tmp/circleci-artifacts/build
     - run:
         name: Upload to PyPI
         command: |
@@ -162,6 +162,11 @@ defaults: &defaults
         path: /tmp/circleci-artifacts
     - store_artifacts:
         path: test-results
+    - persist_to_workspace:
+        root: $CIRCLE_ARTIFACTS
+        paths:
+          - version.txt
+          - build/*
 version: 2
 jobs:
   build_3_6:

From 32375314f35ef06a6699ced6b82bc55a7ac7ecba Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 11:40:36 +0000
Subject: [PATCH 05/21] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73dd78ce..eafe360e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -163,7 +163,7 @@ defaults: &defaults
     - store_artifacts:
         path: test-results
     - persist_to_workspace:
-        root: $CIRCLE_ARTIFACTS
+        root: "$CIRCLE_ARTIFACTS"
         paths:
           - version.txt
           - build/*

From 1dd4a744d170cb767773cd0fd8e48ff17bf2784e Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 12:36:36 +0000
Subject: [PATCH 06/21] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eafe360e..35c47263 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -163,7 +163,7 @@ defaults: &defaults
     - store_artifacts:
         path: test-results
     - persist_to_workspace:
-        root: "$CIRCLE_ARTIFACTS"
+        root: /tmp/circleci-artifacts
         paths:
           - version.txt
           - build/*

From 89bd5ed8ed7a62de04bb3a01871bb120ebb55a3e Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 14:03:06 +0000
Subject: [PATCH 07/21] Update config.yml

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 35c47263..24a7797f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -200,7 +200,6 @@ workflows:
       - publish-github-release:
           requires:
             - build_3_6
-            - build_3_7
 #          filters:
 #            branches:
 #              - master

From 95ab54194d03e67e7a5d8f11c0e5f913f26c4a65 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 16:39:46 +0000
Subject: [PATCH 08/21] Update config.yml

---
 .circleci/config.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 24a7797f..7d67d6b0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -71,6 +71,7 @@ defaults: &defaults
        command: |
          virtualenv ci
          . ci/bin/activate
+         export PYTHON_VERSION=$(python -c "import platform; print(platform.python_version())")
          pip install six lxml flake8 tox pytest black .[test]
          python setup.py develop
     # Save dependency cache
@@ -115,7 +116,7 @@ defaults: &defaults
           . ci/bin/activate
           pip install -e ".[docs]"
           python setup.py build_sphinx
-          cp -r ./build /tmp/circleci-artifacts
+          cp -r ./build "/tmp/circleci-artifacts/$PYTHON_VERSION"
     # Build egg
     - run:
         name: Build egg
@@ -135,15 +136,11 @@ defaults: &defaults
           python setup.py bdist_wheel --universal
           python setup.py bdist_egg
           python setup.py sdist
-          cp -r ./dist /tmp/circleci-artifacts/build
+          cp -r ./dist/* "/tmp/circleci-artifacts/dist/$PYTHON_VERSION/"
     - run:
         name: Upload to PyPI
         command: |
-          echo $VERSION > $CIRCLE_ARTIFACTS/version.txt
-    # - run:
-    #     name: Build Docker image
-    #     command: docker build -t $IMAGE_NAME:latest .
-    # Save test results
+          echo $VERSION > "/tmp/circleci-artifacts/$PYTHON_VERSION/version.txt"
     - run:
         name: Upload to PyPI
         command: |
@@ -162,11 +159,6 @@ defaults: &defaults
         path: /tmp/circleci-artifacts
     - store_artifacts:
         path: test-results
-    - persist_to_workspace:
-        root: /tmp/circleci-artifacts
-        paths:
-          - version.txt
-          - build/*
 version: 2
 jobs:
   build_3_6:
@@ -188,9 +180,9 @@ jobs:
       - run:
           name: "Publish release on GitHub"
           command: |
-            ls -ltra /tmp/circleci-artifacts
-            VERSION=$(cat /tmp/circleci-artifacts/version.txt)
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts
+            ls -la /tmp/circleci-artifacts
+            VERSION=$(cat /tmp/circleci-artifacts/3.6*/version.txt)
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/dist/3.6*
 workflows:
   version: 2
   build_all:
@@ -200,6 +192,7 @@ workflows:
       - publish-github-release:
           requires:
             - build_3_6
+            - build_3_7
 #          filters:
 #            branches:
 #              - master

From 33bfa8df8d950dfd3b3e2f6992f3459b238285b3 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 17:20:50 +0000
Subject: [PATCH 09/21] Update config.yml

---
 .circleci/config.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7d67d6b0..aad9e375 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -71,7 +71,6 @@ defaults: &defaults
        command: |
          virtualenv ci
          . ci/bin/activate
-         export PYTHON_VERSION=$(python -c "import platform; print(platform.python_version())")
          pip install six lxml flake8 tox pytest black .[test]
          python setup.py develop
     # Save dependency cache
@@ -162,11 +161,15 @@ defaults: &defaults
 version: 2
 jobs:
   build_3_6:
+    environment:
+      PYTHON_VERSION: 3_6
     working_directory: ~/notebooker_3_6
     docker:
     - image: cimg/python:3.6-node
     <<: *defaults
   build_3_7:
+    environment:
+      PYTHON_VERSION: 3_7
     working_directory: ~/notebooker_3_7
     docker:
     - image: cimg/python:3.7-node
@@ -181,8 +184,8 @@ jobs:
           name: "Publish release on GitHub"
           command: |
             ls -la /tmp/circleci-artifacts
-            VERSION=$(cat /tmp/circleci-artifacts/3.6*/version.txt)
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/dist/3.6*
+            VERSION=$(cat /tmp/circleci-artifacts/3_6/version.txt)
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/dist/3_6
 workflows:
   version: 2
   build_all:

From 793b7f0670c7ccbf43c911b21367a95bc121166b Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 17:28:46 +0000
Subject: [PATCH 10/21] Update config.yml

---
 .circleci/config.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aad9e375..8be664a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,13 +1,6 @@
 defaults: &defaults
     parallelism: 1
     shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      VERSION: 0.1.0
-      PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
-      YARN_STATIC_DIR: notebooker/web/static/
-      IMAGE_NAME: mangroup/notebooker
     steps:
     - checkout
     - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
@@ -163,6 +156,12 @@ jobs:
   build_3_6:
     environment:
       PYTHON_VERSION: 3_6
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      VERSION: 0.1.0
+      PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
+      YARN_STATIC_DIR: notebooker/web/static/
+      IMAGE_NAME: mangroup/notebooker
     working_directory: ~/notebooker_3_6
     docker:
     - image: cimg/python:3.6-node
@@ -170,6 +169,12 @@ jobs:
   build_3_7:
     environment:
       PYTHON_VERSION: 3_7
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      VERSION: 0.1.0
+      PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
+      YARN_STATIC_DIR: notebooker/web/static/
+      IMAGE_NAME: mangroup/notebooker
     working_directory: ~/notebooker_3_7
     docker:
     - image: cimg/python:3.7-node

From a9398afd8e1d07a2d77d2b07087a181f786e6446 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 17:37:34 +0000
Subject: [PATCH 11/21] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8be664a1..bbdc72ba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -155,7 +155,7 @@ version: 2
 jobs:
   build_3_6:
     environment:
-      PYTHON_VERSION: 3_6
+      PYTHON_VERSION: "3_6"
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       VERSION: 0.1.0
@@ -168,7 +168,7 @@ jobs:
     <<: *defaults
   build_3_7:
     environment:
-      PYTHON_VERSION: 3_7
+      PYTHON_VERSION: "3_7"
       CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       VERSION: 0.1.0

From 077a646be32eb6128e9637ef5e09d659d9220eca Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 17:39:43 +0000
Subject: [PATCH 12/21] Update config.yml

---
 .circleci/config.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bbdc72ba..b8cea572 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -156,8 +156,8 @@ jobs:
   build_3_6:
     environment:
       PYTHON_VERSION: "3_6"
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts/3_6
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results/3_6
       VERSION: 0.1.0
       PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
       YARN_STATIC_DIR: notebooker/web/static/
@@ -168,9 +168,8 @@ jobs:
     <<: *defaults
   build_3_7:
     environment:
-      PYTHON_VERSION: "3_7"
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts/3_7
+      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results/3_7
       VERSION: 0.1.0
       PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
       YARN_STATIC_DIR: notebooker/web/static/

From 057d2d2b37e23254f0bb82a998061b1fba4e3dc7 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 17:50:09 +0000
Subject: [PATCH 13/21] Update config.yml

---
 .circleci/config.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b8cea572..96c613be 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,7 +108,7 @@ defaults: &defaults
           . ci/bin/activate
           pip install -e ".[docs]"
           python setup.py build_sphinx
-          cp -r ./build "/tmp/circleci-artifacts/$PYTHON_VERSION"
+          cp -r ./build "$CIRCLE_ARTIFACTS"
     # Build egg
     - run:
         name: Build egg
@@ -119,8 +119,8 @@ defaults: &defaults
           pip install Pygments
           python setup.py --long-description > ../README.rst
           cat ../README.rst | rst2html.py 1> ../README.html 2> ../log
-          cp ../README.rst /tmp/circleci-artifacts
-          cp ../log /tmp/circleci-artifacts
+          cp ../README.rst "$CIRCLE_ARTIFACTS"
+          cp ../log "$CIRCLE_ARTIFACTS"
           if [ -s ../log ] ; then
             cat ../log
             exit 1
@@ -128,11 +128,11 @@ defaults: &defaults
           python setup.py bdist_wheel --universal
           python setup.py bdist_egg
           python setup.py sdist
-          cp -r ./dist/* "/tmp/circleci-artifacts/dist/$PYTHON_VERSION/"
+          cp -r ./dist/* "$CIRCLE_ARTIFACTS"
     - run:
         name: Upload to PyPI
         command: |
-          echo $VERSION > "/tmp/circleci-artifacts/$PYTHON_VERSION/version.txt"
+          echo $VERSION > "$CIRCLE_ARTIFACTS/version.txt"
     - run:
         name: Upload to PyPI
         command: |

From fa586a39726ba9be6bbddcca1347eed3d9ae6094 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 18:05:46 +0000
Subject: [PATCH 14/21] Update config.yml

---
 .circleci/config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 96c613be..be3395a2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -151,6 +151,11 @@ defaults: &defaults
         path: /tmp/circleci-artifacts
     - store_artifacts:
         path: test-results
+    - persist_to_workspace:
+        root: /tmp/circleci-artifacts
+        paths:
+          - version.txt
+          - build/*
 version: 2
 jobs:
   build_3_6:

From 74745774d1466145844be3012f5834bd8dc43866 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 18:06:37 +0000
Subject: [PATCH 15/21] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be3395a2..59a47c2b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -154,8 +154,8 @@ defaults: &defaults
     - persist_to_workspace:
         root: /tmp/circleci-artifacts
         paths:
-          - version.txt
-          - build/*
+          - */version.txt
+          - */build/*
 version: 2
 jobs:
   build_3_6:

From d7f973607d6a49721dd4e490d3d5dc688b693c38 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 18:07:26 +0000
Subject: [PATCH 16/21] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59a47c2b..c66ee1e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -154,8 +154,8 @@ defaults: &defaults
     - persist_to_workspace:
         root: /tmp/circleci-artifacts
         paths:
-          - */version.txt
-          - */build/*
+          - ./*/version.txt
+          - ./*/build/*
 version: 2
 jobs:
   build_3_6:

From 9ad9622d99e75fd7748650bdbf37d2fe1fa00373 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 18:22:28 +0000
Subject: [PATCH 17/21] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c66ee1e5..d7b5372b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -194,7 +194,7 @@ jobs:
           command: |
             ls -la /tmp/circleci-artifacts
             VERSION=$(cat /tmp/circleci-artifacts/3_6/version.txt)
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/dist/3_6
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/3_6
 workflows:
   version: 2
   build_all:

From e7b6136adcd9f4b8ec1ea2403b60fb71ead790ce Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 18:35:53 +0000
Subject: [PATCH 18/21] Update config.yml

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d7b5372b..98dd1c8a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -128,7 +128,7 @@ defaults: &defaults
           python setup.py bdist_wheel --universal
           python setup.py bdist_egg
           python setup.py sdist
-          cp -r ./dist/* "$CIRCLE_ARTIFACTS"
+          cp -r ./dist/* "$CIRCLE_ARTIFACTS/dist"
     - run:
         name: Upload to PyPI
         command: |
@@ -155,7 +155,7 @@ defaults: &defaults
         root: /tmp/circleci-artifacts
         paths:
           - ./*/version.txt
-          - ./*/build/*
+          - ./*/dist/*
 version: 2
 jobs:
   build_3_6:
@@ -192,9 +192,9 @@ jobs:
       - run:
           name: "Publish release on GitHub"
           command: |
-            ls -la /tmp/circleci-artifacts
+            ls -la /tmp/circleci-artifacts/3_6
             VERSION=$(cat /tmp/circleci-artifacts/3_6/version.txt)
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/3_6
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /tmp/circleci-artifacts/3_6/dist
 workflows:
   version: 2
   build_all:

From a79241c5c20cee1528b2ff64c09bce5b5ea078bd Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 18:47:42 +0000
Subject: [PATCH 19/21] Update config.yml

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98dd1c8a..a819ae9d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -128,6 +128,7 @@ defaults: &defaults
           python setup.py bdist_wheel --universal
           python setup.py bdist_egg
           python setup.py sdist
+          mkdir -p "$CIRCLE_ARTIFACTS/dist"
           cp -r ./dist/* "$CIRCLE_ARTIFACTS/dist"
     - run:
         name: Upload to PyPI

From 757ea8f4f1b5fdffcd0e40ed5b50f8b7ed02bf84 Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 19:00:20 +0000
Subject: [PATCH 20/21] Update config.yml

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a819ae9d..d8b0e9d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -206,6 +206,6 @@ workflows:
           requires:
             - build_3_6
             - build_3_7
-#          filters:
-#            branches:
-#              - master
+          filters:
+            branches:
+              - master

From d567969f0b39adedfd0a57c2a1438219f94d53cf Mon Sep 17 00:00:00 2001
From: Jon Bannister <jon.bannister@man.com>
Date: Thu, 17 Dec 2020 19:04:17 +0000
Subject: [PATCH 21/21] Update config.yml

Only run on master
---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d8b0e9d8..b334f64d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -208,4 +208,5 @@ workflows:
             - build_3_7
           filters:
             branches:
-              - master
+              only:
+                - master