diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 92578e2..ad30906 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -22,14 +22,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install flake8 pytest - pip install -r requirements.txt - - name: Lint with flake8 - run: | - # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Test with pytest - run: | - pytest + pip install -e . + - name: Install tox and any other packages + run: pip install tox + - name: Run tox + # Run tox using the version of Python in `PATH` + run: tox -e py diff --git a/README.md b/README.md index 33cd1d8..eacea4f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Install using pip (>= 19.0) ```bash pip install --upgrade pip -pip install git+https://github.com/cms-l1-globaltrigger/tm-editor.git@0.17.0 +pip install git+https://github.com/cms-l1-globaltrigger/tm-editor.git@0.17.1 ``` ## Build diff --git a/changelog b/changelog index 3e945fb..5def0af 100644 --- a/changelog +++ b/changelog @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.17.1] - 2024-06-12 +### Fixed +- Loading XML menus with grammar version 0.13. +- Dependency conflict with tox (requiring packaging>=23.2). + ## [0.17.0] - 2024-05-16 ### Added - Support for HTMHF (#46). @@ -409,7 +414,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Support most of the algorithm expression language features. -[Unreleased]: https://github.com/cms-l1-globaltrigger/tm-editor/compare/0.17.0...HEAD +[Unreleased]: https://github.com/cms-l1-globaltrigger/tm-editor/compare/0.17.1...HEAD +[0.17.1]: https://github.com/cms-l1-globaltrigger/tm-editor/compare/0.17.0...0.17.1 [0.17.0]: https://github.com/cms-l1-globaltrigger/tm-editor/compare/0.16.0...0.17.0 [0.16.0]: https://github.com/cms-l1-globaltrigger/tm-editor/compare/0.15.4...0.16.0 [0.15.4]: https://github.com/cms-l1-globaltrigger/tm-editor/compare/0.15.3...0.15.4 diff --git a/requirements.txt b/requirements.txt index 001050c..c00ff65 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ tm-python @ git+https://github.com/cms-l1-globaltrigger/tm-python@0.13.0 Markdown==3.1 -packaging==21.3 +packaging==23.2 PyQt5==5.14.* diff --git a/setup.cfg b/setup.cfg index 52e7544..eefd2fa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ packages = find: install_requires = tm-python @ git+https://github.com/cms-l1-globaltrigger/tm-python@0.13.0 Markdown==3.1 - packaging==21.3 + packaging==23.2 PyQt5==5.14.* [options.packages.find] diff --git a/tests/test_menu.py b/tests/test_menu.py index 8226234..05cf20b 100644 --- a/tests/test_menu.py +++ b/tests/test_menu.py @@ -6,7 +6,7 @@ from tmGrammar import isGate as isOperator from tmGrammar import isObject, isFunction from tmEditor.core import XmlDecoder, XmlEncoder -from tmEditor.core.Menu import Menu +from tmEditor.core.Menu import Menu, GrammarVersion from tmEditor.core.Algorithm import Object, External, Cut, Algorithm from tmEditor.core.Algorithm import toObject, toExternal from tmEditor.core.Algorithm import functionObjects, functionCuts, functionObjectsCuts @@ -125,3 +125,6 @@ def test_serdes(self): def test_version(self): assert tmGrammar.__version__ == UTM_VERSION assert tmTable.__version__ == UTM_VERSION + + def test_grammar_version(self): + assert str(GrammarVersion) == "0.13" diff --git a/tmEditor/__init__.py b/tmEditor/__init__.py index fd86b3e..c6eae9f 100644 --- a/tmEditor/__init__.py +++ b/tmEditor/__init__.py @@ -1 +1 @@ -__version__ = "0.17.0" +__version__ = "0.17.1" diff --git a/tmEditor/core/Menu.py b/tmEditor/core/Menu.py index d71faff..bfa5f29 100644 --- a/tmEditor/core/Menu.py +++ b/tmEditor/core/Menu.py @@ -13,7 +13,7 @@ __all__ = ["Menu", "GrammarVersion"] -GrammarVersion = Version("0.12") +GrammarVersion = Version("0.13") """Supported grammar version.""" kObject: str = "object" diff --git a/tmEditor/core/RemoteVersionInfo.py b/tmEditor/core/RemoteVersionInfo.py index f2cf858..40c941c 100644 --- a/tmEditor/core/RemoteVersionInfo.py +++ b/tmEditor/core/RemoteVersionInfo.py @@ -73,7 +73,7 @@ def load_json(self, data): if name: if not uri: uri = Settings.DefaultScaleSetUri.format(scale_set=name) - url = urljoin(baseurl, uri) + url = urljoin(baseurl, uri) self.scale_set_name = name self.scale_set_url = url # External signal set