Fix actions build

Author: amykyta3

.github/workflows/build.yml

@@ -14,95 +14,61 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-
 jobs:
   test:
     strategy:
       matrix:
         python-version:
-          - 3.5
-          - 3.6
-          - 3.7
-          - 3.8
-          - 3.9
+          - "3.7"
+          - "3.8"
+          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
         include:
           - os: ubuntu-latest
-            setup-python-env: {}
 
           # older versions need older OS
-          - python-version: 3.5
-            os: ubuntu-20.04
-            setup-python-env:
-              PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
-          - python-version: 3.6
-            os: ubuntu-20.04
+          - python-version: "3.7"
+            os: ubuntu-22.04
+
+          - python-version: "3.8"
+            os: ubuntu-22.04
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Python 3.7 to bootstrap py3.6 and py3.5
-        if: ${{ matrix.python-version == '3.6' || matrix.python-version == '3.5' }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.7
-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-        env: ${{ matrix.setup-python-env }}
-
-      # Python 3.6 & 3.7 cannot install directly from a pyproject.toml
-      # Instead, build a wheel from py3.7 and then install it
-      - name: Install via wheel
-        if: ${{ matrix.python-version == '3.6' || matrix.python-version == '3.5' }}
-        run: |
-          python3.7 -m pip install build
-          python3.7 -m build
-          python --version
-          python -m pip install ./dist/*.whl
 
       - name: Install dependencies
         run: |
-          python -m pip install -U pytest
+          python -m pip install pytest
           sudo apt update
           sudo apt install libxml2-utils
           tests/schema/1685-2014/download_schema.sh
           tests/schema/1685-2009/download_schema.sh
 
-      - name: Install coverage tools
-        if: ${{ matrix.python-version == 3.10 }}
-        run: |
-          python -m pip install pytest-cov coverage>=6.3
-
       - name: Install
-        if: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.5' }}
         run: |
-          python -m pip install .
+          python -m pip install ".[cli]"
 
       - name: Test
-        if: ${{ matrix.python-version != 3.10 }}
         run: |
           cd tests
-          pytest
+          pytest --cov=peakrdl_ipxact
 
-      - name: Test with Coverage
-        if: ${{ matrix.python-version == 3.10 }}
+      - name: Coveralls
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true
         run: |
           cd tests
-          pytest --cov=peakrdl_ipxact --cov-report lcov:cov.info
-
-      - name: Coveralls
-        if: ${{ matrix.python-version == 3.10 }}
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: tests/cov.info
+          coveralls --service=github
 
 #-------------------------------------------------------------------------------
   lint:
@@ -116,11 +82,11 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -U pylint
+          python -m pip install pylint
 
       - name: Install
         run: |
-          python -m pip install .
+          python -m pip install ".[cli]"
 
       - name: Run Lint
         run: |
@@ -138,7 +104,11 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -U mypy
+          python -m pip install mypy
+
+      - name: Install
+        run: |
+          python -m pip install ".[cli]"
 
       - name: Type Check
         run: |
@@ -162,13 +132,14 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -U build
+          python -m pip install build
 
       - name: Build
         run: python -m build
 
       - uses: actions/upload-artifact@v4
         with:
+          name: dist
           path: |
             dist/*.tar.gz
             dist/*.whl
@@ -188,7 +159,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          name: dist
           path: dist
 
       - uses: pypa/gh-action-pypi-publish@release/v1

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "peakrdl-ipxact"
 dynamic = ["version"]
-requires-python = ">=3.5.2"
+requires-python = ">=3.7"
 dependencies = [
     "systemrdl-compiler >= 1.24.0, < 2",
 ]
@@ -24,20 +24,18 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3 :: Only",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Operating System :: OS Independent",
     "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
 ]
 
+[project.optional-dependencies]
+cli = [
+    "peakrdl-cli >= 1.2.3",
+]
+
 [project.urls]
 Documentation = "https://peakrdl-ipxact.readthedocs.io"
 Source = "https://github.com/SystemRDL/PeakRDL-ipxact"

src/peakrdl_ipxact/__about__.py

@@ -1 +1,2 @@
-__version__ = "3.5.0"
+version_info = (3, 5, 0)
+__version__ = ".".join([str(n) for n in version_info])

src/peakrdl_ipxact/__peakrdl__.py

@@ -1,8 +1,8 @@
 from typing import TYPE_CHECKING
 import re
 
-from peakrdl.plugins.importer import ImporterPlugin #pylint: disable=import-error
-from peakrdl.plugins.exporter import ExporterSubcommandPlugin #pylint: disable=import-error
+from peakrdl.plugins.importer import ImporterPlugin
+from peakrdl.plugins.exporter import ExporterSubcommandPlugin
 
 from .exporter import IPXACTExporter, Standard
 from .importer import IPXACTImporter