From b1819c51b9478a7c4d1f06afb9530c17ad002bfe Mon Sep 17 00:00:00 2001 From: Vangelis Banos Date: Sun, 24 Sep 2017 10:51:29 +0000 Subject: [PATCH 1/3] Add missing packages from setup.py, add tox config. Add missing `requests` and `warcio` packages. They are used in unit tests but they were not included in `setup.py`. Add `tox` configuration in order to be able to run unit tests for py27, py34 and py35 with 1 command. --- setup.py | 2 ++ tox.ini | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 tox.ini diff --git a/setup.py b/setup.py index 25a2e49..36984b0 100755 --- a/setup.py +++ b/setup.py @@ -41,6 +41,8 @@ deps = [ 'urlcanon>=0.1.dev16', 'doublethink>=0.2.0.dev81', 'PySocks', + 'warcio', + 'requests' ] try: import concurrent.futures diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..bec9629 --- /dev/null +++ b/tox.ini @@ -0,0 +1,9 @@ +[tox] +envlist=py27,py34,py35 +[testenv] +deps= + pytest + pytest-xdist + requests + mock +commands=py.test -n 4 From 51a2178cbd8fe9d534880e63cfab5d17659d48a1 Mon Sep 17 00:00:00 2001 From: Vangelis Banos Date: Thu, 28 Sep 2017 20:35:47 +0000 Subject: [PATCH 2/3] Remove tox.ini, move warcio to test_requires --- setup.py | 6 ++---- tox.ini | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 tox.ini diff --git a/setup.py b/setup.py index 36984b0..994bf98 100755 --- a/setup.py +++ b/setup.py @@ -40,9 +40,7 @@ deps = [ 'warctools', 'urlcanon>=0.1.dev16', 'doublethink>=0.2.0.dev81', - 'PySocks', - 'warcio', - 'requests' + 'PySocks' ] try: import concurrent.futures @@ -60,7 +58,7 @@ setuptools.setup( license='GPL', packages=['warcprox'], install_requires=deps, - tests_require=['requests>=2.0.1', 'pytest'], # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636 + tests_require=['requests>=2.0.1', 'pytest', 'warcio'], # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636 cmdclass = {'test': PyTest}, test_suite='warcprox.tests', entry_points={ diff --git a/tox.ini b/tox.ini deleted file mode 100644 index bec9629..0000000 --- a/tox.ini +++ /dev/null @@ -1,9 +0,0 @@ -[tox] -envlist=py27,py34,py35 -[testenv] -deps= - pytest - pytest-xdist - requests - mock -commands=py.test -n 4 From 6fd687f2b67eadba8059bee581270d8d740d59c4 Mon Sep 17 00:00:00 2001 From: Vangelis Banos Date: Thu, 28 Sep 2017 20:37:15 +0000 Subject: [PATCH 3/3] Add missing "," in deps --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 994bf98..b63df90 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ deps = [ 'warctools', 'urlcanon>=0.1.dev16', 'doublethink>=0.2.0.dev81', - 'PySocks' + 'PySocks', ] try: import concurrent.futures