diff --git a/.circleci/config.yml b/.circleci/config.yml index 6500da58..e82f4129 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,8 +54,13 @@ jobs: name: Install HTML Tidy command: wget https://github.com/htacg/tidy-html5/releases/download/5.8.0/tidy-5.8.0-Linux-64bit.deb && sudo dpkg -i tidy-5.8.0-Linux-64bit.deb - run: *install-pipenv - - run: pipenv run pytest --cov-report=xml --cov=democracy_club + - run: pipenv run pipenv verify + - run: pipenv run python manage.py check - run: pipenv run python manage.py makemigrations --check + - run: pipenv run ruff check . + - run: pipenv run ruff format . --check + - run: pipenv run djhtml --check . + - run: pipenv run pytest --cov-report=xml --cov=democracy_club - codecov/upload: file: /home/circleci/repo/coverage.xml - store_artifacts: diff --git a/Pipfile b/Pipfile index 90a62041..e3c1862a 100644 --- a/Pipfile +++ b/Pipfile @@ -20,13 +20,15 @@ markdown-headdown = "==0.1.3" psycopg2-binary = "==2.9.9" sentry-sdk = "==1.45.0" sorl-thumbnail = "==12.10.0" -Django = "==4.2.11" Pillow = "==10.3.0" Markdown = "==3.3.7" feedparser = "==6.0.11" pytz = "==2024.1" urllib3 = "<3.0.0" pre-commit = "*" +django = "==4.2.15" +zipp = "*" +certifi = "*" [dev-packages] vcrpy = "==6.0.1" diff --git a/Pipfile.lock b/Pipfile.lock index 13a6c31f..33a1fbee 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "f5f04d420bf1ae7c87f8d083eea45762505db85daae98f223b95d1c4f9877b4c" + "sha256": "c4474f97f10e15f57803f376bd8ce59709a8417932247db7ec41470472fc0e47" }, "pipfile-spec": 6, "requires": { - "python_version": "3.10" + "python_version": "3.12" }, "sources": [ { @@ -109,11 +109,12 @@ }, "certifi": { "hashes": [ - "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f", - "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1" + "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b", + "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90" ], + "index": "pypi", "markers": "python_version >= '3.6'", - "version": "==2024.2.2" + "version": "==2024.7.4" }, "cfgv": { "hashes": [ @@ -261,11 +262,12 @@ }, "django": { "hashes": [ - "sha256:6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4", - "sha256:ddc24a0a8280a0430baa37aff11f28574720af05888c62b7cfe71d219f4599d3" + "sha256:61ee4a130efb8c451ef3467c67ca99fdce400fedd768634efc86a68c18d80d30", + "sha256:c77f926b81129493961e19c0e02188f8d07c112a1162df69bfab178ae447f94a" ], + "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==4.2.11" + "version": "==4.2.15" }, "django-cors-headers": { "hashes": [ @@ -971,11 +973,11 @@ }, "sqlparse": { "hashes": [ - "sha256:714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93", - "sha256:c204494cd97479d0e39f28c93d46c0b2d5959c7b9ab904762ea6c7af211c8663" + "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4", + "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e" ], "markers": "python_version >= '3.8'", - "version": "==0.5.0" + "version": "==0.5.1" }, "stack-data": { "hashes": [ @@ -1018,12 +1020,12 @@ }, "urllib3": { "hashes": [ - "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d", - "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19" + "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472", + "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==2.2.1" + "version": "==2.2.2" }, "virtualenv": { "hashes": [ @@ -1085,11 +1087,12 @@ }, "zipp": { "hashes": [ - "sha256:6278d9ddbcfb1f1089a88fde84481528b07b0e10474e09dcfe53dad4069fa059", - "sha256:dce197b859eb796242b0622af1b8beb0a722d52aa2f57133ead08edd5bf5374e" + "sha256:0145e43d89664cfe1a2e533adc75adafed82fe2da404b4bbb6b026c0157bdb31", + "sha256:58da6168be89f0be59beb194da1250516fdaa062ccebd30127ac65d30045e10d" ], + "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==3.18.2" + "version": "==3.20.0" } }, "develop": {