From 6576af4854bb3da9ab5d98a08ecbfbdec0174eeb Mon Sep 17 00:00:00 2001 From: James Myatt Date: Tue, 22 Oct 2019 16:50:06 +0100 Subject: [PATCH 1/6] setup.py install is deprecated --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 2565ab9..2c69313 100644 --- a/README.rst +++ b/README.rst @@ -92,7 +92,7 @@ From sources :: - $ python setup.py install + $ python -m pip install . Usage ----- From 1581605bae4531a49db6a039c2b63beb0e7240d5 Mon Sep 17 00:00:00 2001 From: James Myatt Date: Tue, 22 Oct 2019 16:55:23 +0100 Subject: [PATCH 2/6] Remove test alias from setup.cfg --- setup.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index ed061da..7cdf4cb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,9 +17,5 @@ universal = 1 [flake8] exclude = docs -[aliases] -test = pytest - [tool:pytest] collect_ignore = ['setup.py'] - From d85a1ff6d1a13ec14976ec493e3d8c0a7079175e Mon Sep 17 00:00:00 2001 From: James Myatt Date: Tue, 22 Oct 2019 16:57:19 +0100 Subject: [PATCH 3/6] setup.py test is deprecated --- setup.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 867f690..f58ea6c 100644 --- a/setup.py +++ b/setup.py @@ -12,10 +12,7 @@ history = history_file.read() requirements = [] - -setup_requirements = ['pytest-runner', ] - -test_requirements = ['pytest', 'scikit-learn>=0.21.2'] +extras_requirements = {'test': ['pytest', 'scikit-learn>=0.21.2']} setup( author="Cheuk Ting Ho", @@ -43,9 +40,7 @@ keywords='picknmix', name='picknmix', packages=find_packages(include=['picknmix']), - setup_requires=setup_requirements, - test_suite='tests', - tests_require=test_requirements, + extras_require=extras_requirements, url='https://github.com/Cheukting/picknmix', version='0.1.3', python_requires=">=3.5", From 4d9eb987cbcf466177c4f5c4b12c1f60c100f853 Mon Sep 17 00:00:00 2001 From: James Myatt Date: Tue, 22 Oct 2019 16:59:19 +0100 Subject: [PATCH 4/6] setup.py install is deprecated --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 055e0a0..edd15d7 100644 --- a/Makefile +++ b/Makefile @@ -85,4 +85,4 @@ dist: clean ## builds source and wheel package ls -l dist install: clean ## install the package to the active Python's site-packages - python setup.py install + python -m pip install . From 685d1a55af67b22c1c127d2b0e5e58d2240ffad5 Mon Sep 17 00:00:00 2001 From: James Myatt Date: Tue, 22 Oct 2019 17:00:23 +0100 Subject: [PATCH 5/6] setup.py test is deprecated --- CONTRIBUTING.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 8c12468..4decff8 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -103,7 +103,7 @@ Ready to contribute? Here's how to set up `picknmix` for local development. tests, including testing other Python versions with tox:: $ flake8 picknmix tests - $ python setup.py test or pytest + $ python pytest tests $ tox To get flake8 and tox, just pip install them into your virtualenv. From 0452709c25bbc73106ba756199d08de1a0199e9d Mon Sep 17 00:00:00 2001 From: James Myatt Date: Tue, 22 Oct 2019 17:01:05 +0100 Subject: [PATCH 6/6] setup.py install is deprecated --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index a920a26..6326e5c 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -44,7 +44,7 @@ Once you have a copy of the source, you can install it with: .. code-block:: console - $ python setup.py install + $ python -m pip install . .. _Github repo: https://github.com/Cheukting/picknmix