Migrate from poetry to uv

.github/workflows/python-app.yml

@@ -15,37 +15,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install poetry
-          poetry install
-      - name: Format with Black
+          version: "0.4.27"
+      - name: Set up Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
+
+      - name: install project
+        run: uv sync --all-extras --dev
+
+      - name: Format with Ruff
         run: |
-          poetry run black --check versup
-      - name: Lint with flake8
+          uv run ruff format --check src
+
+      - name: Lint with ruff
         run: |
           # stop the build if there are Python syntax errors or undefined names
-          poetry run flake8 versup  --show-source --statistics --count
-          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+          uv run ruff check src
       - name: Type check with MyPy
         run: |
           # Some dependencies are missing the type definitions (semver, git)
-          poetry run mypy versup --ignore-missing-imports
+          uv run mypy src/versup --ignore-missing-imports
       - name: Test with pytest
         run: |
-          poetry run make test
+          uv run pytest src/tests
       - name: Coveralls
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          poetry run coveralls --service=github
+          uv run coveralls --service=github

Makefile

@@ -4,5 +4,5 @@ test:
 	@ coverage html -d coverage_report
 	@ coverage xml -o coverage.xml
 	@ coverage report
-	@ flake8 versup
-	@ mypy versup --ignore-missing-imports
+	@ flake8 src/versup
+	@ mypy src/versup --ignore-missing-imports

docs/source/conf.py

@@ -51,18 +51,18 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"Versup"
-copyright = u"2020, Sven Steinbauer"
-author = u"Sven Steinbauer"
+project = "Versup"
+copyright = "2020, Sven Steinbauer"
+author = "Sven Steinbauer"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u"1.6.1"
+version = "1.6.1"
 # The full version, including alpha/beta/rc tags.
