From d0eae08e12481c632f81905acb8ddc16ba01a8e7 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sat, 17 Jan 2026 20:15:12 +0100 Subject: [PATCH] Removed tomli. --- .github/workflows/ApplicationTesting.yml | 2 +- .github/workflows/ExtractConfiguration.yml | 10 +++++----- .github/workflows/InstallPackage.yml | 1 - .github/workflows/PublishCoverageResults.yml | 4 ++-- .github/workflows/SphinxDocumentation.yml | 4 ++-- .github/workflows/UnitTesting.yml | 16 ++++++++-------- doc/JobTemplate/AllInOne/CompletePipeline.rst | 3 --- .../Publish/PublishCoverageResults.rst | 1 - doc/JobTemplate/Setup/ExtractConfiguration.rst | 1 - doc/JobTemplate/Testing/UnitTesting.rst | 1 - 10 files changed, 18 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ApplicationTesting.yml b/.github/workflows/ApplicationTesting.yml index bb848fb..85ae81f 100644 --- a/.github/workflows/ApplicationTesting.yml +++ b/.github/workflows/ApplicationTesting.yml @@ -146,7 +146,7 @@ jobs: "pyyaml": "python-pyyaml:p python-types-pyyaml:p", "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", "sphinx": "python-markupsafe:p", - "tomli": "python-tomli:p", + "tomli": "python-tomli:p", # outdated, now part of Python as tomllib "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", diff --git a/.github/workflows/ExtractConfiguration.yml b/.github/workflows/ExtractConfiguration.yml index 7247364..541e044 100644 --- a/.github/workflows/ExtractConfiguration.yml +++ b/.github/workflows/ExtractConfiguration.yml @@ -89,9 +89,9 @@ jobs: with: python-version: ${{ inputs.python_version }} - - name: 🔧 Install wheel,tomli and pip dependencies (native) + - name: 🔧 Install wheel and pip dependencies (native) 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 id: getVariables @@ -105,7 +105,7 @@ jobs: 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") coverageHTMLDirectory = Path("htmlcov") @@ -121,7 +121,7 @@ jobs: pyProjectFile = Path("pyproject.toml") if pyProjectFile.exists(): with pyProjectFile.open("rb") as file: - pyProjectSettings = tomllib_load(file) + pyProjectSettings = toml_load(file) toolSection = pyProjectSettings["tool"] if "pytest" in toolSection: @@ -163,7 +163,7 @@ jobs: coverageRCFile = Path(coverageRC) if coverageRCFile.exists(): with coverageRCFile.open("rb") as file: - coverageRCSettings = tomli_load(file) + coverageRCSettings = toml_load(file) coverageHTMLDirectory = Path(coverageRCSettings["html"]["directory"]) coverageXMLFile = Path(coverageRCSettings["xml"]["output"]) diff --git a/.github/workflows/InstallPackage.yml b/.github/workflows/InstallPackage.yml index af81010..af0d2ce 100644 --- a/.github/workflows/InstallPackage.yml +++ b/.github/workflows/InstallPackage.yml @@ -70,7 +70,6 @@ jobs: python-markupsafe:p python-pyaml:p python-types-pyyaml:p python-ruamel-yaml:p python-ruamel.yaml.clib:p - python-tomli:p - name: 🐍 Setup Python ${{ matrix.python }} uses: actions/setup-python@v6 diff --git a/.github/workflows/PublishCoverageResults.yml b/.github/workflows/PublishCoverageResults.yml index 72e819d..cba3b29 100644 --- a/.github/workflows/PublishCoverageResults.yml +++ b/.github/workflows/PublishCoverageResults.yml @@ -124,9 +124,9 @@ jobs: run: | tree -pash artifacts - - name: 🔧 Install coverage and tomli + - name: 🔧 Install coverage 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/' run: | diff --git a/.github/workflows/SphinxDocumentation.yml b/.github/workflows/SphinxDocumentation.yml index 45c8134..0058e75 100644 --- a/.github/workflows/SphinxDocumentation.yml +++ b/.github/workflows/SphinxDocumentation.yml @@ -99,7 +99,7 @@ jobs: with: python-version: ${{ inputs.python_version }} - - name: 🔧 Install wheel,tomli and pip dependencies (native) + - name: 🔧 Install wheel and pip dependencies (native) run: | python -m pip install --disable-pip-version-check -U wheel python -m pip install --disable-pip-version-check ${{ inputs.requirements }} @@ -158,7 +158,7 @@ jobs: with: python-version: ${{ inputs.python_version }} - - name: 🔧 Install wheel,tomli and pip dependencies (native) + - name: 🔧 Install wheel and pip dependencies (native) run: | python -m pip install --disable-pip-version-check -U wheel python -m pip install --disable-pip-version-check ${{ inputs.requirements }} diff --git a/.github/workflows/UnitTesting.yml b/.github/workflows/UnitTesting.yml index 7eed964..964a024 100644 --- a/.github/workflows/UnitTesting.yml +++ b/.github/workflows/UnitTesting.yml @@ -199,11 +199,11 @@ jobs: # Compute Dependencies for MSYS2 steps - - name: 🔧 Install dependencies (system Python for Python shell) - if: matrix.system == 'msys2' - shell: pwsh - run: | - py -3.9 -m pip install --disable-pip-version-check --break-system-packages -U tomli +# - name: 🔧 Install dependencies (system Python for Python shell) +# if: matrix.system == 'msys2' +# shell: pwsh +# run: | +# py -3.12 -m pip install --disable-pip-version-check --break-system-packages -U tomli - name: Compute path to requirements file id: requirements @@ -286,7 +286,7 @@ jobs: "ruamel.yaml": "python-ruamel-yaml:p", # "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", "sphinx": "python-markupsafe:p", - "tomli": "python-tomli:p", + "tomli": "python-tomli:p", # outdated, now part of Python as tomllib "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", @@ -351,10 +351,10 @@ jobs: # Python Dependency steps - - name: 🔧 Install wheel,tomli and pip dependencies (native) + - name: 🔧 Install wheel and pip dependencies (native) if: matrix.system != 'msys2' 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 }} - name: 🔧 Install pip dependencies (MSYS2) diff --git a/doc/JobTemplate/AllInOne/CompletePipeline.rst b/doc/JobTemplate/AllInOne/CompletePipeline.rst index afacc2d..d02bab1 100644 --- a/doc/JobTemplate/AllInOne/CompletePipeline.rst +++ b/doc/JobTemplate/AllInOne/CompletePipeline.rst @@ -124,7 +124,6 @@ It can be used for simple Python packages as well as namespace packages. * :gh:`actions/setup-python` * :pypi:`wheel` - * :pypi:`tomli` * :ref:`pyTooling/Actions/.github/workflows/UnitTesting.yml ` @@ -145,7 +144,6 @@ It can be used for simple Python packages as well as namespace packages. * pip * :pypi:`wheel` - * :pypi:`tomli` * Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or :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 * :pypi:`coverage` - * :pypi:`tomli` * :gh:`pyTooling/upload-artifact` diff --git a/doc/JobTemplate/Publish/PublishCoverageResults.rst b/doc/JobTemplate/Publish/PublishCoverageResults.rst index 33164c8..7ef6d71 100644 --- a/doc/JobTemplate/Publish/PublishCoverageResults.rst +++ b/doc/JobTemplate/Publish/PublishCoverageResults.rst @@ -56,7 +56,6 @@ cloud services like :term:`CodeCov` or :term:`Codacy`. * pip * :pypi:`coverage` - * :pypi:`tomli` * :gh:`pyTooling/upload-artifact` diff --git a/doc/JobTemplate/Setup/ExtractConfiguration.rst b/doc/JobTemplate/Setup/ExtractConfiguration.rst index 1b8c0c5..b36945f 100644 --- a/doc/JobTemplate/Setup/ExtractConfiguration.rst +++ b/doc/JobTemplate/Setup/ExtractConfiguration.rst @@ -49,7 +49,6 @@ duplications within jobs. * :gh:`actions/setup-python` * :pypi:`wheel` - * :pypi:`tomli` .. _JOBTMPL/ExtractConfiguration/Instantiation: diff --git a/doc/JobTemplate/Testing/UnitTesting.rst b/doc/JobTemplate/Testing/UnitTesting.rst index 8ab5ff6..7af593f 100644 --- a/doc/JobTemplate/Testing/UnitTesting.rst +++ b/doc/JobTemplate/Testing/UnitTesting.rst @@ -60,7 +60,6 @@ Configuration options to :term:`pytest` should be given via section ``[tool.pyte * pip * :pypi:`wheel` - * :pypi:`tomli` * Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or :ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter.