From 0d2f6951a77b81064ddde2e4e98e3e3da5c4d1f7 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 9 Mar 2022 09:54:15 +0000 Subject: [PATCH 1/4] Remove redundant comment about version The version is no longer duplicated in setup.cfg (since 5155ba74), so remove redundant TODO suggesting folks update in two places. Co-authored-by: Ofek Lev Signed-off-by: Joshua Lock --- tuf/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tuf/__init__.py b/tuf/__init__.py index 065e8c2cac..322d316543 100755 --- a/tuf/__init__.py +++ b/tuf/__init__.py @@ -5,7 +5,4 @@ """ # This value is used in the requests user agent. -# setup.cfg has it hard-coded separately. -# Currently, when the version is changed, it must be set in both locations. -# TODO: Single-source the version number. __version__ = "1.0.0" From 430bdf5750d9a097944355f4e2d3c3b5d0e600cc Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 9 Mar 2022 11:03:09 +0000 Subject: [PATCH 2/4] test: use tox isolated environments Enable tox isolated environments to perform build operations in a virtual environment. See https://tox.wiki/en/latest/config.html#conf-isolated_build Co-Authored-By: Ofek Lev Signed-off-by: Joshua Lock --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index cf564b8cd6..bf64c68f4a 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ # and then run "tox" from this directory. [tox] +isolated_build=true envlist = lint,docs,py skipsdist = true From 22fee97dc3865c1c5f7ece137dc6058144bcba43 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 9 Mar 2022 11:29:34 +0000 Subject: [PATCH 3/4] setup: remove upper bound limit on python_requires Setting upper bound version constraints in libraries is a source of problems for users of those libraries, see: https://iscinumpy.dev/post/bound-version-constraints/ The intent of the python-tuf version constraint is to ensure we're using a version of Python which supports all the features we rely on, this is a better fit for a lower limit. Suggested-by: Ofek Lev Signed-off-by: Joshua Lock --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 97ffdc9fdf..2eb11ee70a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ license_files = LICENSE LICENSE-MIT [options] packages = find: -python_requires = ~=3.7 +python_requires = >=3.7 install_requires = requests>=2.19.1 securesystemslib>=0.22.0 From 150bfd0eecf871d5e0998036af935e47bf008687 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 9 Mar 2022 11:50:39 +0000 Subject: [PATCH 4/4] gitignore: fix directory patterns Fix the directory ignore patterns to ignore the entire directories, including child directories. https://git-scm.com/docs/gitignore#_pattern_format Co-authored-by: Ofek Lev Signed-off-by: Joshua Lock --- .gitignore | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6ca43668d8..ff032a6f68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ # root level directories -dist/* -build/* -env/* +dist/ +build/ +env/ # docs build directory -docs/build/* +docs/build/ # global file patterns *.log @@ -14,10 +14,10 @@ docs/build/* *.swp *.egg-info .coverage -.tox/* -tests/htmlcov/* +.tox/ +tests/htmlcov/ .DS_Store -.pybuild/* +.pybuild/ .python-version *~ *.tmp @@ -25,9 +25,9 @@ tests/htmlcov/* .vscode # Debian generated files -debian/.debhelper/* +debian/.debhelper/ debian/*-stamp debian/files debian/*.debhelper debian/*.substvars -debian/python*-tuf/* +debian/python*-tuf/