Merge pull request #157 from myakove/move-to-uv

Use uv to manage the project

Author: lukas-bednar

.github/workflows/publish.yml

@@ -1,36 +1,28 @@
----
-name: PyPI Release
+name: "Publish"
 
 on:
   release:
-    types:
-      - created
+    types: ["published"]
 
 jobs:
-  release:
+  run:
+    name: "Build and publish release"
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        python-version: ["3.10"] # Use only one version for sdist
-
     steps:
-      - name: Set up Python
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+          cache-dependency-glob: uv.lock
 
-      - name: Check out code
-        uses: actions/checkout@v2
+      - name: Set up Python
+        run: uv python install 3.13
 
-      - name: Install dependencies
-        run: pip install -r requirements.txt
+      - name: Build
+        run: uv build
 
-      - name: Build and publish
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: |
-          python setup.py sdist
-          pip install twine
-          twine upload dist/*
+      - name: Publish
+        run: uv publish -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }}

.github/workflows/test.yml

@@ -1,22 +1,20 @@
 name: rrmngmnt gatting
 on:
-   pull_request:
+  pull_request:
 jobs:
   build:
     name: Test
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python: ["3.8", "3.9", "3.10"]
+
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python }}
-    - name: Install dependencies
-      run: |
-        pip install tox
-    - name: Run linters
-      run: tox -e pep8
-    - name: Run unit tests
-      run: tox -e py
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Install uv-tox
+        run: uv tool install tox --with tox-uv
+      - name: Run linters
+        run: tox -e pep8
+      - name: Run tests
+        run: tox --skip-env=pep8

README.rst

@@ -239,7 +239,7 @@ Install
 
 .. code:: sh
 
-    python setup.py devop
+    pip install python-rrmngmnt
 
 Test
 ----

pyproject.toml

@@ -0,0 +1,46 @@
+[build-system]
+requires = ["hatchling", "uv-dynamic-versioning"]
+build-backend = "hatchling.build"
+
+[project]
+name = "python-rrmngmnt"
+dynamic = ["version"]
+description = "Tool to manage remote systems and services"
+readme = "README.rst"
+license = { text = "GPL-2.0-only" }
+authors = [{ name = "Lukas Bednar", email = "[email protected]" }]
+keywords = ["remote", "resource", "service"]
+classifiers = [
+  "Topic :: Utilities",
+  "Intended Audience :: Developers",
+  "Intended Audience :: Information Technology",
+  "Operating System :: POSIX",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+]
+dependencies = ["paramiko", "netaddr", "six"]
+requires-python = ">=3.7"
+
+[project.urls]
+Homepage = "https://github.com/rhevm-qe-automation/python-rrmngmnt"
+
+
+[tool.hatch.version]
+source = "uv-dynamic-versioning"
+
+[tool.hatch.build.targets.wheel]
+packages = ["rrmngmnt"]
+
+[dependency-groups]
+tests = [
+  "attrs>=24.2.0",
+  "pytest>=7.4.4",
+  "pytest-cov>=4.1.0",
+  "pytest-docker>=2.2.0",
+  "pytest-xdist>=3.5.0",
+]

requirements.txt

@@ -3,8 +3,8 @@
 
 from rrmngmnt import Host, User
 from rrmngmnt.db import Database
-from .common import FakeExecutorFactory
 
+from .common import FakeExecutorFactory
 
 host_executor_factory = Host.executor_factory
 
@@ -19,40 +19,38 @@ def fake_cmd_data(cmd_to_data, files=None):
 
 class TestDb(object):
     data = {
-        'which systemctl': (0, "", ""),
-        'systemctl list-unit-files | grep -o ^[^.][^.]*.service | '
-        'cut -d. -f1 | sort | uniq': (0, "postgresql\n", "",),
-        'systemctl restart postgresql.service': (0, '', ''),
-        'export PGPASSWORD=db_pass; psql -d db_name -U db_user '
-        '-h localhost -R __RECORD_SEPARATOR__ -t -A -c '
+        "which systemctl": (0, "", ""),
+        "systemctl list-unit-files | grep -o ^[^.][^.]*.service | cut -d. -f1 | sort | uniq": (
+            0,
+            "postgresql\n",
+            "",
+        ),
+        "systemctl restart postgresql.service": (0, "", ""),
+        "export PGPASSWORD=db_pass; psql -d db_name -U db_user "
+        "-h localhost -R __RECORD_SEPARATOR__ -t -A -c "
         '"SELECT key, value FROM dist"': (
             0,
             "key1|value1__RECORD_SEPARATOR__key2|value2",
             "",
         ),
-        'export PGPASSWORD=db_pass; psql -d db_name -U db_user -h localhost '
-        '-R __RECORD_SEPARATOR__ -t -A -c "SELECT * FROM table ERROR"': (
-            1, "", "Syntax Error"
-        ),
-        'export PGPASSWORD=db_pass; psql -d db_name -U db_user -h localhost '
-        '-c \\\\dt': (
+        "export PGPASSWORD=db_pass; psql -d db_name -U db_user -h localhost "
+        '-R __RECORD_SEPARATOR__ -t -A -c "SELECT * FROM table ERROR"': (1, "", "Syntax Error"),
+        "export PGPASSWORD=db_pass; psql -d db_name -U db_user -h localhost -c \\\\dt": (
             0,
             (
                 "List of relations\n"
                 " Schema |         Name         | Type  | Owner\n"
                 "--------+----------------------+-------+---------\n"
                 " public | test_table           | table | postgres\n"
             ),
-            ""
-        ),
-        'export PGPASSWORD=db_pass; psql -d db_name -U db_user -h localhost '
-        '-c \\\\dv': (
-            0, "", "Did not find any relations."
+            "",
         ),
-        'export PGPASSWORD=db_pass; psql -d db_name -U db_user -h localhost '
-        '-c \\\\gg': (
-            1, "", "invalid command \\gg"
+        "export PGPASSWORD=db_pass; psql -d db_name -U db_user -h localhost -c \\\\dv": (
+            0,
+            "",
+            "Did not find any relations.",
         ),
+        "export PGPASSWORD=db_pass; psql -d db_name -U db_user -h localhost -c \\\\gg": (1, "", "invalid command \\gg"),
     }
     files = {}
 
@@ -64,37 +62,35 @@ class TestDb(object):
     def setup_class(cls):
         fake_cmd_data(cls.data, cls.files)
 
-    def get_db(self, ip='1.1.1.1'):
-        h = Host(ip)
-        h.add_user(User('root', '34546'))
+    @pytest.fixture(scope="class")
+    def db(self):
+        h = Host("1.1.1.1")
+        h.add_user(User("root", "34546"))
         return Database(
-            h, self.db_name, User(self.db_user, self.db_pass),
+            h,
+            self.db_name,
+            User(self.db_user, self.db_pass),
         )
 
-    def test_restart(self):
-        db = self.get_db()
+    def test_restart(self, db):
         db.restart()
 
-    def test_psql(self):
-        db = self.get_db()
+    def test_psql(self, db):
         res = db.psql("SELECT %s, %s FROM %s", "key", "value", "dist")
-        assert res == [['key1', 'value1'], ['key2', 'value2']]
+        assert res == [["key1", "value1"], ["key2", "value2"]]
 
-    def test_negative(self):
-        db = self.get_db()
+    def test_negative(self, db):
         with pytest.raises(Exception) as ex_info:
             db.psql("SELECT * FROM table ERROR")
         assert "Syntax Error" in str(ex_info.value)
 
-    def test_psql_cmd(self):
-        db = self.get_db()
-        res = db.psql_cmd('\\\\dt')
-        assert 'List of relations' in res
-        res = db.psql_cmd('\\\\dv')
-        assert res == 'Did not find any relations.'
+    def test_psql_cmd(self, db):
+        res = db.psql_cmd("\\\\dt")
+        assert "List of relations" in res
+        res = db.psql_cmd("\\\\dv")
+        assert res == "Did not find any relations."
 
-    def test_negative_cmd(self):
-        db = self.get_db()
+    def test_negative_cmd(self, db):
         with pytest.raises(Exception) as ex_info:
-            db.psql_cmd('\\\\gg')
-        assert 'invalid command' in str(ex_info.value)
+            db.psql_cmd("\\\\gg")
+        assert "invalid command" in str(ex_info.value)