Merge pull request #29 from shanejansen/dependabot/pip/urllib3-1.26.5

Bump urllib3 from 1.26.4 to 1.26.5
shanejansen · Aug 23, 2021 · 7f4593d · 7f4593d
2 parents 0bb1f46 + 82f7178
commit 7f4593d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 31 deletions.
diff --git a/.github/workflows/touchstone-tests.yml b/.github/workflows/touchstone-tests.yml
@@ -3,7 +3,9 @@ name: Touchstone Tests
 on:
   push:
     branches:
-      - 'develop'
+      - 'master'
+      - 'hotfix/**'
+      - 'release/**'
 
 jobs:
   build:

diff --git a/Pipfile b/Pipfile
@@ -10,7 +10,7 @@ pyspark = "~=2.3.2"
 pyfiglet = "~=0.8"
 click = "~=7.0"
 pika = "~=1.1"
-pyyaml = "~=5.2"
+pyyaml = "~=5.4"
 pymongo = "~=3.10"
 pymysql = "~=0.9.3"
 minio = "~=5.0.7"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
         'pyfiglet~=0.8',
         'click~=7.0',
         'pika~=1.1',
-        'pyyaml~=5.2',
+        'pyyaml~=5.4',
         'pymongo~=3.10',
         'pymysql~=0.9.3',
         'minio~=5.0.7'