From 45fd783012fe6d364f7f8e5ac647b1b97b51925f Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Sun, 30 Jun 2024 11:17:40 +1000 Subject: [PATCH] camkes-deps: fully remove orderedset; bump version - commit 4f7bca1931 replaced orderedset by the maintained ordered-set, but did no yet remove the dependency. Since on more recent python version the dependency install now fails, we are removing it completely. - make python 3 requirement explicit To be released on PyPi simultaneously with the next CAmkES release. Closes #124 Signed-off-by: Gerwin Klein --- tools/check_deps.py | 2 +- tools/python-deps/setup.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/check_deps.py b/tools/check_deps.py index 97845174..664159d2 100755 --- a/tools/check_deps.py +++ b/tools/check_deps.py @@ -157,7 +157,7 @@ def yellow(string): PythonModule('plyplus', 'Python parsing module'), PythonModule('ply', 'Python parsing module'), PythonModule('elftools', 'Python ELF parsing module'), - PythonModule('ordered_set', 'Python OrderedSet module (orderedset)'), + PythonModule('ordered_set', 'Python OrderedSet module (ordered-set)'), PythonModuleWith('six', 'Python 2/3 compatibility layer', 'assertCountEqual'), PythonModule('sqlite3', 'Python SQLite module'), PythonModule('pyfdt', 'Python flattened device tree parser')), diff --git a/tools/python-deps/setup.py b/tools/python-deps/setup.py index b9333448..e0480bdc 100644 --- a/tools/python-deps/setup.py +++ b/tools/python-deps/setup.py @@ -10,7 +10,7 @@ To add a python dependency, add it to the DEPS list below. -To publish using these instructions, you need the virtualenv package +To publish using these instructions, you need the virtualenv package installed, and a properly set up ~/.pypirc file. To publish to pypitest: @@ -29,7 +29,6 @@ 'aenum', 'jinja2>=3.0.0', 'ordered-set', - 'orderedset', # For older source trees: remove in 0.7.4 'plyplus', 'pyelftools', 'sel4-deps', @@ -43,7 +42,7 @@ setup( name='camkes-deps', - version='0.7.3', + version='0.7.4', description='Metapackage for downloading build dependencies for CAmkES', long_description=""" The CAmkES tool has many python dependencies. This package depends on them all @@ -58,4 +57,5 @@ author='TrustworthySystems', author_email='pypi@trustworthy.systems', install_requires=DEPS, + python_requires='>=3' )