Merge branch 'develop' into renovate/tox-3.x

RmStorm · web-flow · commit 28075aa8e622 · 2019-07-12T08:42:53.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
             tox
   publish:
     docker:
-      - image: circleci/python:3.6.9
+      - image: circleci/python:3.8.0b1
     working_directory: ~/repo
     steps:
       - checkout
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-pytest==4.4.2
-docker-compose==1.24.0
-tox==3.13.2
+tox==3.13.2
+pytest==5.0.1
+docker-compose==1.24.1
