Fix up CI (#363)

* Bump versions, get off lintlizard

* fix up typing

* ruff format

Author: nsaje

.github/workflows/release.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build_and_upload:
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-24.04'
     environment: production
     permissions:
       # id-token for the trusted publisher setup
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-python@v2
         name: Install Python
         with:
-          python-version: 3.10
+          python-version: 3.12
 
       - run: |
           pip install packaging

.github/workflows/test.yaml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         python-version: [ '3.10', '3.11', '3.12', '3.13' ]
     name: Lint ${{ matrix.python-version }}
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-24.04'
     container: python:${{ matrix.python-version }}
     steps:
       - name: Checkout code
@@ -22,16 +22,18 @@ jobs:
       - name: Lint code
         run: |
           pip install -c requirements.txt -r requirements-lint.txt
-          lintlizard --ci
+          mypy .
+          ruff check
+          ruff format
 
   # Run tests
   test:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        os: ['ubuntu-20.04']
+        os: ['ubuntu-24.04']
         redis-version: [4, 5, "6.2.6", "7.0.9"]
-        redis-py-version: [3.3.0, 4.6.0]
+        redis-py-version: [4.6.0, 6.1.0]
       # Do not cancel any jobs when a single job fails
       fail-fast: false
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with Redis ${{ matrix.redis-version }} and redis-py==${{ matrix.redis-py-version }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM circleci/python:3.10
+FROM python:3.12
 
 WORKDIR /src
 COPY requirements.txt .

pyproject.toml

@@ -1,20 +1,3 @@
-[tool.black]
-line-length = 79
-exclude = '''
-/(
-    \.git
-)/
-'''
-
-[tool.isort]
-skip = ['.git', 'venv']
-known_tests = 'tests'
-sections = ['FUTURE', 'STDLIB', 'THIRDPARTY', 'FIRSTPARTY', 'TESTS', 'LOCALFOLDER']
-default_section = 'THIRDPARTY'
-use_parentheses = true
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
-combine_as_imports = true
-line_length = 79
-float_to_top = true
+[tool.mypy]
+ignore_missing_imports = true
+follow_imports = "skip"

requirements-lint.txt

@@ -1,2 +1,3 @@
-lintlizard==0.26.0
+mypy==1.19.0
+ruff==0.14.7
 types-redis

requirements.txt

@@ -1,4 +1,4 @@
 click==8.1.7
-redis==4.5.2
+redis==6.1.0
 structlog==24.1.0
 croniter

scripts/redis_scan.py

@@ -4,6 +4,7 @@
 
 Can also set the TTL for keys to facilitate removing data.
 """
+
 import signal
 import sys
 import time

setup.py

@@ -4,7 +4,7 @@
 
 VERSION_FILE = "tasktiger/__init__.py"
 with open(VERSION_FILE, encoding="utf8") as fd:
-    version = re.search(r'__version__ = ([\'"])(.*?)\1', fd.read()).group(2)
+    version = re.search(r'__version__ = ([\'"])(.*?)\1', fd.read()).group(2)  # type: ignore
 
 with open("README.rst", encoding="utf-8") as file:
     long_description = file.read()

tasktiger/_internal.py

@@ -97,8 +97,7 @@ def serialize_func_name(func: Union[Callable, Type]) -> str:
     """
     if func.__module__ == "__main__":
         raise ValueError(
-            "Functions from the __main__ module cannot be processed by "
-            "workers."
+            "Functions from the __main__ module cannot be processed by workers."
         )
     try:
         # This will only work on Python 3.3 or above, but it will allow us to use static/classmethods
@@ -143,7 +142,7 @@ def serialize_retry_method(retry_method: Any) -> Tuple[str, Tuple]:
 
 
 def get_timestamp(
-    when: Optional[Union[datetime.timedelta, datetime.datetime]]
+    when: Optional[Union[datetime.timedelta, datetime.datetime]],
 ) -> Optional[float]:
     # convert timedelta to datetime
     if isinstance(when, datetime.timedelta):

tasktiger/executor.py

@@ -135,9 +135,7 @@ def execute_tasks(self, tasks: List[Task], log: BoundLogger) -> bool:
 
             hard_timeouts = self.worker.get_hard_timeouts(func, tasks)
 
-            with WorkerContextManagerStack(
-                self.config["CHILD_CONTEXT_MANAGERS"]
-            ):
+            with WorkerContextManagerStack(self.config["CHILD_CONTEXT_MANAGERS"]):
                 if is_batch_func:
                     # Batch process if the task supports it.
                     g["current_tasks"] = tasks
@@ -165,9 +163,7 @@ def execute_tasks(self, tasks: List[Task], log: BoundLogger) -> bool:
             execution["time_failed"] = time.time()
             if self.worker.store_tracebacks:
                 # Currently we only log failed task executions to Redis.
-                execution["traceback"] = "".join(
-                    traceback.format_exception(*exc_info)
-                )
+                execution["traceback"] = "".join(traceback.format_exception(*exc_info))
             execution["success"] = success
             execution["host"] = socket.gethostname()
 
@@ -360,9 +356,7 @@ def check_child_exit() -> Optional[int]:
                     execution = {
                         "time_started": time_started,
                         "time_failed": now,
-                        "exception_name": serialize_func_name(
-                            JobTimeoutException
-                        ),
+                        "exception_name": serialize_func_name(JobTimeoutException),
                         "success": False,
                         "host": socket.gethostname(),
                     }