Explorar o código

Clean up tasks

Arkadiusz Ryś hai 1 ano
pai
achega
2de19d2c55
Modificáronse 3 ficheiros con 12 adicións e 5 borrados
  1. 1 0
      pyproject.toml
  2. 1 0
      requirements.txt
  3. 10 5
      tasks.py

+ 1 - 0
pyproject.toml

@@ -46,6 +46,7 @@ dev = [
     "pip~=23.2.1",
     "flit~=3.9.0",
     "twine~=4.0.2",
+    "vermin~=1.5.1",
     "numpy~=1.26.0",
     "invoke~=2.2.0",
     "jinja2~=3.1.2",

+ 1 - 0
requirements.txt

@@ -21,6 +21,7 @@ tox      ~= 4.11.3
 pip      ~= 23.2.1
 flit     ~= 3.9.0
 twine    ~= 4.0.2
+vermin      ~= 1.5.1
 numpy    ~= 1.26.0
 invoke   ~= 2.2.0
 jinja2   ~= 3.1.2

+ 10 - 5
tasks.py

@@ -4,6 +4,9 @@ from invoke import task
 from jinja2 import Template
 
 system = "mocka"  # Directory name of the project
+main_branch = "main" # The release branch on origin
+dev_branch = "dev" # The main development branch on origin
+
 
 @task
 def lint(c):
@@ -44,8 +47,10 @@ def test(c):
 @task
 def coverage(c):
     """Run coverage from the 'tests' directory."""
-    c.run("coverage run --source . -m unittest discover tests 'test_*' -v")
-    c.run("coverage html")
+    c.run("python3 -m coverage erase")
+    c.run("python3 -m coverage run --source . -m unittest discover tests 'test_*' -v")
+    c.run("python3 -m coverage report -m")
+    c.run("python3 -m coverage html")
 
 
 @task
@@ -96,18 +101,18 @@ def release(c, version):
         _minor = 0
         _patch = 0
 
-    c.run(f"git checkout -b release-{_major}.{_minor}.{_patch} dev")
+    c.run(f"git checkout -b release-{_major}.{_minor}.{_patch} {dev_branch}")
     c.run(f"sed -i 's/{__version__}/{_major}.{_minor}.{_patch}/g' {system}/__init__.py")
     print(f"Update the readme for version {_major}.{_minor}.{_patch}.")
     input("Press enter when ready.")
     c.run(f"git add -u")
     c.run(f'git commit -m "Update changelog version {_major}.{_minor}.{_patch}"')
     c.run(f"git push --set-upstream origin release-{_major}.{_minor}.{_patch}")
-    c.run(f"git checkout main")
+    c.run(f"git checkout {main_branch}")
     c.run(f"git merge --no-ff release-{_major}.{_minor}.{_patch}")
     c.run(f'git tag -a {_major}.{_minor}.{_patch} -m "Release {_major}.{_minor}.{_patch}"')
     c.run(f"git push")
-    c.run(f"git checkout dev")
+    c.run(f"git checkout {dev_branch}")
     c.run(f"git merge --no-ff release-{_major}.{_minor}.{_patch}")
     c.run(f"git push")
     c.run(f"git branch -d release-{_major}.{_minor}.{_patch}")