Big update

vint21h · Feb 19, 2022 · c108a94 · c108a94
1 parent e6f714c
commit c108a94
Show file tree

Hide file tree

Showing 10 changed files with 197 additions and 168 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,122 +13,18 @@ on:
     branches:
       - "*"
   workflow_dispatch:
+  workflow_call:
 env:
   NAME: "mcadmin"
   DEFAULT_PYTHON_VERSION: "3.10"
 jobs:
+  check-requirements:
+    uses: "./.github/workflows/check-requirements.yml"
   check:
-    name: "${{ matrix.toxenv }}"
-    runs-on: "ubuntu-latest"
-    strategy:
-      matrix:
-        toxenv: ["check", "check-build"]
-    steps:
-      - name: "Git clone"
-        id: "git-clone"
-        uses: "actions/checkout@v2"
-      - name: "Set up Python ${{ env.DEFAULT_PYTHON_VERSION }}"
-        id: "set-up-python"
-        uses: "actions/setup-python@v2"
-        with:
-          python-version: "${{ env.DEFAULT_PYTHON_VERSION }}"
-      - name: "Pip cache"
-        id: "pip-cache"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.cache/pip"
-          key: "${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('setup.cfg') }}"
-          restore-keys: |
-            "${{ runner.os }}-pip-${{ matrix.toxenv }}-"
-            "${{ runner.os }}-pip-"
-      - name: "Pre-commit cache"
-        id: "pre-commit-cache"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.cache/pre-commit"
-          key: "${{ runner.os }}-pre-commit-${{ matrix.toxenv }}-${{ hashFiles('.pre-commit-config.yaml') }}"
-          restore-keys: |
-            "${{ runner.os }}-pre-commit-${{ matrix.toxenv }}-"
-            "${{ runner.os }}-pre-commit-"
-      - name: "Install requirements"
-        id: "install-requirements"
-        run: "make install"
-      - name: "Run ${{ matrix.toxenv }}"
-        id: "run"
-        run: "tox -e ${{ matrix.toxenv }}"
+    uses: "./.github/workflows/check.yml"
   test:
-    name: "${{ matrix.python-version }}"
-    runs-on: "ubuntu-latest"
-    if: success()
+    uses: "./.github/workflows/test.yml"
     needs: ["check"]
-    strategy:
-      matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
-    steps:
-      - name: "Git clone"
-        id: "git-clone"
-        uses: "actions/checkout@v2"
-      - name: "Set up Python ${{ matrix.python-version }}"
-        id: "set-up-python"
-        uses: "actions/setup-python@v2"
-        with:
-          python-version: "${{ matrix.python-version }}"
-      - name: "Pip cache"
-        id: "pip-cache"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.cache/pip"
-          key: "${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}"
-          restore-keys: |
-            "${{ runner.os }}-pip-${{ matrix.python-version }}-"
-            "${{ runner.os }}-pip-"
-      - name: "Temporarily save coverage statistics"
-        id: "temporarily-save-coverage-statistics"
-        uses: "actions/cache@v2"
-        with:
-          path: ".coverage"
-          key: ".coverage-${{ github.run_id }}-${{ github.run_number }}"
-      - name: "Install requirements"
-        id: "install-requirements"
-        run: "make install"
-      - name: "Run tests"
-        id: "run-tests"
-        env:
-          PLATFORM: "${{ matrix.platform }}"
-        run: "make tox"
   coveralls:
-    name: "coveralls"
-    runs-on: "ubuntu-latest"
-    if: success()
+    uses: "./.github/workflows/coveralls.yml"
     needs: ["test", "check"]
