From 71a59e28f3b022c247f158004c6284d9b54e4fdd Mon Sep 17 00:00:00 2001 From: Alex Henderson Date: Mon, 7 Mar 2022 11:25:42 +0000 Subject: [PATCH] Corrected requirements for installation and bumped version to v1.1.1. The requirements.txt file had too many requirements. Only pytest is needed, and only for running the test suite. The PyPI setup.py file didn't have any requirements listed, so installation from PyPI was incomplete. These issues have now been rectified. --- CITATION.cff | 4 ++-- README.md | 4 ++-- requirements.txt | 3 +-- setup.py | 5 ++++- src/hasher/hasher.py | 6 +++--- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index b4b39c1..1c86d56 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -9,8 +9,8 @@ authors: affiliation: University of Manchester, UK email: alex.henderson@manchester.ac.uk website: https://alexhenderson.info -version: v1.1.0 -date-released: "2022-03-05" +version: v1.1.1 +date-released: "2022-03-07" license: MIT license-url: https://spdx.org/licenses/MIT#licenseText repository: "https://github.com/AlexHenderson/hasher" diff --git a/README.md b/README.md index 55fe1bd..11313d7 100644 --- a/README.md +++ b/README.md @@ -113,12 +113,12 @@ output ### Installation ### - pip install hasher-AlexHenderson==1.1.0 + pip install hasher-AlexHenderson==1.1.1 ## Usage rights ## Copyright (c) 2022 Alex Henderson (alex.henderson@manchester.ac.uk) Licensed under the MIT License. See https://opensource.org/licenses/MIT SPDX-License-Identifier: MIT -Version 1.1.0 +Version 1.1.1 See https://github.com/AlexHenderson/hasher for the most recent version diff --git a/requirements.txt b/requirements.txt index 75fd60e..30a12d1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1 @@ -pytest~=7.0.1 -setuptools~=60.9.3 +pytest >= 7.0.1 diff --git a/setup.py b/setup.py index 7be0311..08c9cc3 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name="hasher-AlexHenderson", - version="1.1.0", + version="1.1.1", author="Alex Henderson", author_email="alex.henderson@manchester.ac.uk", description="Python package to generate a stable hash value for either a single file, or a folder containing many " @@ -28,4 +28,7 @@ package_dir={"": "src"}, packages=find_packages(where="src"), python_requires=">=3.7", + install_requires=[ + 'pytest >= 7.0.1' + ], ) diff --git a/src/hasher/hasher.py b/src/hasher/hasher.py index b04dd1a..5043d54 100644 --- a/src/hasher/hasher.py +++ b/src/hasher/hasher.py @@ -2,7 +2,7 @@ # Copyright (c) 2022 Alex Henderson (alex.henderson@manchester.ac.uk) # Licensed under the MIT License. See https://opensource.org/licenses/MIT # SPDX-License-Identifier: MIT -# Version 1.1.0 +# Version 1.1.1 # See https://github.com/AlexHenderson/hasher for the most recent version import hashlib @@ -61,13 +61,13 @@ class Hasher: Copyright (c) 2022 Alex Henderson (alex.henderson@manchester.ac.uk) Licensed under the MIT License. See https://opensource.org/licenses/MIT SPDX-License-Identifier: MIT - Version 1.1.0 + Version 1.1.1 See https://github.com/AlexHenderson/hasher for the most recent version """ # Define the version of this code - _version = "1.1.0" + _version = "1.1.1" # Define the default type of hash as 'sha256' _default_hash_type = 'sha256'