diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 4a2da36..843f416 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,25 +15,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip - python -m pip install flake8 pylint - python -m pip install . - - name: Lint with flake8 + python -m pip install tox + - name: Run tox 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: Lint with pylint - run: | - pylint -E tmDiff + tox -e py diff --git a/CHANGELOG.md b/CHANGELOG.md index 92d34c3..f30e8c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.9.3] - 2025-12-19 + +### Changed + +- Replaced explicit Git URL-based dependency installation to custom package index. + ## [0.9.2] - 2024-05-23 ### Changed @@ -80,7 +86,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Depends on utm 0.8.0 -[unreleased]: https://github.com/cms-l1-globaltrigger/tm-diff/compare/0.9.2...HEAD +[unreleased]: https://github.com/cms-l1-globaltrigger/tm-diff/compare/0.9.3...HEAD +[0.9.3]: https://github.com/cms-l1-globaltrigger/tm-diff/compare/0.9.2...0.9.3 [0.9.2]: https://github.com/cms-l1-globaltrigger/tm-diff/compare/0.9.1...0.9.2 [0.9.1]: https://github.com/cms-l1-globaltrigger/tm-diff/compare/0.9.0...0.9.1 [0.9.0]: https://github.com/cms-l1-globaltrigger/tm-diff/compare/0.8.1...0.9.0 diff --git a/README.md b/README.md index c866c35..efcacda 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,8 @@ XML Menu Diff ## Install -Install using pip (>= 19.0). - ```bash -pip install --upgrade pip -pip install git+https://github.com/cms-l1-globaltrigger/tm-diff.git@0.9.2 +pip install --index https://globaltrigger.web.cern.ch/pypi tm-diff ``` ## Basic usage diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 4ea7a94..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -tm-python @ git+https://github.com/cms-l1-globaltrigger/tm-python@0.13.0 diff --git a/setup.cfg b/setup.cfg index e4d9fc9..62c7771 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,10 +12,10 @@ classifiers = "Topic :: Utilities" [options] -python_requires = >=3.6 +python_requires = >=3.9 packages = find: install_requires = - tm-python @ git+https://github.com/cms-l1-globaltrigger/tm-python@0.13.0 + tm-table~=0.13.0 test_suite = tests [options.packages.find] diff --git a/tmDiff/__init__.py b/tmDiff/__init__.py index a2fecb4..c598173 100644 --- a/tmDiff/__init__.py +++ b/tmDiff/__init__.py @@ -1 +1 @@ -__version__ = "0.9.2" +__version__ = "0.9.3" diff --git a/tmDiff/__main__.py b/tmDiff/__main__.py index c56321b..72906fd 100755 --- a/tmDiff/__main__.py +++ b/tmDiff/__main__.py @@ -1,5 +1,4 @@ import argparse -import os import sys from typing import Callable, Dict, List diff --git a/tox.ini b/tox.ini index e12aa9c..5511e2a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,16 @@ [tox] -envlist = py36, py37, py38, py39, py310, py311, py312 +envlist = py39, py310, py311, py312, py313 isolated_build = true skip_missing_interpreters = true [testenv] +setenv = + PIP_EXTRA_INDEX_URL = https://globaltrigger.web.cern.ch/pypi deps = - flake8 - pylint + ruff mypy pytest commands = - flake8 tmDiff --select=E9,F63,F7,F82 - pylint -E tmDiff + ruff check tmDiff --select=E9,F63,F7,F82 mypy tmDiff # pytest