-    steps:
-      - name: "Git clone"
-        id: "git-clone"
-        uses: "actions/checkout@v2"
-      - name: "Set up Python ${{ env.DEFAULT_PYTHON_VERSION }}"
-        id: "set-up-python"
-        uses: "actions/setup-python@v2"
-        with:
-          python-version: "${{ env.DEFAULT_PYTHON_VERSION }}"
-      - name: "Pip cache"
-        id: "pip-cache"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.cache/pip"
-          key: "${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}"
-          restore-keys: |
-            "${{ runner.os }}-pip-"
-      - name: "Temporarily save coverage statistics"
-        id: "temporarily-save-coverage-statistics"
-        uses: "actions/cache@v2"
-        with:
-          path: ".coverage"
-          key: ".coverage-${{ github.run_id }}-${{ github.run_number }}"
-      - name: "Install requirements"
-        id: "install-requirements"
-        run: "make install"
-      - name: "Upload coverage report to Coveralls"
-        id: "upload-coverage-report-to-coveralls"
-        env:
-          COVERALLS_REPO_TOKEN: "${{ secrets.COVERALLS_REPO_TOKEN }}"
-        run: "make coveralls"
diff --git a/.github/workflows/check-requirements.yml b/.github/workflows/check-requirements.yml
@@ -4,17 +4,8 @@
 
 name: "check-requirements"
 on:
-  push:
-    branches:
-      - "*"
-    tags:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
-  schedule:
-    - cron: "0 3 * * *"
   workflow_dispatch:
+  workflow_call:
 env:
   DEFAULT_PYTHON_VERSION: "3.10"
 jobs:

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -0,0 +1,51 @@
+# django-mcadmin
+# .github/workflows/check.yml
+
+
+name: "check"
+on:
+  workflow_dispatch:
+  workflow_call:
+env:
+  NAME: "mcadmin"
+  DEFAULT_PYTHON_VERSION: "3.10"
+jobs:
+  check:
+    name: "${{ matrix.toxenv }}"
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        toxenv: ["check", "check-build"]
+    steps:
+      - name: "Git clone"
+        id: "git-clone"
+        uses: "actions/checkout@v2"
+      - name: "Set up Python ${{ env.DEFAULT_PYTHON_VERSION }}"
+        id: "set-up-python"
+        uses: "actions/setup-python@v2"
+        with:
+          python-version: "${{ env.DEFAULT_PYTHON_VERSION }}"
+      - name: "Pip cache"
+        id: "pip-cache"
+        uses: "actions/cache@v2"
+        with:
+          path: "~/.cache/pip"
+          key: "${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('setup.cfg') }}"
+          restore-keys: |
+            "${{ runner.os }}-pip-${{ matrix.toxenv }}-"
+            "${{ runner.os }}-pip-"
+      - name: "Pre-commit cache"
+        id: "pre-commit-cache"
+        uses: "actions/cache@v2"
+        with:
+          path: "~/.cache/pre-commit"
+          key: "${{ runner.os }}-pre-commit-${{ matrix.toxenv }}-${{ hashFiles('.pre-commit-config.yaml') }}"
+          restore-keys: |
+            "${{ runner.os }}-pre-commit-${{ matrix.toxenv }}-"
+            "${{ runner.os }}-pre-commit-"
+      - name: "Install requirements"
+        id: "install-requirements"
+        run: "make install"
+      - name: "Run ${{ matrix.toxenv }}"
+        id: "run"
+        run: "tox -e ${{ matrix.toxenv }}"
diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
@@ -0,0 +1,46 @@
+# django-mcadmin
+# .github/workflows/coveralls.yml
+
+
+name: "coveralls"
+on:
+  workflow_dispatch:
+  workflow_call:
+env:
+  NAME: "mcadmin"
+  DEFAULT_PYTHON_VERSION: "3.10"
+jobs:
+  coveralls:
+    name: "coveralls"
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Git clone"
+        id: "git-clone"
+        uses: "actions/checkout@v2"
+      - name: "Set up Python ${{ env.DEFAULT_PYTHON_VERSION }}"
+        id: "set-up-python"
+        uses: "actions/setup-python@v2"
+        with:
+          python-version: "${{ env.DEFAULT_PYTHON_VERSION }}"
+      - name: "Pip cache"
+        id: "pip-cache"
+        uses: "actions/cache@v2"
+        with:
+          path: "~/.cache/pip"
+          key: "${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}"
+          restore-keys: |
+            "${{ runner.os }}-pip-"
+      - name: "Temporarily save coverage statistics"
+        id: "temporarily-save-coverage-statistics"
+        uses: "actions/cache@v2"
+        with:
+          path: ".coverage"
+          key: ".coverage-${{ github.run_id }}-${{ github.run_number }}"
+      - name: "Install requirements"
+        id: "install-requirements"
+        run: "make install"
+      - name: "Upload coverage report to Coveralls"
+        id: "upload-coverage-report-to-coveralls"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        run: "coveralls --service=github"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,49 @@
+# django-mcadmin
+# .github/workflows/test.yml
+
+
+name: "test"
+on:
+  workflow_dispatch:
+  workflow_call:
+env:
+  NAME: "mcadmin"
+jobs:
+  test:
+    name: "${{ matrix.python-version }}"
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
+    steps:
+      - name: "Git clone"
+        id: "git-clone"
+        uses: "actions/checkout@v2"
+      - name: "Set up Python ${{ matrix.python-version }}"
+        id: "set-up-python"
+        uses: "actions/setup-python@v2"
+        with:
+          python-version: "${{ matrix.python-version }}"
+      - name: "Pip cache"
+        id: "pip-cache"
+        uses: "actions/cache@v2"
+        with:
+          path: "~/.cache/pip"
+          key: "${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}"
+          restore-keys: |
+            "${{ runner.os }}-pip-${{ matrix.python-version }}-"
+            "${{ runner.os }}-pip-"
+      - name: "Temporarily save coverage statistics"
+        id: "temporarily-save-coverage-statistics"
+        uses: "actions/cache@v2"
+        with:
+          path: ".coverage"
+          key: ".coverage-${{ github.run_id }}-${{ github.run_number }}"
+      - name: "Install requirements"
+        id: "install-requirements"
+        run: "make install"
+      - name: "Run tests"
+        id: "run-tests"
+        env:
+          PLATFORM: "${{ matrix.platform }}"
+        run: "make tox"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -132,7 +132,7 @@ repos:
       files: '\.env*'
       exclude: ".envrc"
 -   repo: "https://github.com/pre-commit/pre-commit-hooks"
