Merge pull request #303 from CloudVE/conditional_badges_with_moto_fix

Conditional badges with moto fix

.github/workflows/integration.yaml

@@ -107,7 +107,7 @@ jobs:
           CB_PLACEMENT_OS: ${{ secrets.CB_PLACEMENT_OS }}
 
       - name: Create Build Status Badge
-        if: ${{ always() }}
+        if: github.ref == 'refs/heads/master'
         uses: schneegans/dynamic-badges-action@v1.1.0
         with:
           auth: ${{ secrets.BUILD_STATUS_GIST_SECRET }}

requirements.txt

@@ -1,4 +1,3 @@
 # needed by moto
 sshpubkeys
-git+https://github.com/CloudVE/moto@resync_instance_types
 -e ".[dev]"

setup.py

@@ -58,7 +58,7 @@ REQS_FULL = REQS_AWS + REQS_GCP + REQS_OPENSTACK + REQS_AZURE
 REQS_DEV = ([
     'tox>=2.1.1',
     'nose',
-    'moto>=1.3.2',
+    'moto>=3.1.18',
     'sphinx>=1.3.1',
     'pydevd',
     'flake8>=3.3.0',