diff --git a/.circleci/config.yml b/.circleci/config.yml index d37ba249..9c622a51 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,9 +27,7 @@ jobs: command: | . venv/bin/activate mkdir test-reports - TESTFILES=$(circleci tests glob "tests/**/*.py") - ENV_FILES=test,dev pytest ${TESTFILES} --cov=. --cov-config=.coveragerc --cov-report html --cov-report term --junitxml=test-reports/junit.xml - codecov + make pytest_codecov -- --codecov-token=${CODECOV_TOKEN} - run: mkdir -p workspace - run: echo "export TARGET_CIRCLE_BUILD_NUM=$CIRCLE_BUILD_NUM" >> workspace/new-env-vars - store_test_results: diff --git a/makefile b/makefile index 0d33ff98..b4f99a02 100644 --- a/makefile +++ b/makefile @@ -15,6 +15,15 @@ pytest: --cov=. \ $(ARGUMENTS) +pytest_codecov: + ENV_FILES='test,dev' \ + pytest \ + --junitxml=test-reports/junit.xml \ + --cov-config=.coveragerc \ + --cov-report=term \ + --cov=. \ + --codecov \ + $(ARGUMENTS) flake8: flake8 . \ diff --git a/requirements.in b/requirements.in index 619bb343..b094c862 100644 --- a/requirements.in +++ b/requirements.in @@ -18,8 +18,8 @@ html2text==2020.* wagtailmedia==0.* pytube==9.2.2 django-filter>=2.4.0 -django-redis==5.2.0 -celery[redis]==5.2.2 +django-redis +celery[redis] django-celery-beat==2.2.1 kombu==5.2.3 requests[security]==2.27.1 @@ -40,4 +40,4 @@ gevent==22.10.* psycogreen==1.0.2 wagtailmedia==0.5.0 cryptography==39.* -oauthlib==3.2.* +oauthlib==3.2.* \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 23f7f092..fcc815ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,11 +8,13 @@ amqp==5.1.1 # via kombu -anyascii==0.3.1 +anyascii==0.3.2 # via wagtail asgiref==3.6.0 # via django -attrs==22.2.0 +async-timeout==4.0.2 + # via redis +attrs==23.1.0 # via jsonschema beautifulsoup4==4.9.3 # via @@ -34,7 +36,7 @@ botocore==1.27.96 # s3transfer bump2version==1.0.1 # via wagtail-modeltranslation -celery[redis]==5.2.2 +celery[redis]==5.2.7 # via # -r requirements.in # django-celery-beat @@ -69,9 +71,9 @@ directory-constants==22.0.2 # via # -r requirements.in # directory-components -directory-healthcheck==3.0.2 +directory-healthcheck==3.0.4 # via -r requirements.in -dj-database-url==1.2.0 +dj-database-url==1.3.0 # via -r requirements.in django==3.2.18 # via @@ -127,7 +129,7 @@ django-taggit==1.5.1 # via wagtail django-timezone-field==4.2.3 # via django-celery-beat -django-treebeard==4.6.1 +django-treebeard==4.7 # via wagtail djangorestframework==3.14.0 # via @@ -158,7 +160,7 @@ html5lib==1.1 # via wagtail idna==3.4 # via requests -importlib-metadata==6.0.0 +importlib-metadata==6.4.1 # via # keyring # twine @@ -192,11 +194,11 @@ oauthlib==3.2.2 # via # -r requirements.in # requests-oauthlib -openpyxl==3.1.1 +openpyxl==3.1.2 # via tablib -packaging==23.0 +packaging==23.1 # via bleach -pillow==9.4.0 +pillow==9.5.0 # via wagtail pkginfo==1.9.6 # via twine @@ -204,13 +206,13 @@ prompt-toolkit==3.0.38 # via click-repl psycogreen==1.0.2 # via -r requirements.in -psycopg2==2.9.5 +psycopg2==2.9.6 # via -r requirements.in pycountry==19.8.18 # via -r requirements.in pycparser==2.21 # via cffi -pygments==2.14.0 +pygments==2.15.0 # via readme-renderer pyjwt==2.6.0 # via notifications-python-client @@ -224,7 +226,7 @@ python-dateutil==2.8.2 # python-crontab pytube==9.2.2 # via -r requirements.in -pytz==2022.7.1 +pytz==2023.3 # via # celery # django @@ -234,7 +236,7 @@ pytz==2022.7.1 # l18n readme-renderer==37.3 # via twine -redis==3.5.3 +redis==4.5.4 # via # celery # django-redis @@ -254,7 +256,7 @@ rfc3986==2.0.0 # via twine s3transfer==0.6.0 # via boto3 -sentry-sdk==1.16.0 +sentry-sdk==1.19.1 # via -r requirements.in sigauth==5.1.1 # via -r requirements.in @@ -270,11 +272,11 @@ six==1.16.0 # mohawk # python-dateutil # w3lib -soupsieve==2.4 +soupsieve==2.4.1 # via beautifulsoup4 -sqlparse==0.4.3 +sqlparse==0.4.4 # via django -tablib[xls,xlsx]==3.3.0 +tablib[xls,xlsx]==3.4.0 # via wagtail telepath==0.3 # via wagtail @@ -282,7 +284,9 @@ tqdm==4.65.0 # via twine twine==3.8.0 # via wagtail-modeltranslation -urllib3==1.26.14 +typing-extensions==4.5.0 + # via dj-database-url +urllib3==1.26.15 # via # -r requirements.in # botocore @@ -320,7 +324,7 @@ wrapt==1.15.0 # via elastic-apm xlrd==2.0.1 # via tablib -xlsxwriter==3.0.8 +xlsxwriter==3.1.0 # via wagtail xlwt==1.3.0 # via tablib @@ -328,7 +332,7 @@ zipp==3.15.0 # via importlib-metadata 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 a59d9c5d..e0fb70a9 100644 --- a/requirements_test.in +++ b/requirements_test.in @@ -12,4 +12,5 @@ factory-boy==2.* wagtail-factories==2.0.1 django-debug-toolbar==3.2.* pip-tools -codecov +pytest-codecov +GitPython diff --git a/requirements_test.txt b/requirements_test.txt index 4b3fb12f..cd68e9c0 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -8,14 +8,14 @@ amqp==5.1.1 # via kombu -anyascii==0.3.1 +anyascii==0.3.2 # via wagtail asgiref==3.6.0 # via django -attrs==22.2.0 - # via - # jsonschema - # pytest +async-timeout==4.0.2 + # via redis +attrs==23.1.0 + # via jsonschema beautifulsoup4==4.9.3 # via # directory-components @@ -38,7 +38,7 @@ build==0.10.0 # via pip-tools bump2version==1.0.1 # via wagtail-modeltranslation -celery[redis]==5.2.2 +celery[redis]==5.2.7 # via # -r requirements.in # django-celery-beat @@ -64,14 +64,12 @@ click-plugins==1.1.1 # via celery click-repl==0.2.0 # via celery -codecov==2.1.12 - # via -r requirements_test.in colorama==0.4.6 # via twine coverage[toml]==6.5.0 # via - # codecov # coveralls + # pytest-codecov # pytest-cov coveralls==3.3.1 # via -r requirements_test.in @@ -83,9 +81,9 @@ directory-constants==22.0.2 # via # -r requirements.in # directory-components -directory-healthcheck==3.0.2 +directory-healthcheck==3.0.4 # via -r requirements.in -dj-database-url==1.2.0 +dj-database-url==1.3.0 # via -r requirements.in django==3.2.18 # via @@ -144,7 +142,7 @@ django-taggit==1.5.1 # via wagtail django-timezone-field==4.2.3 # via django-celery-beat -django-treebeard==4.6.1 +django-treebeard==4.7 # via wagtail djangorestframework==3.14.0 # via @@ -164,13 +162,13 @@ elastic-apm==6.15.1 # via -r requirements.in et-xmlfile==1.1.0 # via openpyxl -exceptiongroup==1.1.0 +exceptiongroup==1.1.1 # via pytest factory-boy==2.12.0 # via # -r requirements_test.in # wagtail-factories -faker==17.6.0 +faker==18.4.0 # via factory-boy flake8==6.0.0 # via -r requirements_test.in @@ -178,6 +176,10 @@ freezegun==0.3.14 # 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 gevent gunicorn==20.1.0 @@ -188,7 +190,7 @@ html5lib==1.1 # via wagtail idna==3.4 # via requests -importlib-metadata==6.0.0 +importlib-metadata==6.4.1 # via # keyring # twine @@ -226,17 +228,17 @@ oauthlib==3.2.2 # via # -r requirements.in # requests-oauthlib -openpyxl==3.1.1 +openpyxl==3.1.2 # via tablib -packaging==23.0 +packaging==23.1 # via # bleach # build # pytest # pytest-sugar -pillow==9.4.0 +pillow==9.5.0 # via wagtail -pip-tools==6.12.3 +pip-tools==6.13.0 # via -r requirements_test.in pkginfo==1.9.6 # via twine @@ -246,7 +248,7 @@ prompt-toolkit==3.0.38 # via click-repl psycogreen==1.0.2 # via -r requirements.in -psycopg2==2.9.5 +psycopg2==2.9.6 # via -r requirements.in pycodestyle==2.10.0 # via flake8 @@ -256,7 +258,7 @@ pycparser==2.21 # via cffi pyflakes==3.0.1 # via flake8 -pygments==2.14.0 +pygments==2.15.0 # via readme-renderer pyjwt==2.6.0 # via notifications-python-client @@ -264,17 +266,22 @@ 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-sugar -pytest-cov==4.0.0 +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-sugar==0.9.6 +pytest-sugar==0.9.7 # via -r requirements_test.in python-crontab==2.7.1 # via django-celery-beat @@ -286,7 +293,7 @@ python-dateutil==2.8.2 # python-crontab pytube==9.2.2 # via -r requirements.in -pytz==2022.7.1 +pytz==2023.3 # via # celery # django @@ -296,16 +303,16 @@ pytz==2022.7.1 # l18n readme-renderer==37.3 # via twine -redis==3.5.3 +redis==4.5.4 # via # celery # django-redis requests[security]==2.27.1 # via # -r requirements.in - # codecov # coveralls # notifications-python-client + # pytest-codecov # requests-mock # requests-oauthlib # requests-toolbelt @@ -321,7 +328,7 @@ rfc3986==2.0.0 # via twine s3transfer==0.6.0 # via boto3 -sentry-sdk==1.16.0 +sentry-sdk==1.19.1 # via -r requirements.in sigauth==5.1.1 # via -r requirements.in @@ -339,13 +346,15 @@ six==1.16.0 # python-dateutil # requests-mock # w3lib -soupsieve==2.4 +smmap==5.0.0 + # via gitdb +soupsieve==2.4.1 # via beautifulsoup4 -sqlparse==0.4.3 +sqlparse==0.4.4 # via # django # django-debug-toolbar -tablib[xls,xlsx]==3.3.0 +tablib[xls,xlsx]==3.4.0 # via wagtail telepath==0.3 # via wagtail @@ -361,7 +370,9 @@ tqdm==4.65.0 # via twine twine==3.8.0 # via wagtail-modeltranslation -urllib3==1.26.14 +typing-extensions==4.5.0 + # via dj-database-url +urllib3==1.26.15 # via # -r requirements.in # botocore @@ -394,7 +405,7 @@ webencodings==0.5.1 # via # bleach # html5lib -wheel==0.38.4 +wheel==0.40.0 # via pip-tools whitenoise==6.4.0 # via -r requirements.in @@ -404,7 +415,7 @@ wrapt==1.15.0 # via elastic-apm xlrd==2.0.1 # via tablib -xlsxwriter==3.0.8 +xlsxwriter==3.1.0 # via wagtail xlwt==1.3.0 # via tablib @@ -412,7 +423,7 @@ zipp==3.15.0 # via importlib-metadata 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: