This commit is contained in:
Patrick Lehmann
2024-04-23 23:56:28 +02:00
committed by GitHub
11 changed files with 28 additions and 23 deletions

View File

@@ -45,14 +45,14 @@ jobs:
- name: 🗑️ Delete package Artifacts - name: 🗑️ Delete package Artifacts
if: ${{ ! startsWith(github.ref, 'refs/tags') }} if: ${{ ! startsWith(github.ref, 'refs/tags') }}
uses: geekyeggo/delete-artifact@v4 uses: geekyeggo/delete-artifact@v5
with: with:
name: ${{ inputs.package }} name: ${{ inputs.package }}
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: 🗑️ Delete remaining Artifacts - name: 🗑️ Delete remaining Artifacts
if: ${{ inputs.remaining != '' }} if: ${{ inputs.remaining != '' }}
uses: geekyeggo/delete-artifact@v4 uses: geekyeggo/delete-artifact@v5
with: with:
name: ${{ inputs.remaining }} name: ${{ inputs.remaining }}
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -47,10 +47,10 @@ jobs:
- name: ⏬ Checkout repository - name: ⏬ Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: 🐍 Setup Python 3.11 - name: 🐍 Setup Python ${{ inputs.python_version }}
uses: actions/setup-python@v5 uses: actions/setup-python@v5
with: with:
python-version: "3.11" python-version: ${{ inputs.python_version }}
- name: 🔧 Install wheel,tomli and pip dependencies (native) - name: 🔧 Install wheel,tomli and pip dependencies (native)
run: | run: |

View File

@@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: 🗑️ Delete SQLite coverage artifacts from matrix jobs - name: 🗑️ Delete SQLite coverage artifacts from matrix jobs
uses: geekyeggo/delete-artifact@v4 uses: geekyeggo/delete-artifact@v5
if: inputs.sqlite_coverage_artifacts_prefix != '' if: inputs.sqlite_coverage_artifacts_prefix != ''
continue-on-error: true continue-on-error: true
with: with:
@@ -47,7 +47,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: 🗑️ Delete XML coverage artifacts from matrix jobs - name: 🗑️ Delete XML coverage artifacts from matrix jobs
uses: geekyeggo/delete-artifact@v4 uses: geekyeggo/delete-artifact@v5
if: inputs.xml_unittest_artifacts_prefix != '' if: inputs.xml_unittest_artifacts_prefix != ''
continue-on-error: true continue-on-error: true
with: with:

View File

@@ -140,6 +140,7 @@ jobs:
for disable in disabled: for disable in disabled:
print(f"::warning title=Disabled Python Job::System '{disable}' temporary 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 = { data = {
# Python and PyPy versions supported by "setup-python" action # Python and PyPy versions supported by "setup-python" action
"python": { "python": {
@@ -157,9 +158,9 @@ jobs:
}, },
# Runner systems (runner images) supported by GitHub Actions # Runner systems (runner images) supported by GitHub Actions
"sys": { "sys": {
"ubuntu": { "icon": "🐧", "runs-on": "ubuntu-latest", "shell": "bash", "name": "Linux (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)" }, "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)" }, "macos": { "icon": "🍎", "runs-on": "macos-latest", "shell": "bash", "name": "MacOS (x86-64)", "minPy": [3, 10]},
}, },
# Runtimes provided by MSYS2 # Runtimes provided by MSYS2
"runtime": { "runtime": {
@@ -188,6 +189,7 @@ jobs:
if system in data["sys"] if system in data["sys"]
for version in versions for version in versions
if version in data["python"] 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 excludes
and f"{system}:{version}" not in disabled and f"{system}:{version}" not in disabled
] + [ ] + [
@@ -201,6 +203,7 @@ jobs:
for system, version in includes for system, version in includes
if system in data["sys"] if system in data["sys"]
and version in data["python"] and version in data["python"]
and [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"]
and f"{system}:{version}" not in disabled and f"{system}:{version}" not in disabled
] ]
print(f"Combinations ({len(combinations)}):") print(f"Combinations ({len(combinations)}):")

View File

@@ -78,6 +78,6 @@ jobs:
run: twine upload dist/*.whl run: twine upload dist/*.whl
- name: 🗑️ Delete packaging Artifacts - name: 🗑️ Delete packaging Artifacts
uses: geekyeggo/delete-artifact@v4 uses: geekyeggo/delete-artifact@v5
with: with:
name: ${{ inputs.artifact }} name: ${{ inputs.artifact }}

View File

@@ -165,11 +165,13 @@ jobs:
"sphinx": "python-markupsafe:p", "sphinx": "python-markupsafe:p",
"tomli": "python-tomli:p", "tomli": "python-tomli:p",
"wheel": "python-wheel: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 = { subPackages = {
"pytooling": { "pytooling": {
"yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", "yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
} },
} }
regExp = compile(r"(?P<PackageName>[\w_\-\.]+)(?:\[(?P<SubPackages>(?:\w+)(?:\s*,\s*\w+)*)\])?(?:\s*(?P<Comperator>[<>~=]+)\s*)(?P<Version>\d+(?:\.\d+)*)(?:-(?P<VersionExtension>\w+))?") regExp = compile(r"(?P<PackageName>[\w_\-\.]+)(?:\[(?P<SubPackages>(?:\w+)(?:\s*,\s*\w+)*)\])?(?:\s*(?P<Comperator>[<>~=]+)\s*)(?P<Version>\d+(?:\.\d+)*)(?:-(?P<VersionExtension>\w+))?")

View File

@@ -80,7 +80,7 @@ Documentation Only (Sphinx)
steps: steps:
- name: 🗑️ Delete artifacts - name: 🗑️ Delete artifacts
uses: geekyeggo/delete-artifact@v2 uses: geekyeggo/delete-artifact@v5
with: with:
name: Documentation name: Documentation

View File

@@ -1,10 +1,10 @@
-r ../requirements.txt -r ../requirements.txt
pyTooling ~= 6.0 pyTooling ~= 6.1
# Enforce latest version on ReadTheDocs # Enforce latest version on ReadTheDocs
sphinx >= 7.1, < 8.0 sphinx ~= 7.2
docutils >= 0.18.0, < 0.19.0 docutils ~= 0.18.0
# Sphinx Extenstions # Sphinx Extenstions
#sphinx.ext.coverage #sphinx.ext.coverage

View File

@@ -2,7 +2,7 @@
requires = [ requires = [
"setuptools >= 69.0.0", "setuptools >= 69.0.0",
"wheel >= 0.40.0", "wheel >= 0.40.0",
"pyTooling ~= 6.0" "pyTooling ~= 6.1"
] ]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"

View File

@@ -1 +1 @@
pyTooling ~= 6.0 pyTooling ~= 6.1

View File

@@ -1,13 +1,13 @@
-r ../requirements.txt -r ../requirements.txt
# Coverage collection # Coverage collection
Coverage >= 7.4 Coverage ~= 7.5
# Test Runner # Test Runner
pytest >= 7.4.0 pytest ~= 8.1
pytest-cov >= 4.1.0 pytest-cov ~= 5.0
# Static Type Checking # Static Type Checking
mypy >= 1.8.0 mypy ~= 1.9
typing_extensions >= 4.9.0 typing_extensions ~= 4.11
lxml >= 5.0 lxml ~= 5.1