Merge branch 'fix/fix_pyyaml_version_restrictions_v1.1' into 'release…

…/v1.1' fix: use 5.2 for python 3.4 and 2.7 (v1.1) See merge request espressif/idf-component-manager!154
espressif · Jun 30, 2022 · 04c4d51 · 04c4d51
2 parents ba14f31 + 5a21ac6
commit 04c4d51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Loose the restrictions for pyyaml on python 2.7 and 3.4
+
 ## [1.1.3] 2022-06-21
 
 ### Fixed

diff --git a/setup.py b/setup.py
@@ -21,9 +21,9 @@
     'contextlib2>0.6.0;python_version>="3.6"',
     'future',
     'pathlib;python_version<"3.4"',
-    'pyyaml<5;python_version=="3.4.*"',
-    'pyyaml>=5;python_version>="3.5"',
-    'pyyaml>=5;python_version=="2.7.*"',
+    'pyyaml<=5.2;python_version=="3.4.*"',
+    'pyyaml>5.2;python_version>="3.5"',
+    'pyyaml<=5.2;python_version=="2.7.*"',
     'requests<3',
     'requests-toolbelt',
     'schema',