Merge pull request #110 from rtibblesbot/issue-106-562269

Consolidate launchpad interaction scripts into single launchpad_copy.py

Author: rtibbles

.github/workflows/build_debian.yml

@@ -69,7 +69,7 @@ jobs:
         env:
           LP_CREDENTIALS_FILE: /tmp/lp-creds.txt
         run: |
-          python3 scripts/copy_to_other_distributions.py
+          python3 scripts/launchpad_copy.py copy-to-series
       - name: Cleanup Launchpad credentials
         if: always()
         run: rm -f /tmp/lp-creds.txt
@@ -102,7 +102,7 @@ jobs:
         env:
           LP_CREDENTIALS_FILE: /tmp/lp-creds.txt
         run: |
-          python3 scripts/copy_package_proposed_to_ppa.py
+          python3 scripts/launchpad_copy.py promote
       - name: Cleanup Launchpad credentials
         if: always()
         run: rm -f /tmp/lp-creds.txt

.github/workflows/python_tests.yml

@@ -0,0 +1,22 @@
+name: Python Tests
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y distro-info
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          pip install pytest vcrpy launchpadlib
+      - name: Run tests
+        run: |
+          python3 -m pytest tests/ -v

.pre-commit-config.yaml

@@ -14,3 +14,8 @@ repos:
     rev: v1.7.7
     hooks:
       - id: actionlint
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.2
+    hooks:
+      - id: ruff-check
+      - id: ruff-format

kolibri_server_setup.py

@@ -4,13 +4,11 @@
 import subprocess
 
 import kolibri.utils.pskolibri as psutil
-
-from kolibri.core.content.utils.paths import get_content_dir_path
 from kolibri.core.utils.cache import RedisSettingsHelper
 from kolibri.core.utils.cache import process_cache
-from kolibri.utils.options import update_options_file
-from kolibri.utils.conf import OPTIONS
 from kolibri.utils.conf import KOLIBRI_HOME
+from kolibri.utils.conf import OPTIONS
+from kolibri.utils.options import update_options_file
 
 # read the config file options
 port = OPTIONS["Deployment"]["HTTP_PORT"]
@@ -64,12 +62,14 @@ def set_port(port):
     """
     update_options_file("Deployment", "HTTP_PORT", port)
 
+
 def set_zip_content_port(port):
     """
     Modify Kolibri options to set the TCP port the hashi files will be served on
     """
     update_options_file("Deployment", "ZIP_CONTENT_PORT", port)
 
+
 def delete_redis_cache():
     """
     Delete previous cache in redis to reset it when the service starts.
@@ -141,7 +141,7 @@ def check_redis_service():
 
 def save_nginx_conf_port(port, zip_port, listen_address="0.0.0.0", nginx_conf=None):
     """
-     Adds the port for nginx to run to an existing config file.
+    Adds the port for nginx to run to an existing config file.
     """
 
     if nginx_conf is None:
@@ -210,9 +210,7 @@ def save_nginx_conf_port(port, zip_port, listen_address="0.0.0.0", nginx_conf=No
         help="Port to run hashi iframes used when installing/reconfiguring kolibri-server package",
     )
     args = parser.parse_args()
-    if (
-        args.debconfport
-    ):  # To be executed only when installing/reconfiguring the Debian package
+    if args.debconfport:  # To be executed only when installing/reconfiguring the Debian package
         set_port(args.debconfport)
         if args.debconfzipport:
             set_zip_content_port(args.debconfzipport)

pyproject.toml

@@ -0,0 +1,13 @@
+[tool.ruff]
+target-version = "py310"
+line-length = 120
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "PLC0415"]
+ignore = ["E501"]
+
+[tool.ruff.lint.isort]
+force-single-line = true
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = ["E501"]