Skip to content

Commit

Permalink
Fixed PyYAML 5.4 install issue with Cython 3
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Maier <[email protected]>
  • Loading branch information
andy-maier committed Jul 31, 2023
1 parent 375d881 commit ba52d90
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
7 changes: 5 additions & 2 deletions docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,16 @@ in this version, please update it in your installation.
* Fixed RTD docs build ssue with OpenSSL version by providing a .readthedocs.yaml
file that specifies Ubuntu 22.04 as the build OS.

* Increased minimum zhmcclient version to 1.8.1 to pick up fixes and improvements
* Increased minimum zhmcclient version to 1.9.1 to pick up fixes and improvements
for HMC session handling, including the handling of HTTP 403.4. (related to
issue #336)
issue #336) and the version change for PyYAML in zhmcclient.

* Occurrences of most HTTP 403.x failures are now handled by logging on again
and retrying, instead of abandoning. (related to issue #336)

* Fixed issue with PyYAML 5.4 installation on Python>=3.10 that fails since
the recent release of Cython 3.

**Enhancements:**

* Enabled the 'partition-attached-network-interface' metric group in the
Expand Down
5 changes: 2 additions & 3 deletions minimum-constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ wheel==0.38.1; python_version >= '3.7'

# Direct dependencies for runtime (must be consistent with requirements.txt)

zhmcclient==1.8.1
zhmcclient==1.9.1

prometheus-client==0.9.0
urllib3==1.26.5
Expand All @@ -87,8 +87,7 @@ six==1.14.0; python_version <= '3.9'
six==1.16.0; python_version >= '3.10'
Jinja2==2.11.3
# PyYAML is also used by dparse
PyYAML==5.3.1; python_version == '3.5'
PyYAML==5.4; python_version >= '3.6'
PyYAML==5.3.1

# Indirect dependencies for runtime that require a version constraint (must be consistent with requirements.txt)

Expand Down
12 changes: 9 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

# Direct dependencies for runtime (must be consistent with minimum-constraints.txt)

# zhmcclient @ git+https://github.com/zhmcclient/python-zhmcclient.git@stable_1.8
zhmcclient>=1.8.1
# zhmcclient @ git+https://github.com/zhmcclient/python-zhmcclient.git@master
zhmcclient>=1.9.1

prometheus-client>=0.9.0
urllib3>=1.25.9; python_version <= '3.9'
Expand All @@ -21,8 +21,14 @@ Jinja2>=2.11.3
# PyYAML 5.3.1 addressed issue 38100 reported by safety
# PyYAML is also used by dparse and python-coveralls
# PyYAML 5.4 has removed support for py35
# PyYAML 5.3 has wheel archives for Python 2.7, 3.5 - 3.9
# PyYAML 5.4 has wheel archives for Python 2.7, 3.6 - 3.9
# PyYAML 6.0 has wheel archives for Python 3.6 - 3.11
# PyYAML 5.4 and 6.0.0 fails install since Cython 3 was released, see issue
# https://github.com/yaml/pyyaml/issues/724.
PyYAML>=5.3.1; python_version == '3.5'
PyYAML>=5.4; python_version >= '3.6'
PyYAML>=5.3.1,!=5.4.0,!=5.4.1; python_version >= '3.6' and python_version <= '3.11'
PyYAML>=5.3.1,!=5.4.0,!=5.4.1,!=6.0.0; python_version >= '3.12'

# Indirect dependencies for runtime (must be consistent with minimum-constraints.txt)

Expand Down

0 comments on commit ba52d90

Please sign in to comment.