diff options
| author | Elod Illes <elod.illes@est.tech> | 2020-05-26 14:58:58 +0200 |
|---|---|---|
| committer | Elod Illes <elod.illes@est.tech> | 2020-05-26 16:33:33 +0200 |
| commit | 93baa22645d5ba64fa8b1d44cc97525437312256 (patch) | |
| tree | d6fbc604582e05a34af595a7a9ac8d156e0d49ff | |
| parent | 4ab9e91d851b32ff124437d7444fe9bd32603451 (diff) | |
| download | ceilometer-stable/rocky.tar.gz | |
[stable-only] Add confluent-kafka to test-requirementsstable/rocky
As confluent-kafka 1.4.2 was released, which is based on librdkafka
v1.4.2, which drops python 2 support, the py27 tox job started to
fail with the following error:
[..]/confluent_kafka/cimpl.so: undefined symbol: PyUnicodeUCS2_FromObject
confluent-kafka is pulled in by an extra with oslo.messaging. In
oslo.messaging's setup.cfg kafka is lower constrained only [1].
oslo.messaging uses global upper-constraints.txt which constrain
confluent-kafka to version 0.11.6.
Ceilometer however does not use global upper-constraints.txt, so when
installing oslo.message[kafka] it pulls in latest confluent-kafka.
To avoid failure of py27 tox target, this patch introduces explicit
requirement of confluent-kafka, with an upper constraint for python 2.
NOTE(elod.illes): this patch is only needed in Stein and older stable
branches, as from Train ceilometer uses global upper-constraints.txt.
Conflicts:
test-requirements.txt
[1] https://opendev.org/openstack/oslo.messaging/src/branch/stable/stein/setup.cfg#L28
Change-Id: Ia0d4b2c3d46764315b02e7fb2ade17a73a46f4b7
(cherry picked from commit 41428813d89c000c1d05718e4fb73cea6f02c88c)
| -rw-r--r-- | test-requirements.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index aa060282..8ddfeae2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,6 +8,8 @@ mock>=1.2 # BSD os-win>=0.2.3 # Apache-2.0 # Docs Requirements openstackdocstheme>=1.11.0 # Apache-2.0 +confluent-kafka>=0.11.6,<1.4.2; python_version<'3.0' # Apache-2.0 +confluent-kafka>=0.11.6; python_version>='3.0' # Apache-2.0 oslo.messaging[kafka]!=9.0.0,>=5.12.0 # Apache-2.0 reno>=1.6.2 # Apache2 oslotest>=2.15.0 # Apache-2.0 |