From 0e567aebc41b33f82fc912f11c6beb8dc9069fe3 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Mon, 18 Mar 2024 00:19:13 +0100 Subject: [PATCH 1/6] Added more packages to the list of Python pacboy packages. --- .github/workflows/UnitTesting.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/UnitTesting.yml b/.github/workflows/UnitTesting.yml index 81e8657..f51b8cf 100644 --- a/.github/workflows/UnitTesting.yml +++ b/.github/workflows/UnitTesting.yml @@ -165,11 +165,13 @@ jobs: "sphinx": "python-markupsafe:p", "tomli": "python-tomli:p", "wheel": "python-wheel:p", + "pyEDAA.ProjectModel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p", + "pyEDAA.Reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p", } subPackages = { "pytooling": { "yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", - } + }, } regExp = compile(r"(?P[\w_\-\.]+)(?:\[(?P(?:\w+)(?:\s*,\s*\w+)*)\])?(?:\s*(?P[<>~=]+)\s*)(?P\d+(?:\.\d+)*)(?:-(?P\w+))?") From 583eed8c8461bb1fd33a4e6465edd20c49c53573 Mon Sep 17 00:00:00 2001 From: Erich Soares Machado Date: Wed, 27 Mar 2024 10:48:02 -0400 Subject: [PATCH 2/6] Upgrade with-post-step action to run using the Node.js 20.x runtime --- with-post-step/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/with-post-step/action.yml b/with-post-step/action.yml index 3c58f57..69c2a6e 100644 --- a/with-post-step/action.yml +++ b/with-post-step/action.yml @@ -37,6 +37,6 @@ inputs: default: POST runs: - using: 'node16' + using: 'node20' main: 'main.js' post: 'main.js' From 0802f6d02ffbc6fdda4301e5496e9f9a84ec0e2d Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 23 Apr 2024 23:27:42 +0200 Subject: [PATCH 3/6] Bumped dependencies. --- .github/workflows/CheckDocumentation.yml | 4 ++-- doc/requirements.txt | 6 +++--- pyproject.toml | 2 +- requirements.txt | 2 +- tests/requirements.txt | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CheckDocumentation.yml b/.github/workflows/CheckDocumentation.yml index 285516a..c092b5c 100644 --- a/.github/workflows/CheckDocumentation.yml +++ b/.github/workflows/CheckDocumentation.yml @@ -47,10 +47,10 @@ jobs: - name: ⏬ Checkout repository uses: actions/checkout@v4 - - name: 🐍 Setup Python 3.11 + - name: 🐍 Setup Python ${{ inputs.python_version }} uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: ${{ inputs.python_version }} - name: 🔧 Install wheel,tomli and pip dependencies (native) run: | diff --git a/doc/requirements.txt b/doc/requirements.txt index 959de57..e6745c1 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,10 +1,10 @@ -r ../requirements.txt -pyTooling ~= 6.0 +pyTooling ~= 6.1 # Enforce latest version on ReadTheDocs -sphinx >= 7.1, < 8.0 -docutils >= 0.18.0, < 0.19.0 +sphinx ~= 7.2 +docutils ~= 0.18.0 # Sphinx Extenstions #sphinx.ext.coverage diff --git a/pyproject.toml b/pyproject.toml index f250435..0b1c966 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools >= 69.0.0", "wheel >= 0.40.0", - "pyTooling ~= 6.0" + "pyTooling ~= 6.1" ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index 3bea232..963d44c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pyTooling ~= 6.0 +pyTooling ~= 6.1 diff --git a/tests/requirements.txt b/tests/requirements.txt index db0afa8..b08e373 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,13 +1,13 @@ -r ../requirements.txt # Coverage collection -Coverage >= 7.4 +Coverage ~= 7.5 # Test Runner -pytest >= 7.4.0 -pytest-cov >= 4.1.0 +pytest ~= 8.1 +pytest-cov ~= 5.0 # Static Type Checking -mypy >= 1.8.0 -typing_extensions >= 4.9.0 -lxml >= 5.0 +mypy ~= 1.9 +typing_extensions ~= 4.11 +lxml ~= 5.1 From 461931099aa5cb99e2ed18deb885f1eddafa473b Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 23 Apr 2024 23:30:26 +0200 Subject: [PATCH 4/6] Added a minimum Python version field, so unsupported Python versions (e.g. for macOS) can be disabled. --- .github/workflows/Parameters.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml index bc18f83..578a8fc 100644 --- a/.github/workflows/Parameters.yml +++ b/.github/workflows/Parameters.yml @@ -140,6 +140,7 @@ jobs: for disable in disabled: print(f"::warning title=Disabled Python Job::System '{disable}' temporary disabled.") + # see https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json data = { # Python and PyPy versions supported by "setup-python" action "python": { @@ -157,9 +158,9 @@ jobs: }, # Runner systems (runner images) supported by GitHub Actions "sys": { - "ubuntu": { "icon": "🐧", "runs-on": "ubuntu-latest", "shell": "bash", "name": "Linux (x86-64)" }, - "windows": { "icon": "🪟", "runs-on": "windows-latest", "shell": "pwsh", "name": "Windows (x86-64)" }, - "macos": { "icon": "🍎", "runs-on": "macos-latest", "shell": "bash", "name": "MacOS (x86-64)" }, + "ubuntu": { "icon": "🐧", "runs-on": "ubuntu-latest", "shell": "bash", "name": "Linux (x86-64)", "minPy": [3, 7]}, + "windows": { "icon": "🪟", "runs-on": "windows-latest", "shell": "pwsh", "name": "Windows (x86-64)", "minPy": [3, 7]}, + "macos": { "icon": "🍎", "runs-on": "macos-latest", "shell": "bash", "name": "MacOS (x86-64)", "minPy": [3, 10]}, }, # Runtimes provided by MSYS2 "runtime": { @@ -188,6 +189,7 @@ jobs: if system in data["sys"] for version in versions if version in data["python"] + and [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"] and f"{system}:{version}" not in excludes and f"{system}:{version}" not in disabled ] + [ @@ -201,6 +203,7 @@ jobs: for system, version in includes if system in data["sys"] and version in data["python"] + and [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"] and f"{system}:{version}" not in disabled ] print(f"Combinations ({len(combinations)}):") From 0753edca955cde98c6ea959cca0a0046d2d3409d Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 23 Apr 2024 23:47:40 +0200 Subject: [PATCH 5/6] Bumped dependency geekyeggo/delete-artifact. --- .github/workflows/ArtifactCleanUp.yml | 4 ++-- .github/workflows/IntermediateCleanUp.yml | 4 ++-- .github/workflows/PublishOnPyPI.yml | 2 +- doc/Instantiation.rst | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ArtifactCleanUp.yml b/.github/workflows/ArtifactCleanUp.yml index 2480577..ec9b74b 100644 --- a/.github/workflows/ArtifactCleanUp.yml +++ b/.github/workflows/ArtifactCleanUp.yml @@ -45,14 +45,14 @@ jobs: - name: 🗑️ Delete package Artifacts if: ${{ ! startsWith(github.ref, 'refs/tags') }} - uses: geekyeggo/delete-artifact@v4 + uses: geekyeggo/delete-artifact@v5 with: name: ${{ inputs.package }} token: ${{ secrets.GITHUB_TOKEN }} - name: 🗑️ Delete remaining Artifacts if: ${{ inputs.remaining != '' }} - uses: geekyeggo/delete-artifact@v4 + uses: geekyeggo/delete-artifact@v5 with: name: ${{ inputs.remaining }} token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/IntermediateCleanUp.yml b/.github/workflows/IntermediateCleanUp.yml index 4699446..6fc09a4 100644 --- a/.github/workflows/IntermediateCleanUp.yml +++ b/.github/workflows/IntermediateCleanUp.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 🗑️ Delete SQLite coverage artifacts from matrix jobs - uses: geekyeggo/delete-artifact@v4 + uses: geekyeggo/delete-artifact@v5 if: inputs.sqlite_coverage_artifacts_prefix != '' continue-on-error: true with: @@ -47,7 +47,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: 🗑️ Delete XML coverage artifacts from matrix jobs - uses: geekyeggo/delete-artifact@v4 + uses: geekyeggo/delete-artifact@v5 if: inputs.xml_unittest_artifacts_prefix != '' continue-on-error: true with: diff --git a/.github/workflows/PublishOnPyPI.yml b/.github/workflows/PublishOnPyPI.yml index 4ec8ba8..890595c 100644 --- a/.github/workflows/PublishOnPyPI.yml +++ b/.github/workflows/PublishOnPyPI.yml @@ -78,6 +78,6 @@ jobs: run: twine upload dist/*.whl - name: 🗑️ Delete packaging Artifacts - uses: geekyeggo/delete-artifact@v4 + uses: geekyeggo/delete-artifact@v5 with: name: ${{ inputs.artifact }} diff --git a/doc/Instantiation.rst b/doc/Instantiation.rst index b606f6a..254b2d8 100644 --- a/doc/Instantiation.rst +++ b/doc/Instantiation.rst @@ -80,7 +80,7 @@ Documentation Only (Sphinx) steps: - name: 🗑️ Delete artifacts - uses: geekyeggo/delete-artifact@v2 + uses: geekyeggo/delete-artifact@v5 with: name: Documentation From be27e58d8ceb391c00df28098a3b1364b8d03aac Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 24 Apr 2024 00:30:55 +0200 Subject: [PATCH 6/6] Also handle pypy versions. --- .github/workflows/Parameters.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml index 578a8fc..6266989 100644 --- a/.github/workflows/Parameters.yml +++ b/.github/workflows/Parameters.yml @@ -158,9 +158,9 @@ jobs: }, # Runner systems (runner images) supported by GitHub Actions "sys": { - "ubuntu": { "icon": "🐧", "runs-on": "ubuntu-latest", "shell": "bash", "name": "Linux (x86-64)", "minPy": [3, 7]}, - "windows": { "icon": "🪟", "runs-on": "windows-latest", "shell": "pwsh", "name": "Windows (x86-64)", "minPy": [3, 7]}, - "macos": { "icon": "🍎", "runs-on": "macos-latest", "shell": "bash", "name": "MacOS (x86-64)", "minPy": [3, 10]}, + "ubuntu": { "icon": "🐧", "runs-on": "ubuntu-latest", "shell": "bash", "name": "Linux (x86-64)", "minPy": (3, 7)}, + "windows": { "icon": "🪟", "runs-on": "windows-latest", "shell": "pwsh", "name": "Windows (x86-64)", "minPy": (3, 7)}, + "macos": { "icon": "🍎", "runs-on": "macos-latest", "shell": "bash", "name": "MacOS (x86-64)", "minPy": (3, 10)}, }, # Runtimes provided by MSYS2 "runtime": { @@ -183,13 +183,17 @@ jobs: for disable in disabled: print(f"- {disable}") + def toVersion(value): + major, minor = value.split(".") + return tuple(int(major[-1]), int(minor)) + combinations = [ (system, version) for system in systems if system in data["sys"] for version in versions if version in data["python"] - and [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"] + and toVersion(version) >= data["sys"][system]["minPy"] and f"{system}:{version}" not in excludes and f"{system}:{version}" not in disabled ] + [ @@ -203,7 +207,7 @@ jobs: for system, version in includes if system in data["sys"] and version in data["python"] - and [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"] + and toVersion(version) >= data["sys"][system]["minPy"] and f"{system}:{version}" not in disabled ] print(f"Combinations ({len(combinations)}):")