-release = u"1.6.1"
+release = "1.6.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -129,15 +129,15 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "Versup.tex", u"Versup Documentation", u"Sven Steinbauer", "manual"),
+    (master_doc, "Versup.tex", "Versup Documentation", "Sven Steinbauer", "manual"),
 ]
 
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "versup", u"Versup Documentation", [author], 1)]
+man_pages = [(master_doc, "versup", "Versup Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -149,7 +149,7 @@
     (
         master_doc,
         "Versup",
-        u"Versup Documentation",
+        "Versup Documentation",
         author,
         "Versup",
         "One line description of project.",

pyproject.toml

@@ -1,53 +1,48 @@
-[tool.poetry]
+[project]
 name = "versup"
 version = "1.6.1"
-description = "Version up your project with ease."
-authors = ["Sven Steinbauer <sven@unlogic.co.uk>"]
-license = "MIT"
+description = "Version up your porject with ease."
 readme = "README.md"
-repository = "https://github.com/Svenito/versup"
-
-[tool.poetry.dependencies]
-python = "^3.8"
-gitpython = "^3.1"
-click = "^8.0"
-semver = "^2.13, <3"
-setuptools = "^65.5.3"
-rich = "^13.7.1"
-flake8-pyproject = "^1.2.3"
-
-
-[tool.poetry.dev-dependencies]
-pytest-cov = "^4.0"
-pytest = "^7.2"
-sphinx = "^5.3.0"
-sphinx_rtd_theme = "^0.4.3"
-coveralls = "^3.3.1"
-black = "^22.10.0"
-coverage = "^6.5"
-flake8 = "^5.0.4"
-mypy = "^0.982"
-types-click = "^7.1.8"
+requires-python = ">=3.8"
+authors=[{name="Sven Steinbauer", email="sven@unlogic.co.uk"}]
+license={ file = "LICENSE.txt" }
+dependencies = [
+    "click>=8.1.7",
+    "gitpython>=3.1.43",
+    "rich>=13.9.3",
+    "semver>=3.0.2",
+]
 
-[tool.poetry.scripts]
+[project.scripts]
 versup = "versup.__main__:main"
 
-[tool.poetry.group.dev.dependencies]
-isort = "^5.12.0"
+[project.urls]
+repository = "https://github.com/Svenito/versup"
 
-[tool.flake8]
-max-line-length = 88
-extend-ignore = [
-    'E203', 'E231', 'W604'
-]
-per-file-ignores = [
-    'default_conf.py:E501',
+[tool.uv]
+dev-dependencies = [
+    "coverage>=7.6.1",
+    "coveralls>=4.0.1",
+    "flake8>=5.0.4",
+    "mypy>=1.13.0",
+    "pytest>=8.3.3",
+    "pytest-cov>=5.0.0",
+    "sphinx>=7.1.2",
+    "sphinx-rtd-theme>=3.0.1",
+    "types-click>=7.1.8",
+    "isort>=5.13.2",
+    "ruff>=0.7.1",
 ]
+package = true
 
-[tool.isort]
-profile = "black"
+[tool.ruff.lint]
+select = ["E", "F"]
+ignore = ["E501"]
 
-[build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
 
+[tool.isort]
+profile = "black"

tests/test_config_reader.py → src/tests/test_config_reader.py

@@ -1,5 +1,3 @@
-import os
-
 import pytest
 
 import versup.conf_reader as conf_reader
@@ -12,13 +10,13 @@
 
 @pytest.fixture()
 def config_file():
-    yield conf_reader.parse_config_file("./tests/test_conf.json")
+    yield conf_reader.parse_config_file("./src/tests/test_conf.json")
 
 
 def test_parse_config_file():
-    conf = conf_reader.parse_config_file("./tests/test_conf.json")
+    conf = conf_reader.parse_config_file("./src/tests/test_conf.json")
     assert conf["scripts"]["postbump"] == "echo POST"
-    conf = conf_reader.parse_config_file("./tests/testsss_conf.json")
+    conf = conf_reader.parse_config_file("./src/tests/testsss_conf.json")
     assert conf == {}
 
 

tests/test_file_updater.py → src/tests/test_file_updater.py

@@ -1,6 +1,3 @@
-import io
-import sys
-
 import versup.file_updater as file_updater
 
 

tests/test_gitops.py → src/tests/test_gitops.py

@@ -1,5 +1,3 @@
-import configparser
-
 import pytest
 
 import versup.gitops as gitops

tests/test_script_runner.py → src/tests/test_script_runner.py

@@ -11,7 +11,7 @@
 
 @pytest.fixture()
 def config_file():
-    yield conf_reader.parse_config_file("./tests/test_conf.json")
+    yield conf_reader.parse_config_file("./src/tests/test_conf.json")
 
 
 @patch("subprocess.call")

tests/test_template.py → src/tests/test_template.py

@@ -1,5 +1,3 @@
-import pytest
-
 import versup.template as template
 
 

tests/test_versioning.py → src/tests/test_versioning.py

@@ -1,19 +1,19 @@
 import pytest
 
-from versup import __version__, versioning
+from versup import versioning
 
 
 def test_get_new_version_explicit():
     assert "1.6.88" == versioning.get_new_version("1.2.3", "1.6.88", [], False)
 
 
 def test_get_new_version_explicit_raise():
-    with pytest.raises(Exception) as e_info:
+    with pytest.raises(Exception):
         versioning.get_new_version("1.4.2", "1.pies.88", [], False)
 
 
 def test_get_new_version_increment_raise():
-    with pytest.raises(Exception) as e_info:
+    with pytest.raises(Exception):
         versioning.get_new_version("1.4.2", "minor", ["major"], False)
 
     assert "1.5.0" == versioning.get_new_version("1.4.2", "minor", ["minor"], False)
@@ -61,5 +61,5 @@ def test_release():
     assert "1.0.1" == versioning.bump_version("1.0.1-rc.1", "release")
     assert "2.0.1" == versioning.bump_version("2.0.1-rc.5", "release")
 
-    with pytest.raises(Exception) as e_info:
+    with pytest.raises(Exception):
         versioning.bump_version("2.0.1", "release")

versup/conf_reader.py → src/versup/conf_reader.py

@@ -22,7 +22,7 @@ def parse_config_file(config_file: str) -> dict:
     return d
 
 
-def merge(a: dict, b: dict, path: list = None):
+def merge(a: dict, b: dict, path: list | None = None):
     """
     Recursively merges two dictionaries b into a. Duplicate keys, b overrides a
     """

versup/script_runner.py → src/versup/script_runner.py

@@ -27,7 +27,7 @@ def wrapper(config: Dict, version: str, **kwargs) -> Any:
             pre_script = get_conf_value(config, f"scripts/pre{taskname}")
             if pre_script:
                 if kwargs["dryrun"]:
-                    print(f"Execute pre script `{pre_script}`\n")
+                    print(f"Execute pre script '{pre_script}'\n")
                 else:
                     subprocess.call(pre_script.split() + [version])
 
@@ -36,7 +36,7 @@ def wrapper(config: Dict, version: str, **kwargs) -> Any:
             post_script = get_conf_value(config, f"scripts/post{taskname}")
             if post_script:
                 if kwargs["dryrun"]:
-                    print(f"Execute post script `{post_script}`\n")
+                    print(f"Execute post script '{post_script}'\n")
                 else:
                     subprocess.call(post_script.split())