From be891c1e395888b841763830fa2e6766c9a12fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Barrois?= Date: Thu, 29 Apr 2021 22:38:33 +0200 Subject: [PATCH] packaging: Replace requirements.txt with [dev] Use extras marker instead of requirements file, keeping all dependency configuration in a single file. --- MANIFEST.in | 1 - Makefile | 2 +- requirements_dev.txt | 4 ---- requirements_test.txt | 2 -- tox.ini | 5 ++--- 5 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 requirements_dev.txt delete mode 100644 requirements_test.txt diff --git a/MANIFEST.in b/MANIFEST.in index 05d3c02..ff261dc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,4 @@ include CREDITS ChangeLog LICENSE README.rst -include requirements*.txt graft src/xworkflows diff --git a/Makefile b/Makefile index 0116afb..40d535f 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ clean: setup-dev: pip install --upgrade pip setuptools - pip install --upgrade -r requirements_dev.txt + pip install --upgrade -e .[dev,doc] pip freeze .PHONY: all default clean setup-dev diff --git a/requirements_dev.txt b/requirements_dev.txt deleted file mode 100644 index f811698..0000000 --- a/requirements_dev.txt +++ /dev/null @@ -1,4 +0,0 @@ --e . --rrequirements_test.txt - -tox diff --git a/requirements_test.txt b/requirements_test.txt deleted file mode 100644 index 6581cf5..0000000 --- a/requirements_test.txt +++ /dev/null @@ -1,2 +0,0 @@ -flake8 -check_manifest diff --git a/tox.ini b/tox.ini index ede0ce6..5f4d7b3 100644 --- a/tox.ini +++ b/tox.ini @@ -4,12 +4,11 @@ envlist = lint [testenv] -deps = - -rrequirements_test.txt - +extras = dev whitelist_externals = make commands = make test [testenv:lint] +extras = dev whitelist_externals = make commands = make lint