From 56c77bc8c474e445f442444e05c7377a20597a0e Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 18:11:24 +0200 Subject: [PATCH 01/15] bump version for release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2728657..2a38443 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ import os from setuptools import setup, find_packages -__version__ = '1.3' +__version__ = '1.4' HERE = os.path.dirname(__file__) From 5bbc400502b5705ba0f8c0eeaf35f64f53edc0b5 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 18:31:50 +0200 Subject: [PATCH 02/15] add dependabot and GHA --- .github/dependabot.yml | 6 +++++ .github/workflows/tests.yml | 46 +++++++++++++++++++++++++++++++++++++ .travis.yml | 23 ------------------- tox.ini | 41 --------------------------------- 4 files changed, 52 insertions(+), 64 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/tests.yml delete mode 100644 .travis.yml delete mode 100644 tox.ini diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..04fef77 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..b3b60bc --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,46 @@ +name: Tests + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + max-parallel: 4 + matrix: + python-version: ["3.11"] + + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install Dependencies + run: | + python -m pip install --upgrade pip wheel + pip install -r requirements-test.txt -e . + - name: Run Tests + run: | + coverage run nosetests + coverage report -m + coverage lcov + - name: Run Coveralls + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + path-to-lcov: coverage.lcov + - name: Run Flake8 + run: + flake8 --max-line-length=120 django12factor tests setup.py + - name: Run pep257 + run: + pep257 --ignore D200,D202,D203 django12factor + - name: Run mypy + run: + mypy --ignore-missing-imports --follow-imports=skip --disallow-untyped-calls --disallow-untyped-defs -p django12factor diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d94b08e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: python -python: - - "2.7" - - "3.4" - - "3.5" - - "3.6" - - "3.7" -sudo: required -dist: xenial -install: - - pip install tox -script: - - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then tox -e coverage,coverage-report,flake8,doc8,pep257; fi - - if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then tox -e coverage,coverage-report,flake8,doc8,pep257,mypy; fi -matrix: - fast_finish: true -notifications: - email: false - irc: - channels: - - "chat.freenode.net#django12factor" - skip_join: true - use_notice: true diff --git a/tox.ini b/tox.ini deleted file mode 100644 index b3c06a1..0000000 --- a/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -[tox] -envlist = - coverage, - coverage-report, - flake8, - doc8, - pep257 - - -[testenv] -envdir = {toxinidir}/.toxenv -deps = - -rrequirements-test.txt -commands = - coverage: coverage run {envdir}/bin/nosetests - coverage-report: coverage report - flake8: flake8 django12factor tests setup.py - doc8: doc8 README.rst - pep257: pep257 --ignore D200,D202,D203 django12factor - - -[testenv:mypy] -envdir = {toxinidir}/.toxenv -deps = - mypy - typing -setenv= - MYPYPATH=. -commands = - mypy: mypy --ignore-missing-imports --follow-imports=skip --disallow-untyped-calls --disallow-untyped-defs -p django12factor - - -[testenv:sphinx] -deps = - Sphinx -changedir = {toxinidir}/docs/ -whitelist_externals = - make -commands = - make html - make doctest coverage From ee7c3d6027501a8e160197d2d4d09516c96d55e4 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 18:58:19 +0200 Subject: [PATCH 03/15] bump test reqs --- requirements-test.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index 69290bb..104d51a 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,6 @@ -doc8==0.8.0 -coverage==4.5.2 -flake8==3.6.0 +doc8==1.1.1 +coverage==7.2.5 +flake8==6.0.0 nose==1.3.7 pep257==0.7.0 -pygments==2.3.1 +pygments==2.15.1 From 4e0558f11f8c89f8333310e2ea825b4168f7d6b6 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:11:39 +0200 Subject: [PATCH 04/15] run nose as a module --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b3b60bc..566e35b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | - coverage run nosetests + coverage run -m nose.core coverage report -m coverage lcov - name: Run Coveralls From 3fecf106f5a5914d538f608529d110a4e3d660be Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:13:32 +0200 Subject: [PATCH 05/15] give nose some tests --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 566e35b..a5ce2cd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | - coverage run -m nose.core + coverage run --source=django12factor -m nose.core coverage report -m coverage lcov - name: Run Coveralls From df221888af847ea6e8ab33e4aa15ae047674909d Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:30:01 +0200 Subject: [PATCH 06/15] tell nose where the tests are --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a5ce2cd..c372d33 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | - coverage run --source=django12factor -m nose.core + coverage run --source=django12factor -m nose.core -w django12factor/tests coverage report -m coverage lcov - name: Run Coveralls From 43abb74ed2508056cf0da49d19d5f8e2914dc01d Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:32:41 +0200 Subject: [PATCH 07/15] tell nose where the tests are --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c372d33..64305e8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | - coverage run --source=django12factor -m nose.core -w django12factor/tests + coverage run --source=django12factor -m nose.core -w tests coverage report -m coverage lcov - name: Run Coveralls From 1328b8cd12f3fe97a0a883ce4970d77eefebcdc7 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:39:44 +0200 Subject: [PATCH 08/15] tell nose where the tests are --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 64305e8..a5ce2cd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | - coverage run --source=django12factor -m nose.core -w tests + coverage run --source=django12factor -m nose.core coverage report -m coverage lcov - name: Run Coveralls From 4dbd720de6fa45debf2562a58677c9871a25a8c8 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:48:30 +0200 Subject: [PATCH 09/15] tell nose where the tests are --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a5ce2cd..cb0d4ee 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | - coverage run --source=django12factor -m nose.core + coverage run --source=django12factor -m nose.core -w "${{ github.workspace }}/tests" coverage report -m coverage lcov - name: Run Coveralls From 072e7479daf648d590e3314cb2f7e9dd9c7c3310 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:54:14 +0200 Subject: [PATCH 10/15] tell nose where the tests are try: one million --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cb0d4ee..e4cc8c7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | - coverage run --source=django12factor -m nose.core -w "${{ github.workspace }}/tests" + coverage run --source=django12factor -m nose.core -w "$CWD/tests" coverage report -m coverage lcov - name: Run Coveralls From 2917e934539f5db579fb53fb5e5e6b00e5442776 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:55:39 +0200 Subject: [PATCH 11/15] tell nose where the tests are try: one million and one --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e4cc8c7..90b39ae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | - coverage run --source=django12factor -m nose.core -w "$CWD/tests" + coverage run --source=django12factor -m nose.core -w "${{ github.workspace }}" coverage report -m coverage lcov - name: Run Coveralls From c7cb8279ad28126edad28c13d2d3f583f0e040e6 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 19:57:08 +0200 Subject: [PATCH 12/15] now I'm just trying random things --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 90b39ae..163e449 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,6 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | + ls -al coverage run --source=django12factor -m nose.core -w "${{ github.workspace }}" coverage report -m coverage lcov From 55cfd922cda397674e1b0ad080afe254beb5a60c Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 20:00:48 +0200 Subject: [PATCH 13/15] now I'm just trying random things --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 163e449..69c88ed 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,6 +27,7 @@ jobs: pip install -r requirements-test.txt -e . - name: Run Tests run: | + pwd ls -al coverage run --source=django12factor -m nose.core -w "${{ github.workspace }}" coverage report -m From cc79a487bf06ce41492db44176b5005e84271d1a Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 20:19:05 +0200 Subject: [PATCH 14/15] now I'm just trying random things --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 69c88ed..b6d5df4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,8 @@ jobs: run: | pwd ls -al - coverage run --source=django12factor -m nose.core -w "${{ github.workspace }}" + ls -al tests + coverage run --source=django12factor -m nose.core -w "${{ github.workspace }}/tests" coverage report -m coverage lcov - name: Run Coveralls From eae4b1fd990a87cbf9529838ad70cc56795d1927 Mon Sep 17 00:00:00 2001 From: Jonas Maurus Date: Wed, 10 May 2023 20:24:26 +0200 Subject: [PATCH 15/15] now I'm just trying random things --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b6d5df4..cb08fb3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,8 @@ jobs: pwd ls -al ls -al tests - coverage run --source=django12factor -m nose.core -w "${{ github.workspace }}/tests" + echo "coverage run --source=django12factor -m nose.core -w ${{ github.workspace }}/tests" + coverage run -m nose.core -w ${{ github.workspace }}/tests coverage report -m coverage lcov - name: Run Coveralls