From 811ac32b9aa1bc6fa5707a93080014fa48e8e04f Mon Sep 17 00:00:00 2001 From: Christopher Bailey Date: Thu, 15 Sep 2022 13:41:42 -0400 Subject: [PATCH] Replaces pytest-sugar with pytest-rich --- .github/workflows/ci.yml | 5 +++-- pyproject.toml | 2 +- reqs/dj3.2-requirements.txt | 12 +++++++----- reqs/dj4.0-requirements.txt | 12 +++++++----- reqs/dj4.1-requirements.txt | 12 +++++++----- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b223f17..e6087ad4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,10 +42,11 @@ jobs: - name: Test with pytest run: | export PYTHONPATH=$GITHUB_WORKSPACE - pytest --force-sugar --ignore=tests/test_zconstance.py + pytest --rich --ignore=tests/test_zconstance.py if [[ "${{ matrix.django }}" == "${{ env.DEFAULT_DJANGO }}" ]]; then - pytest --force-sugar tests/test_zconstance.py + pytest --rich tests/test_zconstance.py fi + coverage report -m - name: Publish Code Coverage uses: paambaati/codeclimate-action@v2.7.5 diff --git a/pyproject.toml b/pyproject.toml index 8f308422..361fef3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ dev = [ "pyproject-flake8", "pytest-cov", "pytest-django", - "pytest-sugar", + "pytest-rich", "pytest", "sphinx", ] diff --git a/reqs/dj3.2-requirements.txt b/reqs/dj3.2-requirements.txt index f3b29451..a4ccfbd3 100644 --- a/reqs/dj3.2-requirements.txt +++ b/reqs/dj3.2-requirements.txt @@ -36,6 +36,8 @@ click==8.1.3 # via # black # pip-tools +commonmark==0.9.1 + # via rich coverage[toml]==6.4.4 # via # django-microsoft-auth (pyproject.toml) @@ -114,7 +116,6 @@ packaging==21.3 # via # build # pytest - # pytest-sugar # sphinx parso==0.8.3 # via jedi @@ -155,6 +156,7 @@ pygments==2.13.0 # doc8 # furo # ipython + # rich # sphinx pyjwt[crypto]==2.4.0 # via django-microsoft-auth (pyproject.toml) @@ -167,12 +169,12 @@ pytest==7.1.3 # django-microsoft-auth (pyproject.toml) # pytest-cov # pytest-django - # pytest-sugar + # pytest-rich pytest-cov==3.0.0 # via django-microsoft-auth (pyproject.toml) pytest-django==4.5.2 # via django-microsoft-auth (pyproject.toml) -pytest-sugar==0.9.5 +pytest-rich==0.1.1 # via django-microsoft-auth (pyproject.toml) pytz==2022.2.1 # via @@ -190,6 +192,8 @@ requests-oauthlib==1.3.1 # via django-microsoft-auth (pyproject.toml) restructuredtext-lint==1.4.0 # via doc8 +rich==12.5.1 + # via pytest-rich six==1.16.0 # via asttokens smmap==5.0.0 @@ -225,8 +229,6 @@ stevedore==4.0.0 # via # bandit # doc8 -termcolor==2.0.1 - # via pytest-sugar tomli==2.0.1 # via # black diff --git a/reqs/dj4.0-requirements.txt b/reqs/dj4.0-requirements.txt index 05d98f29..a3e9f5eb 100644 --- a/reqs/dj4.0-requirements.txt +++ b/reqs/dj4.0-requirements.txt @@ -36,6 +36,8 @@ click==8.1.3 # via # black # pip-tools +commonmark==0.9.1 + # via rich coverage[toml]==6.4.4 # via # django-microsoft-auth (pyproject.toml) @@ -114,7 +116,6 @@ packaging==21.3 # via # build # pytest - # pytest-sugar # sphinx parso==0.8.3 # via jedi @@ -155,6 +156,7 @@ pygments==2.13.0 # doc8 # furo # ipython + # rich # sphinx pyjwt[crypto]==2.4.0 # via django-microsoft-auth (pyproject.toml) @@ -167,12 +169,12 @@ pytest==7.1.3 # django-microsoft-auth (pyproject.toml) # pytest-cov # pytest-django - # pytest-sugar + # pytest-rich pytest-cov==3.0.0 # via django-microsoft-auth (pyproject.toml) pytest-django==4.5.2 # via django-microsoft-auth (pyproject.toml) -pytest-sugar==0.9.5 +pytest-rich==0.1.1 # via django-microsoft-auth (pyproject.toml) pytz==2022.2.1 # via babel @@ -188,6 +190,8 @@ requests-oauthlib==1.3.1 # via django-microsoft-auth (pyproject.toml) restructuredtext-lint==1.4.0 # via doc8 +rich==12.5.1 + # via pytest-rich six==1.16.0 # via asttokens smmap==5.0.0 @@ -223,8 +227,6 @@ stevedore==4.0.0 # via # bandit # doc8 -termcolor==2.0.1 - # via pytest-sugar tomli==2.0.1 # via # black diff --git a/reqs/dj4.1-requirements.txt b/reqs/dj4.1-requirements.txt index 9d27ac53..775cd31e 100644 --- a/reqs/dj4.1-requirements.txt +++ b/reqs/dj4.1-requirements.txt @@ -36,6 +36,8 @@ click==8.1.3 # via # black # pip-tools +commonmark==0.9.1 + # via rich coverage[toml]==6.4.4 # via # django-microsoft-auth (pyproject.toml) @@ -114,7 +116,6 @@ packaging==21.3 # via # build # pytest - # pytest-sugar # sphinx parso==0.8.3 # via jedi @@ -155,6 +156,7 @@ pygments==2.13.0 # doc8 # furo # ipython + # rich # sphinx pyjwt[crypto]==2.4.0 # via django-microsoft-auth (pyproject.toml) @@ -167,12 +169,12 @@ pytest==7.1.3 # django-microsoft-auth (pyproject.toml) # pytest-cov # pytest-django - # pytest-sugar + # pytest-rich pytest-cov==3.0.0 # via django-microsoft-auth (pyproject.toml) pytest-django==4.5.2 # via django-microsoft-auth (pyproject.toml) -pytest-sugar==0.9.5 +pytest-rich==0.1.1 # via django-microsoft-auth (pyproject.toml) pytz==2022.2.1 # via babel @@ -188,6 +190,8 @@ requests-oauthlib==1.3.1 # via django-microsoft-auth (pyproject.toml) restructuredtext-lint==1.4.0 # via doc8 +rich==12.5.1 + # via pytest-rich six==1.16.0 # via asttokens smmap==5.0.0 @@ -223,8 +227,6 @@ stevedore==4.0.0 # via # bandit # doc8 -termcolor==2.0.1 - # via pytest-sugar tomli==2.0.1 # via # black