Merge 169ff04 into 9114744

.flake8

@@ -0,0 +1,6 @@
+[flake8]
+ignore = W801,E501,W605,W504,W606,W503,E203,E266,W1505
+max-line-length = 88
+max-complexity = 20
+select = B,C,E,F,W,T4
+exclude = ./.tox/*,./build/*,./docs/conf.py,./.env,./.venv

.github/codeql/codeql-config.yml

@@ -0,0 +1,8 @@
+name: "thumbor-aws CodeQL config"
+
+paths:
+  - remotecv
+  - tests
+paths-ignore:
+  - .venv
+  - usr/lib

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,45 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '26 1 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: APT Update
+      run: sudo apt-get update -y
+    - name: APT Install
+      run: sudo apt-get install -y libjpeg-dev python3-opencv
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+        setup-python-dependencies: false
+
+    - name: Install remotecv
+      run: make setup
+
+    - name: Set CodeQL python
+      run: echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+---
+name: release
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        id: setup-python
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.10'
+      - name: Install dependencies
+        run: |
+          pip install -U pip
+          pip install wheel
+      - name: Build package
+        run: python setup.py sdist bdist_wheel
+      - name: Publish a Python distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.5.0
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          skip_existing: true

.github/workflows/stale.yml

@@ -0,0 +1,30 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '* */6 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v4
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove the stale label or add a comment, or this issue will be closed in 5 days. You can always re-open if you still feel this is still an issue. Tag @heynemann for more information.'
+          stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove the stale label or add a comment, or this PR will be closed in 10 days. You can always re-open if you feel this is something we should still keep working on. Tag @heynemann for more information.'
+          close-issue-message: 'This issue was closed because it has been stale for 5 days with no activity.'
+          close-pr-message: 'This PR was closed because it has been stale for 10 days with no activity.'
+          days-before-issue-stale: 30
+          days-before-pr-stale: 45
+          days-before-issue-close: 5
+          days-before-pr-close: 10
+          exempt-draft-pr: true
+          operations-per-run: 1000

.github/workflows/unittest.yaml

@@ -1,3 +1,4 @@
+---
 name: unittest
 on:
   push:
@@ -6,18 +7,51 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
-    name: Python ${{ matrix.python-version }}
+        python-version:
+          - '3.7'
+          - '3.8'
+          - '3.9'
+          - '3.10'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        id: setup-python
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: x64
-      - name: Install apt dependencies
-        run: sudo apt update && sudo apt install -y libjpeg-dev python3-opencv
-      - name: Install pip dependencies
+      - name: APT Update
+        run: sudo apt-get update -y
+      - name: APT Install
+        run: sudo apt-get install -y libjpeg-dev python3-opencv
+      - name: Install remotecv
         run: make setup
-      - run: make test
+      - name: Start Redis
+        run: make run-redis
+      - name: Run Unit Tests
+        run: make unit
+        env:
+          # Only used for satisfying boto
+          AWS_ACCESS_KEY_ID: foobar
+          AWS_SECRET_ACCESS_KEY: foobar
+      - name: Lint
+        run: make flake pylint
+      - name: Generate lcov
+        run: make coverage
+      - name: Coveralls
+        uses: coverallsapp/github-action@1.1.3
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: coverage.lcov
+          flag-name: run-${{ matrix.python-version }}
+          parallel: true
+  finish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      uses: coverallsapp/github-action@1.1.3
+      with:
+        github-token: ${{ secrets.github_token }}
+        parallel-finished: true

.gitignore

@@ -14,3 +14,6 @@ tests/visual_test/build
 build
 *.so
 .ropeproject/
+coverage.lcov
+.env/
+.venv/

Makefile

@@ -11,8 +11,12 @@ test: run-redis unit stop-redis
 unit:
 	@pytest --cov=remotecv --cov-report term-missing --asyncio-mode=strict -r tests/
 
+coverage:
+	@coverage report -m --fail-under=52
+	@coverage lcov
+
 flake:
-	@flake8 --config flake8
+	@flake8 --config .flake8
 
 pylint:
 	@pylint remotecv tests

pylintrc

@@ -25,4 +25,12 @@ disable=
       broad-except,
       too-many-locals,
       too-many-public-methods,
-      fixme
+      fixme,
+      R0801,
+      R0915,
+      C0103,
+      E0110,
+      R1732,
+      W1505,
+      protected-access
+

pyproject.toml

@@ -0,0 +1,4 @@
+[tool.black]
+line-length = 79
+target-version = ['py37']
+include = '\.pyi?$'

remotecv/healthcheck.py

@@ -1,7 +1,8 @@
 from http.server import BaseHTTPRequestHandler
 
+
 class HealthCheckHandler(BaseHTTPRequestHandler):
-    
+
     def do_GET(self):
         self.send_response(200)
         self.send_header("Cache-Control", "no-cache")

setup.cfg

@@ -4,10 +4,3 @@ include_trailing_comma=True
 force_grid_wrap=0
 use_parentheses=True
 line_length=88
-
-[flake8]
-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

setup.py

@@ -4,14 +4,15 @@
 
 TESTS_REQUIREMENTS = [
     "celery==4.*,>=4.4.1",
-    "flake8==3.*,>=3.7.9",
-    "pylint==2.*,>=2.4.4",
+    "flake8==4.*,>=4.0.1",
+    "pylint==2.*,>=2.13.8",
     "black==22.*,>=22.1.0",
     "preggy==1.*,>=1.4.4",
     "pyssim==0.*,>=0.4",
     "pytest==7.*,>=7.0.0",
     "pytest-cov==3.*,>=3.0.0",
     "pytest-asyncio==0.*,>=0.18.0",
+    "coverage==6.*,>=6.3.2",
 ]
 
 RUNTIME_REQUIREMENTS = [

tests/test_redis.py

@@ -74,7 +74,7 @@ def test_should_return_none(self):
         config.redis_mode = None
 
         with self.assertRaises(AttributeError) as err:
-            client = redis_client()
+            redis_client()
 
         expect(str(err.exception)).to_equal(
             "redis-mode must be either single_node or sentinel"