diff --git a/.circleci/config.yml b/.circleci/config.yml index 29df6b17..98322e48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,8 +25,7 @@ jobs: name: Run tests command: | . venv/bin/activate - make pytest -- --cov=. --cov-config=.coveragerc --cov-report=html - codecov + make pytest_codecov -- --codecov-token=${CODECOV_TOKEN} test_javascript: docker: diff --git a/makefile b/makefile index 437089ed..7b806c62 100644 --- a/makefile +++ b/makefile @@ -30,4 +30,14 @@ secrets: else echo "conf/env/secrets-do-not-commit already exists. Delete first to recreate it."; \ fi +pytest_codecov: + ENV_FILES='secrets-do-not-commit,test,dev' \ + pytest \ + --junitxml=test-reports/junit.xml \ + --cov-config=.coveragerc \ + --cov-report=term \ + --cov=. \ + --codecov \ + $(ARGUMENTS) + .PHONY: clean pytest manage webserver requirements install_requirements secrets diff --git a/requirements.txt b/requirements.txt index faffa914..933135fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,9 +8,9 @@ asgiref==3.6.0 # via django async-timeout==4.0.2 # via redis -attrs==22.2.0 +attrs==23.1.0 # via jsonschema -beautifulsoup4==4.11.2 +beautifulsoup4==4.12.2 # via directory-components boto3==1.17.90 # via -r requirements.in @@ -27,7 +27,7 @@ cffi==1.15.1 # via cryptography chardet==4.0.0 # via requests -cryptography==39.0.2 +cryptography==40.0.2 # via # -r requirements.in # pyopenssl @@ -46,7 +46,7 @@ directory-cms-client==12.0.0 # via -r requirements.in directory-components==39.0.2 # via -r requirements.in -directory-constants==23.0.0 +directory-constants==23.0.2 # via directory-components directory-forms-api-client==7.1.0 # via -r requirements.in @@ -114,7 +114,7 @@ monotonic==1.6 # via directory-client-core olefile==0.46 # via directory-validators -pillow==9.4.0 +pillow==9.5.0 # via directory-validators pir-client==1.1.0 # via -r requirements.in @@ -124,7 +124,7 @@ psycopg2==2.9.5 # via -r requirements.in pycparser==2.21 # via cffi -pyopenssl==23.0.0 +pyopenssl==23.1.1 # via requests pyrsistent==0.19.3 # via jsonschema @@ -163,15 +163,15 @@ six==1.16.0 # python-dateutil sorl-thumbnail==12.9.0 # via -r requirements.in -soupsieve==2.4 +soupsieve==2.4.1 # via beautifulsoup4 -sqlparse==0.4.3 +sqlparse==0.4.4 # via django -tzdata==2022.7 +tzdata==2023.3 # via pytz-deprecation-shim -tzlocal==4.2 +tzlocal==4.3 # via dateparser -urllib3==1.26.14 +urllib3==1.26.15 # via # -r requirements.in # botocore @@ -187,7 +187,7 @@ whitenoise==6.2.0 # via -r requirements.in zope-event==4.6 # via gevent -zope-interface==5.5.2 +zope-interface==6.0 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements_test.in b/requirements_test.in index 3991d545..16ecd587 100644 --- a/requirements_test.in +++ b/requirements_test.in @@ -2,13 +2,14 @@ pip-tools pytest>=4.4.0<5.0.0 -pytest-cov==2.7.1 pytest-django>=3.5.1<4.0.0 pytest-sugar pytest-xdist==1.29.0 flake8 requests_mock freezegun -codecov==2.1.9 +pytest-cov py>=1.10.0 Pillow>=8.2.0 +pytest-codecov +GitPython diff --git a/requirements_test.txt b/requirements_test.txt index 5acec590..eb6cc2d4 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -8,11 +8,9 @@ asgiref==3.6.0 # via django async-timeout==4.0.2 # via redis -attrs==22.2.0 - # via - # jsonschema - # pytest -beautifulsoup4==4.11.2 +attrs==23.1.0 + # via jsonschema +beautifulsoup4==4.12.2 # via directory-components boto3==1.17.90 # via -r requirements.in @@ -33,13 +31,11 @@ chardet==4.0.0 # via requests click==8.1.3 # via pip-tools -codecov==2.1.9 - # via -r requirements_test.in -coverage==7.2.1 +coverage[toml]==7.2.3 # via - # codecov + # pytest-codecov # pytest-cov -cryptography==39.0.2 +cryptography==40.0.2 # via # -r requirements.in # pyopenssl @@ -58,7 +54,7 @@ directory-cms-client==12.0.0 # via -r requirements.in directory-components==39.0.2 # via -r requirements.in -directory-constants==23.0.0 +directory-constants==23.0.2 # via directory-components directory-forms-api-client==7.1.0 # via -r requirements.in @@ -104,7 +100,7 @@ djangorestframework==3.11.2 # sigauth elastic-apm==6.1.3 # via -r requirements.in -exceptiongroup==1.1.0 +exceptiongroup==1.1.1 # via pytest execnet==1.9.0 # via pytest-xdist @@ -114,6 +110,10 @@ freezegun==1.2.2 # via -r requirements_test.in gevent==22.10.2 # via -r requirements.in +gitdb==4.0.10 + # via gitpython +gitpython==3.1.31 + # via -r requirements_test.in greenlet==2.0.2 # via # -r requirements.in @@ -138,16 +138,16 @@ monotonic==1.6 # via directory-client-core olefile==0.46 # via directory-validators -packaging==23.0 +packaging==23.1 # via # build # pytest # pytest-sugar -pillow==9.4.0 +pillow==9.5.0 # via # -r requirements_test.in # directory-validators -pip-tools==6.12.3 +pip-tools==6.13.0 # via -r requirements_test.in pir-client==1.1.0 # via -r requirements.in @@ -167,27 +167,32 @@ pycparser==2.21 # via cffi pyflakes==3.0.1 # via flake8 -pyopenssl==23.0.0 +pyopenssl==23.1.1 # via requests pyproject-hooks==1.0.0 # via build pyrsistent==0.19.3 # via jsonschema -pytest==7.2.2 +pytest==7.3.1 # via # -r requirements_test.in + # pytest-codecov # pytest-cov # pytest-django # pytest-forked # pytest-sugar # pytest-xdist -pytest-cov==2.7.1 +pytest-codecov==0.5.1 # via -r requirements_test.in +pytest-cov==4.0.0 + # via + # -r requirements_test.in + # pytest-codecov pytest-django==4.5.2 # via -r requirements_test.in pytest-forked==1.6.0 # via pytest-xdist -pytest-sugar==0.9.6 +pytest-sugar==0.9.7 # via -r requirements_test.in pytest-xdist==1.29.0 # via -r requirements_test.in @@ -212,9 +217,9 @@ regex==2022.1.18 requests[security]==2.25.1 # via # -r requirements.in - # codecov # directory-api-client # directory-client-core + # pytest-codecov # requests-mock requests-mock==1.10.0 # via -r requirements_test.in @@ -231,24 +236,27 @@ six==1.16.0 # pytest-xdist # python-dateutil # requests-mock +smmap==5.0.0 + # via gitdb sorl-thumbnail==12.9.0 # via -r requirements.in -soupsieve==2.4 +soupsieve==2.4.1 # via beautifulsoup4 -sqlparse==0.4.3 +sqlparse==0.4.4 # via django -termcolor==2.2.0 +termcolor==2.3.0 # via pytest-sugar tomli==2.0.1 # via # build + # coverage # pyproject-hooks # pytest -tzdata==2022.7 +tzdata==2023.3 # via pytz-deprecation-shim -tzlocal==4.2 +tzlocal==4.3 # via dateparser -urllib3==1.26.14 +urllib3==1.26.15 # via # -r requirements.in # botocore @@ -260,13 +268,13 @@ w3lib==2.1.1 # via directory-client-core waitress==2.1.2 # via -r requirements.in -wheel==0.38.4 +wheel==0.40.0 # via pip-tools whitenoise==6.2.0 # via -r requirements.in zope-event==4.6 # via gevent -zope-interface==5.5.2 +zope-interface==6.0 # via gevent # The following packages are considered to be unsafe in a requirements file: