Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

camkes-deps: fully remove orderedset; bump version #147

Merged
merged 2 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
- uses: seL4/ci-actions/link-check@master
with:
exclude: js/node_modules
# produces 403 for link checker:
exclude_urls: "http://jinja.pocoo.org/docs/"

style:
name: Style
Expand Down
2 changes: 1 addition & 1 deletion tools/check_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
Expand Down
6 changes: 3 additions & 3 deletions tools/python-deps/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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',
Expand All @@ -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
Expand All @@ -58,4 +57,5 @@
author='TrustworthySystems',
author_email='[email protected]',
install_requires=DEPS,
python_requires='>=3'
)