Merge pull request #7 from upsidetravel/final-test-circle-builds

bump to 0.0.3

Author: necaris

.circleci/config.yml

@@ -45,6 +45,16 @@ jobs:
             command: |
               poetry publish --build --username "${PYPI_USERNAME}" --password "${PYPI_PASSWORD}" --no-interaction
 
+  tag_is_on_master:
+   docker:
+      - image: alpine/git:1.0.7
+   steps:
+      - checkout
+      - run:
+          name: Check that the tag being built is on master
+          command: |
+            [ "" != "$CIRCLE_TAG" ] && (git branch -a --contains "$CIRCLE_TAG" | grep -c "remotes/origin/master")
+
 # When to run which job
 workflows:
   version: 2.1
@@ -54,21 +64,31 @@ workflows:
       - build
 
   # The deployment workflow publishes the package, and is only run on a Git tag matching a
-  # version regex being merged to master
+  # version regex that exists on master
   deployment-workflow:
     jobs:
       - build:
+          requires:
+            - tag_is_on_master
+          filters:
+            tags:
+              only: /v[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/
+
+      - tag_is_on_master:
           filters:
             tags:
               only: /v[0-9]+(\.[0-9]+)*/
             branches:
-              only: master
+              ignore: /.*/
 
       - deployment:
           requires:
             - build
+            - tag_is_on_master
           filters:
               tags:
                 only: /v[0-9]+(\.[0-9]+)*/
               branches:
-                only: master
+                ignore: /.*/

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "graphene_pydantic"
-version = "0.0.2"
+version = "0.0.3"
 description = "Graphene Pydantic integration"
 readme = "README.md"
 repository = "https://github.com/upsidetravel/graphene-pydantic"
@@ -25,12 +25,12 @@ graphene = ">=2.1.3,<3"
 pydantic = ">=0.25,<0.30"
 
 [tool.poetry.dev-dependencies]
-pytest = "~4.6.3"
+pytest = "~4.6.4"
 pytest-cov = "~2.7.1"
-tox = "3.7.0"  # sync with tox.ini
+tox = "~3.12.0"  # sync with tox.ini
 mypy = "0.720"
 black = "19.3b0"
-pre-commit = "1.14.4"
+pre-commit = "~1.17.0"
 
 [build-system]
 requires = ["poetry>=0.12"]