diff options
| author | Ivan Kolodyazhny <e0ne@e0ne.info> | 2020-03-13 17:35:51 +0200 |
|---|---|---|
| committer | Akihiro Motoki <amotoki@gmail.com> | 2020-03-31 08:27:12 +0900 |
| commit | 9813577f7d0137da0e29c7630cffc3e1e1b329f5 (patch) | |
| tree | 122da4ac21c39f04d4ede22735b7193bde2a848f | |
| parent | e058e381607e93439a59f47c36e6a9b7cf61cc71 (diff) | |
| download | horizon-9813577f7d0137da0e29c7630cffc3e1e1b329f5.tar.gz | |
Update pyScss to 1.3.7
pyScss 1.3.4 is not compatible with setuptools 46.
pyScss 1.3.7 was releaed to make it work with setuptools 46.
Note that a workaround for the material design theme
in commit ddc52a7405f0be38629f665d24bcf75022ce0018 is not backported
in this change as the workaround is a partial fix of bug 1771559.
Instead, a release note to mention this as a known issue is added.
python-memcached in test-requirements.txt is updated to
pass the requirements-check job.
Depends-On: https://review.opendev.org/716004
Change-Id: I336a3449c1ed8be3984da6366e9b45f8e4d3f5c0
(cherry picked from commit 2c44702724f25c8114e1a7318d45cd0f87a6c131)
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml | 13 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 3 |
4 files changed, 17 insertions, 3 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt index 1cc785950..4f9460fa6 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -92,7 +92,7 @@ pymongo==3.0.2 pyOpenSSL==17.1.0 pyparsing==2.1.0 pyperclip==1.5.27 -pyScss==1.3.4 +pyScss==1.3.7 python-cinderclient==4.0.1 python-dateutil==2.5.3 python-glanceclient==2.8.0 diff --git a/releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml b/releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml new file mode 100644 index 000000000..cdf8a2a0c --- /dev/null +++ b/releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml @@ -0,0 +1,13 @@ +--- +issues: + - | + The material design theme is now broken with pyScss 1.3.7 + (also see the upgrade notice section). + If you really depends on the material design theme, keep using + pyScss 1.3.4 with setuptools<45 (while the horizon dependencies list + says pyScss>=1.3.7 is required). + The issue is tracked via [:bug:`1771559`]. +upgrade: + - | + pyScss 1.3.7 is now required due to the incompatibility that + pyScss 1.3.4 used before in horizon does not work with setuptools 46. diff --git a/requirements.txt b/requirements.txt index 0a8f8be5a..5b2c10550 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,7 @@ oslo.utils>=3.33.0 # Apache-2.0 osprofiler>=2.3.0 # Apache-2.0 Pint>=0.5 # BSD pymongo!=3.1,>=3.0.2 # Apache-2.0 -pyScss!=1.3.5,>=1.3.4 # MIT License +pyScss>=1.3.7 # MIT License python-cinderclient>=4.0.1 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0 python-keystoneclient>=3.15.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 53bcea9b9..ab6d9949b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -17,7 +17,8 @@ flake8-import-order==0.12 # LGPLv3 mock>=2.0.0 # BSD mox3>=0.20.0 # Apache-2.0 nodeenv>=0.9.4 # BSD -python-memcached>=1.59 # PSF +python-memcached>=1.59;python_version=='2.7' # PSF +python-memcached>=1.59;python_version>='3.4' # PSF pylint==2.2.2;python_version>='3.0' # GPLv2 selenium>=2.50.1 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD |