From 92400f1b9f33b63a7ad8b7d80efe31140f82098a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 20 Dec 2023 12:27:42 +0200 Subject: [PATCH 1/2] Use default coverage file locations --- .github/workflows/test.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82b9ac6a..7a9c7a18 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,9 +47,4 @@ jobs: - run: pip install -U tox tox-gh-actions django # TODO: postgres setup and proper djangomain testing - run: python -m tox - - run: | - mkdir /tmp/coverage - find .tox -type f -name 'coverage*xml' -exec mv '{}' /tmp/coverage ';' - uses: codecov/codecov-action@v3 - with: - directory: /tmp/coverage From b3b2db1b7b455321d1ddf551676851dcf1096016 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 20 Dec 2023 12:30:27 +0200 Subject: [PATCH 2/2] pytest: drop the dot --- docs/contributing.rst | 4 +--- tox.ini | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index b7fd3108..c114c468 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -13,7 +13,7 @@ We require features to be backed by a unit test. This way, we can test *django-polymorphic* against new Django versions. To run the included test suite, execute:: - py.test + pytest To test support for multiple Python and Django versions, run tox from the repository root:: @@ -24,8 +24,6 @@ The Python versions need to be installed at your system. On Linux, download the versions at http://www.python.org/download/releases/. On MacOS X, use Homebrew_ to install other Python versions. -We currently support Python 3.5, 3.6, 3.7, and 3.8. - Example project ---------------- diff --git a/tox.ini b/tox.ini index eedc0c46..12824577 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ deps = djangomain: https://github.com/django/django/archive/main.tar.gz postgres: psycopg2 commands = - py.test --cov --cov-report=term-missing --cov-report=xml . + pytest --cov --cov-report=term-missing --cov-report=xml . [testenv:docs] deps =