diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f453e06..a947675 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,12 +4,12 @@ on: workflow_dispatch: inputs: requested_release_tag: - description: 'The tag to use for this release (e.g., `v2.3.0`)' + description: "The tag to use for this release (e.g., `v2.3.0`)" required: true 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.8 + python-version: 3.12 - run: | pip install packaging @@ -80,4 +80,4 @@ jobs: run: | python setup.py sdist - name: Upload to PyPI - uses: closeio/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9 + uses: closeio/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index dd5fa4f..8cc8db9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,9 +11,9 @@ jobs: lint: strategy: matrix: - python-version: [ '3.8', '3.9', '3.10', '3.11' ] + python-version: ["3.9", "3.10", "3.11", "3.12"] 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,16 @@ jobs: - name: Lint code run: | pip install -c requirements.txt -r requirements-lint.txt - lintlizard --ci + ruff check tasktiger tests # Run tests test: strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] - os: ['ubuntu-20.04'] + python-version: ["3.9", "3.10", "3.11", "3.12"] + 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: [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 }} diff --git a/Dockerfile b/Dockerfile index 5b08240..3fe061c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM circleci/python:3.8 +FROM python:3.12 WORKDIR /src COPY requirements.txt . diff --git a/docker-compose.yml b/docker-compose.yml index 05ac0f4..db6d0e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,8 @@ -version: "3.7" services: redis: image: redis:7.0.9 - expose: - - 6379 + ports: + - 127.0.0.1:6379:6379 tasktiger: build: context: . diff --git a/requirements-lint.txt b/requirements-lint.txt index b49ffbc..345a13c 100644 --- a/requirements-lint.txt +++ b/requirements-lint.txt @@ -1,2 +1,2 @@ -lintlizard==0.26.0 types-redis +ruff==0.11.11 diff --git a/requirements.txt b/requirements.txt index cd10926..d0c4fe8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ click==8.1.7 -redis==4.5.2 +redis==6.1.0 structlog==24.1.0 croniter