diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d45d06b..cb8ee5fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,13 +91,7 @@ jobs: - name: Tests if: ${{ !cancelled() && steps.deps.conclusion == 'success' }} - run: | - coverage run ./runtests.py --parallel || ./runtests.py - SAMPLE_APP=1 coverage run ./runtests.py --parallel - # basic tests without allauth.socialaccount - NO_SOCIAL_APP=1 coverage run ./tests/manage.py test testapp.tests.test_admin.TestUsersAdmin --parallel - coverage combine - coverage xml + run: ./runtests env: SELENIUM_HEADLESS: 1 GECKO_LOG: 1 diff --git a/docs/developer/installation.rst b/docs/developer/installation.rst index eb9badb3..7bdb5741 100644 --- a/docs/developer/installation.rst +++ b/docs/developer/installation.rst @@ -65,8 +65,7 @@ Run tests with: .. code-block:: shell - # --parallel and --keepdb are optional but help to speed up the operation - ./runtests.py --parallel --keepdb + ./runtests Alternative Sources ------------------- diff --git a/requirements.txt b/requirements.txt index 65bb03ef..321d3dfd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -django-organizations~=2.5.0 +django-organizations>=2.5.0,<2.6.0 django-extensions>=3.2,<4.2 django-allauth[socialaccount]>=65.12.0,<65.13.0 -django-phonenumber-field~=8.1.0 -phonenumbers~=9.0.15 +django-phonenumber-field>=8.1.0,<8.2.0 +phonenumbers>=9.0.10,<9.1.0 openwisp-utils[rest,celery] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 packaging -django-sesame~=3.2.3 +django-sesame>=3.2.3,<3.3.0 diff --git a/runtests b/runtests new file mode 100755 index 00000000..a91dfd2b --- /dev/null +++ b/runtests @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +echo "Run standard tests" +coverage run ./runtests.py --parallel + +echo "Test extensibility" +SAMPLE_APP=1 coverage run ./runtests.py --parallel + +echo "Run basic tests without allauth.socialaccount" +NO_SOCIAL_APP=1 coverage run ./tests/manage.py test testapp.tests.test_admin.TestUsersAdmin --parallel + +coverage combine +coverage xml