From 3769bfb22cbd3c89f9b257c399911de500089645 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Sat, 26 Feb 2022 09:28:20 +0000 Subject: [PATCH 1/3] Add dev-requirements.txt file --- dev-requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 dev-requirements.txt diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 0000000..7093b61 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,2 @@ +coverage +pytest From c9236dd0bb10b1fa1bc47316e68b0b17c7889581 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Sat, 26 Feb 2022 09:28:33 +0000 Subject: [PATCH 2/3] Update setup.py to read dev-requirements.txt --- setup.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 02d5040..d462938 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ DESCRIPTION = ( "A Python package to search for and remove duplicated files in messy datasets" ) -EMAIL = "sgibson@turing.ac.uk" +EMAIL = "drsarahlgibson@gmail.com" LICENSE = "MIT" LICENSE_TROVE = "License :: OSI Approved :: MIT License" NAME = "deduplify" @@ -22,11 +22,14 @@ with open(os.path.join(here, "requirements.txt")) as f: required = [line.strip("\n") for line in f.readlines()] -REQUIRED = required + ["incremental"] +with open(os.path.join(here, "dev-requirements.txt")) as f: + test_required = [line.strip("\n") for line in f.readlines()] + +REQUIRED = required full_require = [] docs_require = [] -test_require = full_require + ["pytest", "coverage"] -dev_require = ["incremental"] +test_require = full_require + test_required +dev_require = [] # What packages are optional? EXTRAS = { From 7db0e30f873a05af3de64098accc65aba431d3cc Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Sat, 26 Feb 2022 09:28:48 +0000 Subject: [PATCH 3/3] Update actions workflows --- .github/workflows/ci.yml | 2 +- .github/workflows/pypi.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39e1dc8..573679c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: run: | python -m pip install -U pip python -m pip install -r requirements.txt - pip install pytest coverage + python -m pip install -r dev-requirements.txt - name: Run tests run: | diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index bfd26f8..94ee8bb 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -19,7 +19,7 @@ jobs: - name: Install twine and wheel run: | - python -m pip install -U pip + python -m pip install --upgrade pip python -m pip install twine wheel - name: Build distribution