From 5bc66e5bbff42e7ece33c6afe3c90251c3c6e929 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Mon, 29 Jul 2024 18:48:23 +0200 Subject: [PATCH] fix: Run tests without setup tools (#420) * Replace `setup.py test` in github actions * Update test requirements * Undo some unnecessary changes --- .github/workflows/test.yml | 10 +++++----- tests/requirements/dj32_cms41.txt | 2 +- tests/requirements/dj40_cms41.txt | 2 +- tests/requirements/dj41_cms41.txt | 2 +- tests/requirements/dj42_cms41.txt | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff49a8aa..f2d50066 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: python setup.py install - name: Run coverage - run: coverage run setup.py test + run: coverage run ./test_settings.py - name: Upload Coverage to Codecov uses: codecov/codecov-action@v4 @@ -78,7 +78,7 @@ jobs: python setup.py install - name: Run coverage - run: coverage run setup.py test + run: coverage run ./test_settings.py env: DATABASE_URL: postgres://postgres:postgres@127.0.0.1/postgres @@ -122,7 +122,7 @@ jobs: python setup.py install - name: Run coverage - run: coverage run setup.py test + run: coverage run ./test_settings.py env: DATABASE_URL: mysql://root@127.0.0.1/djangocms_test @@ -158,7 +158,7 @@ jobs: python setup.py install - name: Run coverage - run: coverage run setup.py test + run: coverage run ./test_settings.py - name: Upload Coverage to Codecov uses: codecov/codecov-action@v4 @@ -194,7 +194,7 @@ jobs: python setup.py install - name: Run coverage - run: coverage run setup.py test + run: coverage run ./test_settings.py - name: Upload Coverage to Codecov uses: codecov/codecov-action@v4 diff --git a/tests/requirements/dj32_cms41.txt b/tests/requirements/dj32_cms41.txt index 24060eaf..b81e33fd 100644 --- a/tests/requirements/dj32_cms41.txt +++ b/tests/requirements/dj32_cms41.txt @@ -1,6 +1,6 @@ -r requirements_base.txt -django-cms>=4.1.0rc2 +django-cms>=4.1,<4.2 Django>=3.2,<4.0 django-classy-tags diff --git a/tests/requirements/dj40_cms41.txt b/tests/requirements/dj40_cms41.txt index 7b1ccb33..08f469ca 100644 --- a/tests/requirements/dj40_cms41.txt +++ b/tests/requirements/dj40_cms41.txt @@ -1,6 +1,6 @@ -r requirements_base.txt -django-cms>=4.1.0rc2 +django-cms>=4.1,<4.2 Django>=4.0,<4.1 django-classy-tags diff --git a/tests/requirements/dj41_cms41.txt b/tests/requirements/dj41_cms41.txt index 5c1aa2b8..08e4d41b 100644 --- a/tests/requirements/dj41_cms41.txt +++ b/tests/requirements/dj41_cms41.txt @@ -1,6 +1,6 @@ -r requirements_base.txt -django-cms>=4.1.0rc2 +django-cms>=4.1,<4.2 Django>=4.1,<4.2 django-classy-tags diff --git a/tests/requirements/dj42_cms41.txt b/tests/requirements/dj42_cms41.txt index 1e78584a..3546934e 100644 --- a/tests/requirements/dj42_cms41.txt +++ b/tests/requirements/dj42_cms41.txt @@ -1,6 +1,6 @@ -r requirements_base.txt -django-cms>=4.1.0rc2 +django-cms>=4.1,<4.2 Django>=4.2,<5 django-classy-tags