-    rev: "v4.0.1"
+    rev: "v4.1.0"
     hooks:
       - id: "check-added-large-files"
       - id: "check-ast"

diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.10.0
+3.10.2
diff --git a/mcadmin/conf.py b/mcadmin/conf.py
@@ -21,7 +21,7 @@ class DjangoDjversionAppConf(AppConf):
     )
     UPLOADS_PATH: str = getattr(settings, "MCADMIN_UPLOADS_PATH", settings.MEDIA_ROOT)
     MODULE_NAME: str = getattr(settings, "MCADMIN_MODULE_NAME", "mcommands")
-    USE_PERMISSIONS: str = getattr(settings, "MCADMIN_USE_PERMISSIONS", False)
+    USE_PERMISSIONS: bool = getattr(settings, "MCADMIN_USE_PERMISSIONS", False)
 
     class Meta:
         """Config settings."""

diff --git a/mcadmin/views.py b/mcadmin/views.py
@@ -212,12 +212,12 @@ def filter_by_permissions(  # noqa: CFQ004,CCR001
                         Dict[str, Union[ManagementCommandAdmin, None]],
                     ] = {}
                     groups_permissions = (
-                        request.user.commands_groups_permissions.all()  # type: ignore
+                        request.user.commands_groups_permissions.all()
                         .values_list("group", flat=True)
                         .distinct()
                     )
                     commands_permissions = (
-                        request.user.commands_permissions.all()  # type: ignore
+                        request.user.commands_permissions.all()
                         .values_list("command__command", flat=True)
                         .distinct()
                     )