From a23a5fa0284a853cea35cbb0eb8b1c20d9584d41 Mon Sep 17 00:00:00 2001 From: Sam Morgan Date: Fri, 5 Jan 2024 13:58:07 -0800 Subject: [PATCH] Add Django version to CI step and clean up old files --- .github/workflows/ci.yml | 10 +++++++- .travis.yml | 49 ---------------------------------------- MANIFEST.in | 4 ---- README.rst | 26 --------------------- 4 files changed, 9 insertions(+), 80 deletions(-) delete mode 100644 .travis.yml delete mode 100644 MANIFEST.in delete mode 100644 README.rst diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b56b18..11dd8b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,10 @@ name: CI on: [push, pull_request] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: get-python-versions: runs-on: ubuntu-latest @@ -47,5 +51,9 @@ jobs: if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: poetry install --with test --no-interaction --no-root - - name: Run Tests + - name: Get Django version + id: django-version + run: echo "version=$(poetry run django-admin --version)" >> $GITHUB_OUTPUT + + - name: Run Tests (Django ${{ steps.django-version.outputs.version }}) run: poetry run pytest diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1e728ae..0000000 --- a/.travis.yml +++ /dev/null @@ -1,49 +0,0 @@ -language: python - -dist: xenial - -python: - - '3.5' - - '3.6' - - '3.7' - - '3.8' - - 'pypy3' - -env: - - DJANGO="django>=2.2,<2.2.8" - - DJANGO="django>=2.2.8,<3.0" - - DJANGO="django>=3.0,<3.1" - - DJANGO="django>=3.1,<3.2" - - DJANGO="django>=3.2,<3.3" - - DJANGO="django>=4.0,<5.0" - -install: - - pip install ${DJANGO} - - pip install -e . - -before_script: - - cd easyaudit/tests - -script: - - python manage.py test - -matrix: - exclude: - - python: "3.5" - env: DJANGO="django>=3.0,<3.1" - - python: "3.5" - env: DJANGO="django>=3.1,<3.2" - - python: "3.5" - env: DJANGO="django>=3.2,<3.3" - - python: "3.8" - env: DJANGO="django>=2.0,<2.1" - - python: "3.8" - env: DJANGO="django>=2.1,<2.2" - - python: "3.8" - env: DJANGO="django>=2.2,<2.2.8" - - python: "3.5" - env: DJANGO="django>=4.0,<5.0" - - python: "3.6" - env: DJANGO="django>=4.0,<5.0" - - python: "3.7" - env: DJANGO="django>=4.0,<5.0" diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index be45339..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,4 +0,0 @@ -include LICENSE -include README.rst -recursive-include easyaudit/static * -recursive-include easyaudit/templates * diff --git a/README.rst b/README.rst deleted file mode 100644 index c77a501..0000000 --- a/README.rst +++ /dev/null @@ -1,26 +0,0 @@ -================= -django-easy-audit -================= - -Yet another Django audit log app, hopefully the simplest one. - -Quick start ------------ - -1. Add "easyaudit" to your INSTALLED_APPS setting like this:: - - INSTALLED_APPS = [ - ... - 'easyaudit', - ] - -2. Add django-easy-audit's middleware to your MIDDLEWARE (or MIDDLEWARE_CLASSES) setting like this:: - - MIDDLEWARE = ( - ... - 'easyaudit.middleware.easyaudit.EasyAuditMiddleware', - ) - -3. Run 'python manage.py migrate easyaudit' to create the audit models. - -4. That's it! Now every CRUD event on your whole project will be registered in the audit models, which you will be able to query from the Django admin app. Additionally, this app will also log all authentication events and all URLs requested.