diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c1abb32..6441add4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,34 +1,30 @@ 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": + "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: + - q-ctrl/pytest_python_37_test: + name: pytest 3.7 (Production) + context: q-ctrl-api-production + - q-ctrl/build_and_publish_internally: + name: Build & Publish Internally context: q-ctrl-api-development filters: branches: only: - master - tags: # Tag filter required because the release job has a tag filter - only: /.*/ + tags: + only: /^v?\d+(\.\d+){1,2}$/ - q-ctrl/publish_publicly: + name: Publish Publicly context: q-ctrl-api-production requires: - - q-ctrl/pytest_python_36_open - - q-ctrl/open_build_and_publish_internally + - Build & Publish Internally filters: - branches: - only: - - master tags: - only: /^v?\d+(\.\d+){1,2}$/ + 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 = "*"