Removed tomli.

This commit is contained in:
Patrick Lehmann
2026-01-17 20:15:12 +01:00
parent aefbd1cbba
commit d0eae08e12
10 changed files with 18 additions and 25 deletions

View File

@@ -146,7 +146,7 @@ jobs:
"pyyaml": "python-pyyaml:p python-types-pyyaml:p", "pyyaml": "python-pyyaml:p python-types-pyyaml:p",
"ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
"sphinx": "python-markupsafe:p", "sphinx": "python-markupsafe:p",
"tomli": "python-tomli:p", "tomli": "python-tomli:p", # outdated, now part of Python as tomllib
"wheel": "python-wheel:p", "wheel": "python-wheel:p",
"pyEDAA.ProjectModel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml: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", "pyEDAA.Reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",

View File

@@ -89,9 +89,9 @@ jobs:
with: with:
python-version: ${{ inputs.python_version }} python-version: ${{ inputs.python_version }}
- name: 🔧 Install wheel,tomli and pip dependencies (native) - name: 🔧 Install wheel and pip dependencies (native)
run: | run: |
python -m pip install --disable-pip-version-check -U wheel tomli python -m pip install --disable-pip-version-check -U wheel
- name: 🔁 Extract configurations from pyproject.toml - name: 🔁 Extract configurations from pyproject.toml
id: getVariables id: getVariables
@@ -105,7 +105,7 @@ jobs:
print(f"Python: {version} (of default installation)") print(f"Python: {version} (of default installation)")
from tomllib import load as tomllib_load from tomllib import load as toml_load
unittestXMLFile = Path("./unittest.xml") unittestXMLFile = Path("./unittest.xml")
coverageHTMLDirectory = Path("htmlcov") coverageHTMLDirectory = Path("htmlcov")
@@ -121,7 +121,7 @@ jobs:
pyProjectFile = Path("pyproject.toml") pyProjectFile = Path("pyproject.toml")
if pyProjectFile.exists(): if pyProjectFile.exists():
with pyProjectFile.open("rb") as file: with pyProjectFile.open("rb") as file:
pyProjectSettings = tomllib_load(file) pyProjectSettings = toml_load(file)
toolSection = pyProjectSettings["tool"] toolSection = pyProjectSettings["tool"]
if "pytest" in toolSection: if "pytest" in toolSection:
@@ -163,7 +163,7 @@ jobs:
coverageRCFile = Path(coverageRC) coverageRCFile = Path(coverageRC)
if coverageRCFile.exists(): if coverageRCFile.exists():
with coverageRCFile.open("rb") as file: with coverageRCFile.open("rb") as file:
coverageRCSettings = tomli_load(file) coverageRCSettings = toml_load(file)
coverageHTMLDirectory = Path(coverageRCSettings["html"]["directory"]) coverageHTMLDirectory = Path(coverageRCSettings["html"]["directory"])
coverageXMLFile = Path(coverageRCSettings["xml"]["output"]) coverageXMLFile = Path(coverageRCSettings["xml"]["output"])

View File

@@ -70,7 +70,6 @@ jobs:
python-markupsafe:p python-markupsafe:p
python-pyaml:p python-types-pyyaml:p python-pyaml:p python-types-pyyaml:p
python-ruamel-yaml:p python-ruamel.yaml.clib:p python-ruamel-yaml:p python-ruamel.yaml.clib:p
python-tomli:p
- name: 🐍 Setup Python ${{ matrix.python }} - name: 🐍 Setup Python ${{ matrix.python }}
uses: actions/setup-python@v6 uses: actions/setup-python@v6

View File

@@ -124,9 +124,9 @@ jobs:
run: | run: |
tree -pash artifacts tree -pash artifacts
- name: 🔧 Install coverage and tomli - name: 🔧 Install coverage
run: | run: |
python -m pip install -U --disable-pip-version-check --break-system-packages coverage[toml] tomli python -m pip install -U --disable-pip-version-check --break-system-packages coverage[toml]
- name: Rename .coverage files and move them all into 'coverage/' - name: Rename .coverage files and move them all into 'coverage/'
run: | run: |

