Skip to content

Commit 7b43b4a

Browse files
authored
v7.3.0
2 parents b145ed3 + d0eae08 commit 7b43b4a

18 files changed

Lines changed: 34 additions & 38 deletions

.github/workflows/ApplicationTesting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
"pyyaml": "python-pyyaml:p python-types-pyyaml:p",
147147
"ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
148148
"sphinx": "python-markupsafe:p",
149-
"tomli": "python-tomli:p",
149+
"tomli": "python-tomli:p", # outdated, now part of Python as tomllib
150150
"wheel": "python-wheel:p",
151151
"pyEDAA.ProjectModel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",
152152
"pyEDAA.Reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",

.github/workflows/ExtractConfiguration.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ jobs:
8989
with:
9090
python-version: ${{ inputs.python_version }}
9191

92-
- name: 🔧 Install wheel,tomli and pip dependencies (native)
92+
- name: 🔧 Install wheel and pip dependencies (native)
9393
run: |
94-
python -m pip install --disable-pip-version-check -U wheel tomli
94+
python -m pip install --disable-pip-version-check -U wheel
9595
9696
- name: 🔁 Extract configurations from pyproject.toml
9797
id: getVariables
@@ -105,7 +105,7 @@ jobs:
105105
106106
print(f"Python: {version} (of default installation)")
107107
108-
from tomli import load as tomli_load
108+
from tomllib import load as toml_load
109109
110110
unittestXMLFile = Path("./unittest.xml")
111111
coverageHTMLDirectory = Path("htmlcov")
@@ -121,7 +121,7 @@ jobs:
121121
pyProjectFile = Path("pyproject.toml")
122122
if pyProjectFile.exists():
123123
with pyProjectFile.open("rb") as file:
124-
pyProjectSettings = tomli_load(file)
124+
pyProjectSettings = toml_load(file)
125125
126126
toolSection = pyProjectSettings["tool"]
127127
if "pytest" in toolSection:
@@ -163,7 +163,7 @@ jobs:
163163
coverageRCFile = Path(coverageRC)
164164
if coverageRCFile.exists():
165165
with coverageRCFile.open("rb") as file:
166-
coverageRCSettings = tomli_load(file)
166+
coverageRCSettings = toml_load(file)
167167
168168
coverageHTMLDirectory = Path(coverageRCSettings["html"]["directory"])
169169
coverageXMLFile = Path(coverageRCSettings["xml"]["output"])

.github/workflows/InstallPackage.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ jobs:
7070
python-markupsafe:p
7171
python-pyaml:p python-types-pyyaml:p
7272
python-ruamel-yaml:p python-ruamel.yaml.clib:p
73-
python-tomli:p
7473
7574
- name: 🐍 Setup Python ${{ matrix.python }}
7675
uses: actions/setup-python@v6

.github/workflows/Parameters.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@ jobs:
287287
exclude_list = "${{ inputs.exclude_list }}".strip()
288288
disable_list = "${{ inputs.disable_list }}".strip()
289289
290-
currentMSYS2Version = "3.12"
290+
currentMSYS2Version = "3.13"
291291
currentAlphaVersion = "3.15"
292-
currentAlphaRelease = "3.15.0-a.1"
292+
currentAlphaRelease = "3.15.0-a.4"
293293
294294
if systems == "":
295295
print("::error title=Parameters::system_list is empty.")

.github/workflows/PublishCoverageResults.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ jobs:
124124
run: |
125125
tree -pash artifacts
126126
127-
- name: 🔧 Install coverage and tomli
127+
- name: 🔧 Install coverage
128128
run: |
129-
python -m pip install -U --disable-pip-version-check --break-system-packages coverage[toml] tomli
129+
python -m pip install -U --disable-pip-version-check --break-system-packages coverage[toml]
130130
131131
- name: Rename .coverage files and move them all into 'coverage/'
132132
run: |

.github/workflows/SphinxDocumentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
with:
100100
python-version: ${{ inputs.python_version }}
101101

102-
- name: 🔧 Install wheel,tomli and pip dependencies (native)
102+
- name: 🔧 Install wheel and pip dependencies (native)
103103
run: |
104104
python -m pip install --disable-pip-version-check -U wheel
105105
python -m pip install --disable-pip-version-check ${{ inputs.requirements }}
@@ -158,7 +158,7 @@ jobs:
158158
with:
159159
python-version: ${{ inputs.python_version }}
160160

161-
- name: 🔧 Install wheel,tomli and pip dependencies (native)
161+
- name: 🔧 Install wheel and pip dependencies (native)
162162
run: |
163163
python -m pip install --disable-pip-version-check -U wheel
164164
python -m pip install --disable-pip-version-check ${{ inputs.requirements }}

.github/workflows/UnitTesting.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,11 @@ jobs:
199199
200200
# Compute Dependencies for MSYS2 steps
201201

