From 241587a5db0b6f1a741b886f809b3622cd3d3651 Mon Sep 17 00:00:00 2001 From: Chris Fournier Date: Fri, 14 Jul 2017 13:12:40 -0400 Subject: [PATCH 1/2] Change how we specify environment markers --- Makefile | 2 +- setup.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 39d838d..d214ee0 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ run_tests: clean test: autopep8 run_tests lint install: - pip install -e .[dev] + pip install -e .[dev,devpy2,devpy3] release: rm -rf build dist diff --git a/setup.py b/setup.py index 3933b2b..f5286be 100755 --- a/setup.py +++ b/setup.py @@ -47,11 +47,15 @@ def get_version(): ], extras_require={ 'dev': [ - 'mock==2.0.0; python_version < "3.3"', - 'mypy==0.501; python_version >= "3.3"', 'pycodestyle==2.3.1', 'pytest==3.0.6', 'pytest-randomly==1.1.2', + ], + 'devpy2: python_version < "3.3"': [ + 'mock==2.0.0', + ], + 'devpy3: python_version >= "3.3"': [ + 'mypy==0.501', ] } ) From 16bd24ce0229369639b35900725a4e51a2a2ee49 Mon Sep 17 00:00:00 2001 From: Chris Fournier Date: Fri, 14 Jul 2017 13:16:39 -0400 Subject: [PATCH 2/2] Name them all the same --- Makefile | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d214ee0..39d838d 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ run_tests: clean test: autopep8 run_tests lint install: - pip install -e .[dev,devpy2,devpy3] + pip install -e .[dev] release: rm -rf build dist diff --git a/setup.py b/setup.py index f5286be..cd8580c 100755 --- a/setup.py +++ b/setup.py @@ -51,10 +51,10 @@ def get_version(): 'pytest==3.0.6', 'pytest-randomly==1.1.2', ], - 'devpy2: python_version < "3.3"': [ + 'dev: python_version < "3.3"': [ 'mock==2.0.0', ], - 'devpy3: python_version >= "3.3"': [ + 'dev: python_version >= "3.3"': [ 'mypy==0.501', ] }