fix version and release check

.ci/release_check.py → .ci/version_check.py

@@ -15,15 +15,15 @@
 
 # make sure that changelog was updated
 with open(changelog_fn) as f:
-    assert version in f.read()
+    assert version in f.read(), "changelog entry missing"
 
 # make sure that version is not already tagged
 tags = subp.check_output(["git", "tag"]).decode().strip().split("\n")
-assert version not in tags
+assert f"v{version}" not in tags, "tag exists"
 
 # make sure that version itself was updated
 r = requests.get("https://pypi.org/pypi/iminuit/json")
 releases = r.json()["releases"]
 pypi_versions = [parse_version(v) for v in releases]
 this_version = parse_version(version)
-assert this_version not in pypi_versions
+assert this_version not in pypi_versions, "pypi version exists"

.github/workflows/coverage.yml

@@ -29,8 +29,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip wheel
         python -m pip install -r requirements-dev.txt
-    - run: pre-commit run -a
-    # -e is required here to track coverage properly
     - run: python -m pip install -e .
     - run: coverage run -m pytest
     - uses: AndreMiras/coveralls-python-action@develop

.github/workflows/version.yml → .github/workflows/pre-commit.yml

@@ -1,4 +1,4 @@
-name: Version
+name: pre-commit
 
 on:
   pull_request:
@@ -12,5 +12,6 @@ jobs:
     - uses: actions/setup-python@v2
       with:
         python-version: 3.8
-    - run: python -m pip install requests
-    - run: python .ci/release_check.py
+    - run: python -m pip install --upgrade pip wheel
+    - run: python -m pip install pre-commit
+    - run: pre-commit run -a

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
     name: version-check
     language: python
     additional_dependencies: [requests]
-    entry: python .ci/release_check.py
+    entry: python .ci/version_check.py
 
 # Python linter (Flake8)
 - repo: https://gitlab.com/pycqa/flake8

doc/changelog.rst

@@ -5,7 +5,7 @@
 Changelog
 =========
 
-2.2.0.rc1
+2.2.0.rc2
 ---------
 
 New features

src/iminuit/version.py

@@ -1 +1 @@
-__version__ = "2.2.0.rc1"
+__version__ = "2.2.0.rc2"