Fix issues with GitHub Actions

.github/workflows/release.yml

@@ -9,20 +9,24 @@ on:
 
 jobs:
   release:
-    if: github.event.pull_request.merged == true
+    if: ${{ github.event.pull_request.merged == true }} && ${{ contains(github.event.head_commit.message, 'Release') }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest version
         uses: actions/checkout@v3
         with:
           ref: devel
 
+      - name: Set version
+        id: manual-tagger
+        run: echo "NEW_TAG=$(perun --version | cut -d' ' -f2)" >> "$GITHUB_OUTPUT"
+
       - name: Tag the new version
-        uses: phish108/[email protected].51
+        uses: phish108/[email protected].64
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           release-branch: devel
-          bump: minor
+          tag: ${{ steps.manual-tagger.outputs.NEW_TAG }}
 
   build-and-deploy-doc:
     needs: release
@@ -42,9 +46,9 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
 
-      - name: Compile the documentation
+      - name: Generate docs for Python using Tox
         run: |
-          make -C docs html
+          tox -e docs
 
       - name: Deploy to GH pages
         uses: JamesIves/github-pages-deploy-action@v4
@@ -74,10 +78,10 @@ jobs:
         run: |
           # Install and upgrade pip
           python3 -m pip install --upgrade pip
-          # Install dependencies for build and deplo
+          # Install dependencies for build and deploy
           python3 -m pip install setuptools wheel twine
 
-      - name: Build python release distrubution package
+      - name: Build python release distribution package
         run: |
           pip3 install -q build
           make pypi-release

.github/workflows/ubuntu.yml

@@ -66,6 +66,10 @@ jobs:
         run: |
           pip3 install dist/*.tar.gz
 
+      - name: Try running perun and getting help
+        run: |
+          perun --help
+
   # Tests that documentation is buildable. We limit the test to version 3.11 in order to have less clutter in Actions
   build-docs:
     runs-on: ubuntu-latest

perun/__init__.py

@@ -17,4 +17,4 @@
 
 import importlib.metadata
 
-__version__ = importlib.metadata.version(__package__)
+__version__ = importlib.metadata.version("perun-toolsuite")

perun/utils/cli_helpers.py

@@ -718,7 +718,7 @@ def split_requirement(requirement: str) -> str:
         split = re.split(version_delimiter, requirement)
         return split[0] if len(split) > 0 else ""
 
-    reqs = {split_requirement(req) for req in metadata.requires("perun") or []}
+    reqs = {split_requirement(req) for req in metadata.requires("perun-toolsuite") or []}
 
     dump_directory = pcs.get_safe_path(os.getcwd())
     dump_file = os.path.join(

pyproject.toml

@@ -1,10 +1,11 @@
 [build-system]
-requires = ["setuptools>=60", "setuptools-scm>=8.0", "wheel"]
+requires = ["setuptools>=60", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "perun"
+name = "perun-toolsuite"
 description = "Perun: Lightweight Performance Version System"
+version = "0.21.1"
 requires-python = ">=3.9"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -56,8 +57,7 @@ dependencies = [
 ]
 # (1) Optional dependencies are made dynamic so that we can reuse them in tox. The goal is to have each
 # dependency and its version constraints specified only once to avoid inconsistencies.
-# (2) Version is made dynamic, so it can be used to automatically infer and tag the version of Perun
-dynamic = ["optional-dependencies", "version"]
+dynamic = ["optional-dependencies"]
 
 
 [project.urls]
@@ -116,6 +116,7 @@ exclude = [
     "build",
     "docs",
     "perun.egg-info",
+    "perun_toolsuite.egg-info",
     "venv",
     # Fixme: Temporary exclude
     "perun/collect/trace"
@@ -218,5 +219,3 @@ target-version = [
 ]
 line-length = 100
 
-# This line has to be there, because otherwise the setuptools_scm will not infer the version
-[tool.setuptools_scm]

tests/test_cli.py

@@ -2526,4 +2526,4 @@ def raise_exception():
     cli.DEV_MODE = False
 
     with pytest.raises(Exception):
-        cli.launch_cli_in_dev_mode()()
+        cli.launch_cli_in_dev_mode()