Merge branch 'master' into feat/prefetched-version-objects

django-cms · Jul 29, 2024 · a6ddadf · a6ddadf
2 parents 5427cc2 + 5bc66e5
commit a6ddadf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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:[email protected]/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://[email protected]/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
@@ -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
@@ -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
@@ -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
@@ -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