From 649bbec7d55415e12e24fd138fed59f3f535ed1b Mon Sep 17 00:00:00 2001 From: Osher De Paz Date: Fri, 22 Jun 2018 13:51:56 +0300 Subject: [PATCH 1/2] Run tests on Python 3.5 as well --- .travis.yml | 6 ++++-- requirements.txt | 44 -------------------------------------------- setup.py | 10 ++++++++-- tox.ini | 5 +---- 4 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 requirements.txt diff --git a/.travis.yml b/.travis.yml index cb533c5..0558bf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ language: python python: -- '3.6' +- "2.7" +- "3.5" +- "3.6" install: pip install tox coveralls -script: tox +script: tox -e py27,py35,py36 after_success: coveralls deploy: diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index baaa594..0000000 --- a/requirements.txt +++ /dev/null @@ -1,44 +0,0 @@ -astroid==1.6.5 -attrs==17.4.0 -backports.functools-lru-cache==1.4 -backports.shutil-get-terminal-size==1.0.0 -colorama==0.3.9 -configparser==3.5.0 -coverage==4.5.1 -decorator==4.1.2 -enum34==1.1.6 -flake8==3.4.1 -future==0.16.0 -funcsigs==1.0.2 -ipdb==0.10.3 -ipython==5.5.0 -ipython-genutils==0.2.0 -isort==4.2.15 -lazy-object-proxy==1.3.1 -mccabe==0.6.1 -mock==2.0.0 -more-itertools==4.1.0 -pathlib2==2.3.0 -pbr==4.0.2 -pexpect==4.2.1 -pickleshare==0.7.4 -pluggy==0.5.2 -prompt-toolkit==1.0.15 -ptyprocess==0.5.2 -py==1.5.3 -pycodestyle==2.3.1 -pyflakes==1.5.0 -Pygments==2.2.0 -pylint==1.9.2 -pytest==3.5.0 -pytest-cov==2.5.1 -scandir==1.5 -simplegeneric==0.8.1 -singledispatch==3.4.0.3 -six==1.11.0 -termcolor==1.1.0 -tox==2.8.2 -traitlets==4.3.2 -virtualenv==15.1.0 -wcwidth==0.1.7 -wrapt==1.10.11 diff --git a/setup.py b/setup.py index e6c8186..41742de 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ """Setup file for handling packaging and distribution.""" from setuptools import setup -__version__ = "2.0.1" +__version__ = "2.0.2" setup( name="ipdbugger", @@ -17,14 +17,20 @@ "future", "colorama", "termcolor"], + extras_require={ + "dev": ["flake8", "pylint", + "pytest", "pytest-cov", + "mock"] + }, packages=["ipdbugger"], - python_requires=">=2.7", + python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*", package_data={'': ['*.xls', '*.xsd', '*.json', '*.css', '*.xml', '*.rst']}, classifiers=[ 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.5' 'Programming Language :: Python :: 3.6' ], zip_safe=False diff --git a/tox.ini b/tox.ini index f5843a6..939b494 100644 --- a/tox.ini +++ b/tox.ini @@ -2,10 +2,7 @@ envlist = py27,py36 [testenv] - -deps = - -r{toxinidir}/requirements.txt - +extras = dev commands = flake8 setup.py ipdbugger pylint setup.py ipdbugger From bb1675ec10ad67fddeb9695e294946db96de0548 Mon Sep 17 00:00:00 2001 From: Osher De Paz Date: Fri, 22 Jun 2018 13:56:10 +0300 Subject: [PATCH 2/2] skip running non-relevant environments on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0558bf4..4a6dd1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ python: - "3.6" install: pip install tox coveralls -script: tox -e py27,py35,py36 +script: tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .) after_success: coveralls deploy: