Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #28

Merged
merged 1 commit into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ insert_final_newline = true
[Makefile]
indent_style = tab

[{*.iml,*.xml, *.yml, *.yaml}]
[{*.iml,*.xml,*.yml,*.yaml}]
indent_size = 2

[*.csv]
Expand Down
7 changes: 5 additions & 2 deletions api/requirements-dev.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
pip-tools~=7.0.0
black~=23.7.0
# tool for managing python dependencies
pip-tools==7.3.0

# code formatter
black==23.9.1

-r requirements.txt
12 changes: 6 additions & 6 deletions api/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=requirements-dev.txt --resolver=backtracking requirements-dev.in
# pip-compile --output-file=requirements-dev.txt requirements-dev.in
#
asgiref==3.6.0
# via
Expand All @@ -18,7 +18,7 @@ azure-storage-blob==12.13.1
# via
# -r requirements.txt
# django-storages
black==23.7.0
black==23.9.1
# via -r requirements-dev.in
blessed==1.20.0
# via -r requirements.txt
Expand Down Expand Up @@ -69,7 +69,7 @@ defusedxml==0.7.1
# -r requirements.txt
# python3-openid
# social-auth-core
django==4.2.3
django==4.2.6
# via
# -r requirements.txt
# django-cors-headers
Expand Down Expand Up @@ -97,7 +97,7 @@ django-picklefield==3.1
# via
# -r requirements.txt
# django-q2
django-q2==1.5.4
django-q2==1.5.5
# via -r requirements.txt
django-rest-framework-tricks==0.2.14
# via -r requirements.txt
Expand Down Expand Up @@ -194,9 +194,9 @@ pathspec==0.9.0
# via black
pep517==0.13.0
# via build
pillow==10.0.0
pillow==10.0.1
# via -r requirements.txt
pip-tools==7.0.0
pip-tools==7.3.0
# via -r requirements-dev.in
platformdirs==2.5.2
# via black
Expand Down
7 changes: 3 additions & 4 deletions api/requirements.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
django~=4.2.3
django==4.2.6

django-q2~=1.5.4
django-q2==1.5.5
blessed~=1.20.0 # optional requirement for django-q2
psutil~=5.9.5 # optional requirement for django-q2
croniter~=1.3.15 # optional requirement for django-q2
Expand All @@ -12,7 +12,6 @@ django-filter~=23.2.0 #??
django-guardian~=2.4.0 #??
# django-jazzmin>~=2.6 # for deletion
django-sendgrid-v5~=1.2.2
django-storages~=1.13.2
django-storages[azure]~=1.13.2
djoser~=2.1.0

Expand All @@ -29,7 +28,7 @@ gunicorn~=20.1.0
inflection~=0.5.1
# ipython~=8.13 # for deletion
mailchimp3~=3.0.21
pillow~=10.0.0
pillow==10.0.1
psycopg2-binary~=2.9.6
pyYAML~=6.0.0
requests~=2.31.0
Expand Down
8 changes: 4 additions & 4 deletions api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=requirements.txt --resolver=backtracking requirements.in
# pip-compile --output-file=requirements.txt requirements.in
#
asgiref==3.6.0
# via
Expand Down Expand Up @@ -45,7 +45,7 @@ defusedxml==0.7.1
# via
# python3-openid
# social-auth-core
django==4.2.3
django==4.2.6
# via
# -r requirements.in
# django-cors-headers
Expand All @@ -71,7 +71,7 @@ django-guardian==2.4.0
# djangorestframework-guardian2
django-picklefield==3.1
# via django-q2
django-q2==1.5.4
django-q2==1.5.5
# via -r requirements.in
django-rest-framework-tricks==0.2.14
# via -r requirements.in
Expand Down Expand Up @@ -134,7 +134,7 @@ oauthlib==3.2.0
# social-auth-core
openpyxl==3.1.2
# via -r requirements.in
pillow==10.0.0
pillow==10.0.1
# via -r requirements.in
psutil==5.9.5
# via -r requirements.in
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ services:
- ./api/paul_api:/opt/paul_api/
restart: on-failure
ports:
- 8080:80
- ${PAUL_API_PORT:-8080}:80
depends_on:
- paul-db

paul-db:
hostname: paul-db
image: postgres:12
ports:
- 5434:5432
- ${PAUL_DB_PORT:-5434}:5432
env_file:
- .env
volumes:
Expand Down