Merge tag 7.7.4

flake8 → .flake8

@@ -3,4 +3,4 @@ ignore = W801,E501,W605,W504,W606,W503,E203,E266
 max-line-length = 88
 max-complexity = 20
 select = B,C,E,F,W,T4
-exclude = ./.tox/*,./build/*,./docs/conf.py
+exclude = ./.tox/*,./build/*,./docs/conf.py,./.env

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+
+updates:
+  - package-ecosystem: pip
+    directory: "/"
+    schedule:
+      interval: monthly
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: monthly

.github/workflows/build.yml

@@ -1,36 +1,66 @@
 name: build
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+
+permissions:
+  checks: write # to create new checks (coverallsapp/github-action)
+
 jobs:
   build:
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+      checks: write # to create new checks (coverallsapp/github-action)
+
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         image-tag:
-          - 36
-          - 37
-          - 38
-          - 39
-    container: thumbororg/thumbor-test:${{ matrix.image-tag }}
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
     steps:
-      - uses: actions/checkout@v2
+      - uses: satackey/[email protected]
+        continue-on-error: true
+        with:
+          key: thumbor-docker-${{ matrix.image-tag }}-{hash}
+          restore-keys: |
+            thumbor-docker-${{ matrix.image-tag }}-
+      - uses: actions/checkout@v4
+      - name: Build test image
+        run: docker build -t test_image -f TestDockerfile --build-arg PYTHON_VERSION=${{ matrix.image-tag }} .
+      - name: Start test container
+        run: |
+          docker run -dt --name thumbor_test -v $(pwd):/app test_image
       - name: Fire up Redis
-        run: make redis
+        run: docker exec thumbor_test make redis
       - name: Setup
-        run: make setup
+        run: docker exec thumbor_test make setup
       - name: Compile Extensions
-        run: make compile_ext
+        run: docker exec thumbor_test make compile_ext
       - name: Run Unit Tests
-        run: make sequential-unit
+        run: docker exec thumbor_test make sequential-unit
       - name: Run Integration Tests
-        run: env ASYNC_TEST_TIMEOUT=30 make integration_run
+        run: docker exec -e ASYNC_TEST_TIMEOUT=30 thumbor_test make integration_run
       - name: Lint
-        if: matrix.image-tag == '39'
-        run: make flake pylint
+        run: docker exec thumbor_test make pylint
+      - name: Generate lcov
+        run: docker exec thumbor_test coverage lcov
       - name: Coveralls
-        if: matrix.image-tag == '39'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          pip install --upgrade coveralls
-          coveralls --service=github
+        uses: coverallsapp/[email protected]
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: coverage.lcov
+          flag-name: run-${{ matrix.image-tag }}
+          parallel: true
+  finish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/[email protected]
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,69 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '37 1 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    - run: |
+       make build
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

.github/workflows/lint.yml

@@ -0,0 +1,47 @@
+name: lint/formatter
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  black:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose"
+  flake8:
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+      checks: write # to update checks 
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - uses: actions/checkout@v4
+      - name: Install flake8
+        run: pip install flake8
+      - name: Run flake8
+        uses: suo/flake8-github-action@releases/v1
+        with:
+          checkName: 'flake8'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  isort:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - uses: actions/checkout@v4
+      - name: Install isort
+        run: pip install isort
+      - name: Run isort
+        run: isort thumbor tests --profile black
+