Skip to content

Commit

Permalink
v1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Paebbels authored Apr 23, 2024
2 parents 3b95a36 + 0753edc commit 6d039bb
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ArtifactCleanUp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions .github/workflows/CheckDocumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/IntermediateCleanUp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ 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:
name: ${{ inputs.sqlite_coverage_artifacts_prefix }}*
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:
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/Parameters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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
] + [
Expand All @@ -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)}):")
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/PublishOnPyPI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 3 additions & 1 deletion .github/workflows/UnitTesting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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<PackageName>[\w_\-\.]+)(?:\[(?P<SubPackages>(?:\w+)(?:\s*,\s*\w+)*)\])?(?:\s*(?P<Comperator>[<>~=]+)\s*)(?P<Version>\d+(?:\.\d+)*)(?:-(?P<VersionExtension>\w+))?")
Expand Down
2 changes: 1 addition & 1 deletion doc/Instantiation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Documentation Only (Sphinx)
steps:
- name: 🗑️ Delete artifacts
uses: geekyeggo/delete-artifact@v2
uses: geekyeggo/delete-artifact@v5
with:
name: Documentation
Expand Down
6 changes: 3 additions & 3 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
requires = [
"setuptools >= 69.0.0",
"wheel >= 0.40.0",
"pyTooling ~= 6.0"
"pyTooling ~= 6.1"
]
build-backend = "setuptools.build_meta"

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pyTooling ~= 6.0
pyTooling ~= 6.1
12 changes: 6 additions & 6 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6d039bb

Please sign in to comment.