From 25a2c2c29dbbfa237cb60e4bd397f15d4a270807 Mon Sep 17 00:00:00 2001
From: Steve Gore <steve.j.gore@gmail.com>
Date: Tue, 3 Sep 2019 14:50:33 +1000
Subject: [PATCH 1/4] Attempt a different fix

---
 .circleci/config.yml | 39 ++++++++++++++++++++++++---------------
 poetry.lock          |  2 +-
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2c1abb32..8cd621c3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,29 +6,38 @@ orbs:
 workflows:
   version: 2
 
-  "PyPi Project":
+  "PyPI Project":
     jobs:
-      - q-ctrl/pytest_python_36_open:
-          context: q-ctrl-api-development      
-          filters:
-            tags:  # Tag filter required because the release job has a tag filter
-              only: /.*/
-      - q-ctrl/open_build_and_publish_internally:
-          context: q-ctrl-api-development
+      - q-ctrl/pytest_python_36_test:
+          name: pytest 3.6 (Production)
+          context: q-ctrl-api-production
           filters:
             branches:
               only: 
                 - master
-            tags:  # Tag filter required because the release job has a tag filter
-              only: /.*/                
-      - q-ctrl/publish_publicly:
+            tags:
+              only: /^v?\d+(\.\d+){1,2}$/
+      - q-ctrl/pytest_python_37_test:
+          name: pytest 3.7 (Production)
           context: q-ctrl-api-production
-          requires:
-            - q-ctrl/pytest_python_36_open          
-            - q-ctrl/open_build_and_publish_internally
           filters:
             branches:
               only: 
-                - master
+                - master       
             tags:
               only: /^v?\d+(\.\d+){1,2}$/
+      - q-ctrl/build_and_publish_internally:
+          name: Build & Publish Internally
+          context: q-ctrl-api-development
+          filters:
+            branches:
+              only: 
+                - master
+            tags:
+              only: /^v?\d+(\.\d+){1,2}$/              
+      - q-ctrl/publish_publicly:
+          context: q-ctrl-api-production
+            - Build & Publish Internally
+          filters:
+            tags:
+              only: /^v?\d+(\.\d+){1,2}$/
\ No newline at end of file
diff --git a/poetry.lock b/poetry.lock
index d6493097..0b07c4cf 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -100,7 +100,7 @@ networkx = ">=2.1,<3.0"
 numpy = ">=1.12,<2.0"
 protobuf = ">=3.5,<4.0"
 scipy = ">=1.1,<2.0"
-sortedcontainers = ">=1.5,<2.0"
+sortedcontainers = ">=1.5,<=2.0"
 sympy = "*"
 typing = ">=3.6,<4.0"
 typing-extensions = "*"

From dc3915a7e224abdfd149269d6022c3cb4fc00da3 Mon Sep 17 00:00:00 2001
From: Steve Gore <steve.j.gore@gmail.com>
Date: Tue, 3 Sep 2019 14:54:43 +1000
Subject: [PATCH 2/4] Reinstate missing yaml line

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8cd621c3..fa0ac12c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -36,7 +36,9 @@ workflows:
             tags:
               only: /^v?\d+(\.\d+){1,2}$/              
       - q-ctrl/publish_publicly:
+          name: Publish Publicly
           context: q-ctrl-api-production
+          requires:
             - Build & Publish Internally
           filters:
             tags:

From 43c60e4d1a0cfa9ae81dc7389120a59f34b1c91f Mon Sep 17 00:00:00 2001
From: Steve Gore <steve.j.gore@gmail.com>
Date: Tue, 3 Sep 2019 15:01:11 +1000
Subject: [PATCH 3/4] Remove filters on tests

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fa0ac12c..e5c3b5cb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,21 +11,9 @@ workflows:
       - q-ctrl/pytest_python_36_test:
           name: pytest 3.6 (Production)
           context: q-ctrl-api-production
-          filters:
-            branches:
-              only: 
-                - master
-            tags:
-              only: /^v?\d+(\.\d+){1,2}$/
       - q-ctrl/pytest_python_37_test:
           name: pytest 3.7 (Production)
           context: q-ctrl-api-production
-          filters:
-            branches:
-              only: 
-                - master       
-            tags:
-              only: /^v?\d+(\.\d+){1,2}$/
       - q-ctrl/build_and_publish_internally:
           name: Build & Publish Internally
           context: q-ctrl-api-development

From 60ceed2faaca9c862891ff0abbadebc53b601abe Mon Sep 17 00:00:00 2001
From: Steve Gore <steve.j.gore@gmail.com>
Date: Tue, 3 Sep 2019 15:15:01 +1000
Subject: [PATCH 4/4] Drop 3.6 tests and use latest orb

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e5c3b5cb..6441add4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,16 +1,13 @@
 version: 2.1
 
 orbs:
-  q-ctrl: q-ctrl/python@dev:0.1.2
+  q-ctrl: q-ctrl/python@dev:0.1.3
 
 workflows:
   version: 2
 
   "PyPI Project":
     jobs:
-      - q-ctrl/pytest_python_36_test:
-          name: pytest 3.6 (Production)
-          context: q-ctrl-api-production
       - q-ctrl/pytest_python_37_test:
           name: pytest 3.7 (Production)
           context: q-ctrl-api-production