summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2017-03-29 05:02:57 -0500
committerMonty Taylor <mordred@inaugust.com>2017-03-29 05:02:57 -0500
commit6fc1f5e8005a1e29b3356ac39856f6c63ec5fa2f (patch)
tree62427a4d331cac57a88b820bc9746366181c4083
parent3eb026b1a0f7416bdaa747e9335463812bc99799 (diff)
Update tox for OpenStack
requestsexceptions is now part of the shade project, so update adminstrivia things. We should declare 3.5 support, and not 3.4 or 3.3, since they're untested. We should also remove the infra exclusions since it's no longer under that umbrella (also, no code changes were required) Change-Id: Idc1a5449c6ed5a790083a63dfbd5815fbc9dd650
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 30 Mar 2017 14:12:05 +0000 Reviewed-on: https://review.openstack.org/451306 Project: openstack-infra/requestsexceptions Branch: refs/heads/master
-rw-r--r--setup.cfg3
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini5
3 files changed, 3 insertions, 7 deletions
diff --git a/setup.cfg b/setup.cfg
index 654acfb..5a98eef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,8 +16,7 @@ classifier =
16 Programming Language :: Python :: 2 16 Programming Language :: Python :: 2
17 Programming Language :: Python :: 2.7 17 Programming Language :: Python :: 2.7
18 Programming Language :: Python :: 3 18 Programming Language :: Python :: 3
19 Programming Language :: Python :: 3.3 19 Programming Language :: Python :: 3.5
20 Programming Language :: Python :: 3.4
21 20
22[files] 21[files]
23packages = 22packages =
diff --git a/test-requirements.txt b/test-requirements.txt
index b990d70..200ac9c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1 @@
flake8>=2.2.4,<=2.4.1 hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 203a1f9..d587a07 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
1[tox] 1[tox]
2minversion = 1.6 2minversion = 1.6
3skipsdist = True 3skipsdist = True
4envlist = pep8, py27 4envlist = pep8, py27, py35
5 5
6[testenv] 6[testenv]
7usedevelop = True 7usedevelop = True
@@ -25,8 +25,5 @@ commands = python setup.py build_sphinx
25commands = {posargs} 25commands = {posargs}
26 26
27[flake8] 27[flake8]
28# These are ignored intentionally in openstack-infra projects;
29# please don't submit patches that solely correct them or enable them.
30ignore = E125,E129,H
31show-source = True 28show-source = True
32exclude = .venv,.tox,dist,doc,build,*.egg 29exclude = .venv,.tox,dist,doc,build,*.egg