diff options
| author | Tim Burke <tim.burke@gmail.com> | 2020-09-08 12:07:48 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2020-09-18 12:22:01 -0700 |
| commit | 5cb906148709ccc74ca96463fd69a5cae2381edb (patch) | |
| tree | e061b4bf360d216cc1e292c8d421969f9f55c4b7 | |
| parent | 9d8db8f6126542dc18ea1b14e078d64cc1a254e4 (diff) | |
| download | python-swiftclient-5cb906148709ccc74ca96463fd69a5cae2381edb.tar.gz | |
Clean up some requirements
* Drop the py26 marker for futures; we don't support 2.6 anymore.
* Split hacking version used based on python version.
* Clean up sphinx split -- 2.0+ aren't available to install on py2,
anyway.
Depends-On: https://review.opendev.org/#/c/752340/
Depends-On: https://review.opendev.org/#/c/752736/
Change-Id: I5a6ba8e65c23ada7297f6684dcbdd886591d0af5
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 3ee9fc2..5700e3b 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,5 +1,4 @@ keystoneauth1>=3.4.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7' # BSD -sphinx>=2.0.0,!=2.1.0;python_version>='3.4' # BSD +sphinx>=1.6.2,!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0 # BSD reno>=2.5.0 # Apache-2.0 openstackdocstheme>=1.31.2 # Apache-2.0 diff --git a/requirements.txt b/requirements.txt index 1c2ce33..4757239 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD +futures>=3.0.0;python_version=='2.7' # BSD requests>=1.1.0 six>=1.9.0 diff --git a/test-requirements.txt b/test-requirements.txt index 5dba1a6..c2fb2c6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,5 @@ -hacking>=1.1.0,<1.2.0 # Apache-2.0 +hacking>=1.1.0,<1.2.0;python_version<'3.0' # Apache-2.0 +hacking>=3.2.0,<3.3.0;python_version>='3.0' # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0 |