diff options
author | Matthias Runge <mrunge@redhat.com> | 2022-09-29 09:18:43 +0200 |
---|---|---|
committer | Yadnesh Kulkarni <ykulkarn@redhat.com> | 2022-12-15 11:39:49 +0530 |
commit | 1b6fb52d3aeeada83ac12a071e38587f3a129965 (patch) | |
tree | 92f5ec38a8773ba9e7a3d8466f0884561663a58a | |
parent | 20756c9bd8ccb5e25c61e68769d04d4913725128 (diff) | |
download | ceilometer-1b6fb52d3aeeada83ac12a071e38587f3a129965.tar.gz |
Remove queue declaration and fix lower-constraints jobs
This commit combines the following changes:
* Remove lingering queue declaration from .zuul.yaml file.
https://review.opendev.org/859777 (master)
Co-authored-by: Matthias Runge <mrunge@redhat.com>
* Bump up "lxml" to 4.2.3
While building 'lxml.etree' extension, lower-constraint job
fails with the error:
```
src/lxml/lxml.etree.c: In function ‘__Pyx_ExceptionSave’:
src/lxml/lxml.etree.c:202693:21: error: ‘PyThreadState’ {aka ‘struct _ts’} has no member named ‘exc_type’; did you mean ‘curexc_type’?
202693 | *type = tstate->exc_type;
| ^~~~~~~~
| curexc_type
```
https://review.opendev.org/744612 (master)
Co-authored-by: Ghanshyam Mann <gmann@ghanshyammann.com>
* Set upper constraint for cryptography
Lower constraint job fails due to missing flag
"X509_V_FLAG_CB_ISSUER_CHECK" while running unit test cases
```
AttributeError: module \'lib\' has no attribute \'ERR_load_RAND_strings\'
```
ERR_load_RAND_strings was removed in cryptography 35.0.0[1]
Since ceilometer doesn't have a constraint for it, the latest
package gets installed, which is 38.0.4 as of now.
This change sets cryptography to use "3.4.8" which is the last
release to have the missing attribute.
Co-authored-by: Yadnesh Kulkarni <ykulkarn@redhat.com>
* Bump up "tenacity" to 4.12.0
Since "async" became a keyword in Python3.7[2], lower constraint
job fails with error:
```
from tenacity.async import AsyncRetrying
^
SyntaxError: invalid syntax
```
https://review.opendev.org/744612 (master)
Co-authored-by: Ghanshyam Mann <gmann@ghanshyammann.com>
* Bump up "oslo.messaging" to 8.0.0
Since "async" became a keyword in Python3.7[2], lower constraint
job fails with error:
```
sender = zmq_senders.RequestSenderDirect(conf, async=True)
^
SyntaxError: invalid syntax
```
The use of "async" was changed to "use_async" in [3]
https://review.opendev.org/744612 (master)
Co-authored-by: Ghanshyam Mann <gmann@ghanshyammann.com>
[1] https://github.com/pyca/cryptography/commit/c2e97f9a777d9984608240d923f12acd7758f0aa
[2] https://bugs.python.org/issue30406
[3] https://github.com/openstack/oslo.messaging/commit/5626782fac8e0c16e52146040fcf4053aee2c95e
Change-Id: I9b34ac062d45b2b839dc9d6e0cdce696185890e4
(cherry picked from commit 7e545b0fd9fd4a393d9e2af30f9fc370b20078c0)
(cherry picked from commit 142cb0b6e6f6fa85634c5176c84ab15d6511fa89)
-rw-r--r-- | .zuul.yaml | 1 | ||||
-rw-r--r-- | lower-constraints.txt | 6 | ||||
-rw-r--r-- | requirements.txt | 6 | ||||
-rw-r--r-- | test-requirements.txt | 1 |
4 files changed, 7 insertions, 7 deletions
@@ -31,7 +31,6 @@ - telemetry-dsvm-integration-train: irrelevant-files: *ceilometer-irrelevant-files gate: - queue: telemetry jobs: - grenade-dsvm-ceilometer - telemetry-dsvm-integration-train: diff --git a/lower-constraints.txt b/lower-constraints.txt index 9f7cdb03..4238a24f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -8,7 +8,7 @@ gabbi==1.30.0 gnocchiclient==7.0.0 jsonpath-rw-ext==1.1.3 keystoneauth1==3.9.0 -lxml==3.4.1 +lxml==4.2.3 mock==2.0.0 monotonic==0.6 msgpack==0.5.0 @@ -19,7 +19,7 @@ oslo.concurrency==3.26.0 oslo.config==5.2.0 oslo.i18n==3.15.3 oslo.log==3.36.0 -oslo.messaging==6.2.0 +oslo.messaging==8.0.0 oslo.privsep==1.32.0 oslo.reports==1.18.0 oslo.rootwrap==2.0.0 @@ -43,7 +43,7 @@ requests-aws==0.1.4 six==1.10.0 stestr==2.0.0 stevedore==1.20.0 -tenacity==4.4.0 +tenacity==4.12.0 testscenarios==0.4 testtools==2.2.0 tooz==1.47.0 diff --git a/requirements.txt b/requirements.txt index 8f83aa71..a8e70391 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ cotyledon>=1.3.0 #Apache-2.0 futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD futurist>=1.8.0 # Apache-2.0 jsonpath-rw-ext>=1.1.3 # Apache-2.0 -lxml>=3.4.1 # BSD +lxml>=4.2.3 # BSD monotonic>=0.6;python_version<'3.3' # Apache-2.0 msgpack>=0.5.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 @@ -17,7 +17,7 @@ oslo.log>=3.36.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0 oslo.rootwrap>=2.0.0 # Apache-2.0 pbr>=2.0.0 # Apache-2.0 -oslo.messaging>=6.2.0 # Apache-2.0 +oslo.messaging>=8.0.0 # Apache-2.0 oslo.upgradecheck>=0.1.1 # Apache-2.0 oslo.utils>=3.37.0 # Apache-2.0 oslo.privsep>=1.32.0 # Apache-2.0 @@ -33,7 +33,7 @@ PyYAML>=3.12 # MIT requests>=2.14.2 # Apache-2.0 six>=1.10.0 # MIT stevedore>=1.20.0 # Apache-2.0 -tenacity>=4.4.0,<7.0.0 # Apache-2.0 +tenacity>=4.12.0,<7.0.0 # Apache-2.0 tooz[zake]>=1.47.0 # Apache-2.0 os-xenapi>=0.3.3 # Apache-2.0 oslo.cache>=1.26.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index de1123d2..6c89b3cc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,3 +15,4 @@ testtools>=2.2.0 # MIT gabbi>=1.30.0 # Apache-2.0 requests-aws>=0.1.4 # BSD License (3 clause) stestr>=2.0.0 # Apache-2.0 +cryptography<=3.4.8 # Apache-2.0 |