Mod python_requires= >=3.11

Author: jstabenow

.flake8

@@ -0,0 +1,91 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  lint-and-unit:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.11", "3.12", "3.13"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: pip
+          cache-dependency-path: |
+            requirements.txt
+            requirements-dev.txt
+            setup.py
+            pyproject.toml
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements-dev.txt
+          pip install -e .
+
+      - name: Ruff
+        run: ruff check .
+
+      - name: Unit tests
+        run: pytest -q
+
+  integration:
+    runs-on: ubuntu-latest
+    needs: lint-and-unit
+
+    services:
+      core:
+        image: datarhei/core:latest
+        ports:
+          - 8080:8080
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: pip
+          cache-dependency-path: |
+            requirements.txt
+            requirements-dev.txt
+            setup.py
+            pyproject.toml
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements-dev.txt
+          pip install -e .
+
+      - name: Wait for Core
+        run: |
+          for i in {1..60}; do
+            if curl -fsS http://127.0.0.1:8080/api > /dev/null; then
+              exit 0
+            fi
+            sleep 1
+          done
+          echo "Core service not ready in time"
+          exit 1
+
+      - name: Integration tests (no cluster)
+        env:
+          RUN_INTEGRATION_TESTS: "1"
+          CORE_URL: "http://127.0.0.1:8080"
+        run: pytest -q tests

.github/workflows/ci.yml

@@ -17,13 +17,14 @@ repos:
         rev: 22.3.0
         hooks:
         -   id: black
-            args: ["--line-length=79"]
 
-    -   repo: https://github.com/pycqa/flake8
-        rev: 4.0.1
+    -   repo: local
         hooks:
-        -   id: flake8
-            args: ["--max-line-length=79", "--ignore=E203,E501,W503", "--exclude=.git,__pycache__,__init__.py,.mypy_cache,.pytest_cache"]
+        -   id: ruff
+            name: ruff
+            entry: ruff check
+            language: system
+            types: [python]
 
     -   repo: https://github.com/Lucas-C/pre-commit-hooks-bandit
         rev: v1.0.5
@@ -41,7 +42,7 @@ repos:
         rev: v2.29.0
         hooks:
         -   id: pyupgrade
-            args: [--py37-plus]
+            args: [--py311-plus]
     -   repo: https://github.com/jorisroovers/gitlint
         rev: v0.16.0
         hooks:

.pre-commit-config.yaml

@@ -18,6 +18,8 @@ Changelog
 -   Mod `process_config` model (scheduler, runtime_duration_seconds)
 -   Mod `v3_process_get_report` is now `v3_report_get_process_list`
 -   Fix `v3_process_put_command` model
+-   Drop Python `3.7`-`3.10` support, require Python `3.11+` (tested up to `3.13`)
+-   Add Ruff lint integration and replace Flake8 in pre-commit
 
 Breaking changes:
 - `v3_process_get_report` is now `v3_process_get_report_list`

CHANGELOG.md

@@ -28,4 +28,5 @@ release: dist
 	twine upload dist/*
 
 lint:
+	ruff check .
 	SKIP=no-commit-to-branch pre-commit run -a -v

Makefile

@@ -1,6 +1,6 @@
 # datarhei MediaCore Python Client
 For rapid development of Python applications around [datarhei Core](https://github.com/datarhei/core) / MediaCore.
-Requires Python 3.7+ and datarhei Core v16.10+.
+Requires Python 3.11+ and datarhei Core v16.10+.
 
 ---
 
@@ -830,7 +830,7 @@ $ CORE_URL=http://127.0.0.1:8080 \
 
 #### Docker
 ```sh
-$ docker build --build-arg PYTHON_VERSION=3.7 \
+$ docker build --build-arg PYTHON_VERSION=3.11 \
     -f tests/Dockerfile -t core_test .
 
 $ docker run -it --rm \
@@ -841,9 +841,10 @@ $ docker run -it --rm \
 ### Code checks
 
 ```sh
+$ ruff check .
 $ pre-commit run --all-files
 ```
-*Requires `pip install pre-commit`.*
+*Requires `pip install -r requirements-dev.txt`.*
 
 ## Changelog
 

README.md

@@ -1,10 +1,19 @@
 [tool.black]
 line-length = 110
-target-version = ['py310']
+target-version = ['py311']
 
 [tool.isort]
 profile = 'black'
 line_length = 110
 force_alphabetical_sort_within_sections = true
 sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
 default_section = "THIRDPARTY"
+
+[tool.ruff]
+line-length = 110
+target-version = "py311"
+exclude = [".git", "__pycache__", ".mypy_cache", ".pytest_cache"]
+
+[tool.ruff.lint]
+select = ["E", "F", "W"]
+ignore = ["E203", "E501", "F401", "F811", "W292", "W293"]

pyproject.toml

@@ -4,3 +4,4 @@ pre-commit
 pytest
 pytest-asyncio
 pytest-cov
+ruff

requirements-dev.txt

@@ -15,20 +15,18 @@
 
 setup(
     name="datarhei-mediacore-client",
-    version="2.0.0",
+    version="16.20.0",
     url="https://github.com/datarhei/core-client-python",
     description="datarhei MediaCore Python client",
     author="FOSS GmbH",
     author_email="support@datarhei.com",
     classifiers=[
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "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",
         "Topic :: datarhei Core Development :: Libraries",
     ],
+    python_requires=">=3.11",
     keywords="datarhei mediacore core rest client http httpx asyncio pydantic",
     packages=find_packages(exclude=["tests*"]),
     setup_requires=["pytest-runner"],

setup.py

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.7
+ARG PYTHON_VERSION=3.11
 
 FROM python:${PYTHON_VERSION}-alpine