View File

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

View File

@@ -199,11 +199,11 @@ jobs:
# Compute Dependencies for MSYS2 steps # Compute Dependencies for MSYS2 steps
- name: 🔧 Install dependencies (system Python for Python shell) # - name: 🔧 Install dependencies (system Python for Python shell)
if: matrix.system == 'msys2' # if: matrix.system == 'msys2'
shell: pwsh # shell: pwsh
run: | # run: |
py -3.9 -m pip install --disable-pip-version-check --break-system-packages -U tomli # py -3.12 -m pip install --disable-pip-version-check --break-system-packages -U tomli
- name: Compute path to requirements file - name: Compute path to requirements file
id: requirements id: requirements
@@ -286,7 +286,7 @@ jobs:
"ruamel.yaml": "python-ruamel-yaml:p", "ruamel.yaml": "python-ruamel-yaml:p",
# "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", # "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
"sphinx": "python-markupsafe:p", "sphinx": "python-markupsafe:p",
"tomli": "python-tomli:p", "tomli": "python-tomli:p", # outdated, now part of Python as tomllib
"wheel": "python-wheel:p", "wheel": "python-wheel:p",
"pyedaa.projectmodel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml: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", "pyedaa.reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",
@@ -351,10 +351,10 @@ jobs:
# Python Dependency steps # Python Dependency steps
- name: 🔧 Install wheel,tomli and pip dependencies (native) - name: 🔧 Install wheel and pip dependencies (native)
if: matrix.system != 'msys2' if: matrix.system != 'msys2'
run: | run: |
python -m pip install --disable-pip-version-check -U wheel tomli python -m pip install --disable-pip-version-check -U wheel
python -m pip install --disable-pip-version-check ${{ steps.requirements.outputs.requirements }} python -m pip install --disable-pip-version-check ${{ steps.requirements.outputs.requirements }}
- name: 🔧 Install pip dependencies (MSYS2) - name: 🔧 Install pip dependencies (MSYS2)

View File

@@ -124,7 +124,6 @@ It can be used for simple Python packages as well as namespace packages.
* :gh:`actions/setup-python` * :gh:`actions/setup-python`
* :pypi:`wheel` * :pypi:`wheel`
* :pypi:`tomli`
* :ref:`pyTooling/Actions/.github/workflows/UnitTesting.yml <JOBTMPL/UnitTesting>` * :ref:`pyTooling/Actions/.github/workflows/UnitTesting.yml <JOBTMPL/UnitTesting>`
@@ -145,7 +144,6 @@ It can be used for simple Python packages as well as namespace packages.
* pip * pip
* :pypi:`wheel` * :pypi:`wheel`
* :pypi:`tomli`
* Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or * Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or
:ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter. :ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter.
@@ -203,7 +201,6 @@ It can be used for simple Python packages as well as namespace packages.
* pip * pip
* :pypi:`coverage` * :pypi:`coverage`
* :pypi:`tomli`
* :gh:`pyTooling/upload-artifact` * :gh:`pyTooling/upload-artifact`

View File

@@ -56,7 +56,6 @@ cloud services like :term:`CodeCov` or :term:`Codacy`.
* pip * pip
* :pypi:`coverage` * :pypi:`coverage`
* :pypi:`tomli`
* :gh:`pyTooling/upload-artifact` * :gh:`pyTooling/upload-artifact`

View File

@@ -49,7 +49,6 @@ duplications within jobs.
* :gh:`actions/setup-python` * :gh:`actions/setup-python`
* :pypi:`wheel` * :pypi:`wheel`
* :pypi:`tomli`
.. _JOBTMPL/ExtractConfiguration/Instantiation: .. _JOBTMPL/ExtractConfiguration/Instantiation:

View File

@@ -60,7 +60,6 @@ Configuration options to :term:`pytest` should be given via section ``[tool.pyte
* pip * pip
* :pypi:`wheel` * :pypi:`wheel`
* :pypi:`tomli`
* Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or * Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or
:ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter. :ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter.