diff options
| author | Victor Stinner <vstinner@redhat.com> | 2015-08-27 00:51:58 +0200 |
|---|---|---|
| committer | Victor Stinner <vstinner@redhat.com> | 2015-11-05 15:56:24 +0100 |
| commit | 609095b23f6c5734c6a7aed80c488b96b31137e8 (patch) | |
| tree | 70f4082cefa2f0dc34fc593610e67bde2dc89ec3 /requirements.txt | |
| parent | ec9095bf581fa0f369a68a7f1b2e3a9ac156b4a6 (diff) | |
| download | swift-609095b23f6c5734c6a7aed80c488b96b31137e8.tar.gz | |
On py3, use dnspython3 dependency, not dnspython
Update requirements to install dnspython3 on Python 3 and dnspython on
Python 2. dnspython is not compatible with Python 3, and dnspython3
is not compatible with Python 2.
Add a requirement on pbr to ensure that pbr 1.6 or newer is
installed. pbr 1.0 or newer is required to support environment
markers in requirements which are now used to select dnspython or
dnspython3 depending on the Python major version.
Note: pbr 1.0 is enough, but OpenStack global requirements asks to
use "pbr>=1.6".
Change-Id: Ie5d437cd396972d4143ffffb96ec3c289e221b08
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index e85555288..bac2dd236 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,9 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -dnspython>=1.9.4 +pbr>=1.6 +dnspython>=1.12.0;python_version<'3.0' +dnspython3>=1.12.0;python_version>='3.0' eventlet>=0.16.1,!=0.17.0 greenlet>=0.3.1 netifaces>=0.5,!=0.10.0,!=0.10.1 |