Merge branch 'master' into dependabot/pip/paramiko-2.7.2

pyiron · Feb 1, 2021 · 6fb0fd9 · 6fb0fd9
2 parents 41a1bfa + 343e1e8
commit 6fb0fd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml
@@ -6,7 +6,7 @@ dependencies:
   - coverage
   - codacy-coverage
   - pandas >=0.24.2
-  - pyyaml >=5.1.2
+  - pyyaml >=5.4.1
   - jinja2 >=2.11.2
   - paramiko >=2.7.2
   - tqdm >=4.35.0
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
                       'jinja2==2.11.2',
                       'pandas==0.24.2',
                       'paramiko==2.7.2',
-                      'pyyaml==5.1.2',
+                      'pyyaml==5.4.1',
                       'tqdm==4.35.0'],
     cmdclass=versioneer.get_cmdclass(),
     )