aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-05-29 00:17:08 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2016-05-29 01:17:08 -0400
commitc6c3b6d9d50f50f7876d94899a934ecdd68bf417 (patch)
tree452724871cb58b677aa5ff99f8ef1dd27808ea27
parent698f9ef6e3764441d2a665b33cded8fa0942ea8e (diff)
downloadcryptography-c6c3b6d9d50f50f7876d94899a934ecdd68bf417.tar.gz
cryptography-c6c3b6d9d50f50f7876d94899a934ecdd68bf417.tar.bz2
cryptography-c6c3b6d9d50f50f7876d94899a934ecdd68bf417.zip
pip is prejudiced against dashes and underscores (#2922)
-rw-r--r--dev-requirements.txt2
-rw-r--r--setup.py4
-rw-r--r--tox.ini6
3 files changed, 6 insertions, 6 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 8c4a188a..2c171878 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -4,5 +4,5 @@ invoke
requests
tox
twine
--e .[test,docs-test,pep8-test]
+-e .[test,docstest,pep8test]
-e vectors
diff --git a/setup.py b/setup.py
index d104ac3a..4b632507 100644
--- a/setup.py
+++ b/setup.py
@@ -309,7 +309,7 @@ setup(
tests_require=test_requirements,
extras_require={
"test": test_requirements,
- "docs-test": [
+ "docstest": [
"doc8",
"pyenchant",
"readme_renderer",
@@ -317,7 +317,7 @@ setup(
"sphinx_rtd_theme",
"sphinxcontrib-spelling",
],
- "pep8-test": [
+ "pep8test": [
"flake8",
"flake8-import-order",
"pep8-naming",
diff --git a/tox.ini b/tox.ini
index e5efefcb..c8b3e76a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ commands =
[testenv:docs]
deps =
- .[docs-test]
+ .[docstest]
basepython = python2.7
commands =
sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
@@ -47,14 +47,14 @@ commands =
[testenv:pep8]
deps =
- .[pep8-test]
+ .[pep8test]
commands =
flake8 .
[testenv:py3pep8]
basepython = python3
deps =
- .[pep8-test]
+ .[pep8test]
commands =
flake8 .