202-
- name: 🔧 Install dependencies (system Python for Python shell)
203-
if: matrix.system == 'msys2'
204-
shell: pwsh
205-
run: |
206-
py -3.9 -m pip install --disable-pip-version-check --break-system-packages -U tomli
202+
# - name: 🔧 Install dependencies (system Python for Python shell)
203+
# if: matrix.system == 'msys2'
204+
# shell: pwsh
205+
# run: |
206+
# py -3.12 -m pip install --disable-pip-version-check --break-system-packages -U tomli
207207

208208
- name: Compute path to requirements file
209209
id: requirements
@@ -286,7 +286,7 @@ jobs:
286286
"ruamel.yaml": "python-ruamel-yaml:p",
287287
# "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
288288
"sphinx": "python-markupsafe:p",
289-
"tomli": "python-tomli:p",
289+
"tomli": "python-tomli:p", # outdated, now part of Python as tomllib
290290
"wheel": "python-wheel:p",
291291
"pyedaa.projectmodel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",
292292
"pyedaa.reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",
@@ -351,10 +351,10 @@ jobs:
351351

352352
# Python Dependency steps
353353

354-
- name: 🔧 Install wheel,tomli and pip dependencies (native)
354+
- name: 🔧 Install wheel and pip dependencies (native)
355355
if: matrix.system != 'msys2'
356356
run: |
357-
python -m pip install --disable-pip-version-check -U wheel tomli
357+
python -m pip install --disable-pip-version-check -U wheel
358358
python -m pip install --disable-pip-version-check ${{ steps.requirements.outputs.requirements }}
359359
360360
- name: 🔧 Install pip dependencies (MSYS2)

.github/workflows/_Checking_Parameters.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
expected-python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
7474
expected-systems: '["ubuntu", "ubuntu-arm", "windows", "windows-arm", "macos", "macos-arm"]'
7575
expected-exclude-jobs: '["windows-arm:3.10"]'
76-
expected-include-jobs: '["mingw64:3.12", "ucrt64:3.12"]'
76+
expected-include-jobs: '["mingw64:3.13", "ucrt64:3.13"]'
7777
generated-default-version: ${{ needs.Params_Default.outputs.python_version }}
7878
generated-jobmatrix: ${{ needs.Params_Default.outputs.python_jobs }}
7979

@@ -101,7 +101,7 @@ jobs:
101101
expected-python-versions: '["3.12", "3.13", "pypy-3.10", "pypy-3.11"]'
102102
expected-systems: '["ubuntu", "ubuntu-arm", "windows", "windows-arm", "macos", "macos-arm"]'
103103
expected-exclude-jobs: '["windows-arm:pypy-3.10", "windows-arm:pypy-3.11"]'
104-
expected-include-jobs: '["mingw64:3.12", "ucrt64:3.12"]'
104+
expected-include-jobs: '["mingw64:3.13", "ucrt64:3.13"]'
105105
generated-default-version: ${{ needs.Params_PythonVersions.outputs.python_version }}
106106
generated-jobmatrix: ${{ needs.Params_PythonVersions.outputs.python_jobs }}
107107

@@ -123,7 +123,7 @@ jobs:
123123
expected-python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
124124
expected-systems: '["windows"]'
125125
expected-exclude-jobs: '[]'
126-
expected-include-jobs: '["mingw32:3.12", "mingw64:3.12"]'
126+
expected-include-jobs: '["mingw32:3.13", "mingw64:3.13"]'
127127
generated-default-version: ${{ needs.Params_Systems.outputs.python_version }}
128128
generated-jobmatrix: ${{ needs.Params_Systems.outputs.python_jobs }}
129129

doc/JobTemplate/AllInOne/CompletePipeline.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ It can be used for simple Python packages as well as namespace packages.
124124
* :gh:`actions/setup-python`
125125

126126
* :pypi:`wheel`
127-
* :pypi:`tomli`
128127

129128
* :ref:`pyTooling/Actions/.github/workflows/UnitTesting.yml <JOBTMPL/UnitTesting>`
130129

@@ -145,7 +144,6 @@ It can be used for simple Python packages as well as namespace packages.
145144
* pip
146145

147146
* :pypi:`wheel`
148-
* :pypi:`tomli`
149147
* Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or
150148
:ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter.
151149

@@ -203,7 +201,6 @@ It can be used for simple Python packages as well as namespace packages.
203201
* pip
204202

205203
* :pypi:`coverage`
206-
* :pypi:`tomli`
207204

208205
* :gh:`pyTooling/upload-artifact`
209206

doc/JobTemplate/Publish/PublishCoverageResults.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ cloud services like :term:`CodeCov` or :term:`Codacy`.
5656
* pip
5757

5858
* :pypi:`coverage`
59-
* :pypi:`tomli`
6059

6160
* :gh:`pyTooling/upload-artifact`
6261

0 commit comments

Comments
 (0)