Skip to content

Commit

Permalink
Update back-end settings
Browse files Browse the repository at this point in the history
  • Loading branch information
tudoramariei committed Mar 28, 2024
1 parent 0ebc658 commit 9462bdd
Show file tree
Hide file tree
Showing 17 changed files with 296 additions and 371 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@ jobs:
- name: Run tests
run: |
ENVIRONMENT=test DJANGO_SETTINGS_MODULE=seismic_site.settings.test ./backend/manage.py test
ENVIRONMENT=test DJANGO_SETTINGS_MODULE=seismic_site.test_settings ./backend/manage.py test
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,14 @@ bash: ## start a bash shell
requirements-build: ## run pip compile and add requirements from the *.in files
docker exec seismic_backend_dev sh -c " \
pip-compile --strip-extras --resolver=backtracking -o requirements.txt requirements.in && \
pip-compile --strip-extras --resolver=backtracking -o requirements-test.txt requirements-test.in && \
pip-compile --strip-extras --resolver=backtracking -o requirements-dev.txt requirements-dev.in \
"

requirements-update: ## run pip compile and rebuild the requirements files
docker exec seismic_backend_dev sh -c " \
pip-compile --strip-extras --resolver=backtracking -r -U -o requirements.txt requirements.in && \
pip-compile --strip-extras --resolver=backtracking -r -U -o requirements-test.txt requirements-test.in && \
pip-compile --strip-extras --resolver=backtracking -r -U -o requirements-dev.txt requirements-dev.in && \
chmod a+r requirements.txt && \
chmod a+r requirements-test.txt && \
chmod a+r requirements-dev.txt \
"

Expand Down
2 changes: 1 addition & 1 deletion backend/manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


def main():
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "seismic_site.settings.development")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "seismic_site.settings")
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
Expand Down
2 changes: 1 addition & 1 deletion backend/pytest.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[pytest]
DJANGO_SETTINGS_MODULE = seismic_site.settings.test
DJANGO_SETTINGS_MODULE = seismic_site.test_settings
ENVIRONMENT = test
4 changes: 2 additions & 2 deletions backend/requirements-dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ werkzeug~=3.0.1
# tests
pytest~=8.1.1
pytest-flake8~=1.1.1
pytest-cov~=4.1.0
pytest-cov~=5.0.0
pytest-django~=4.8.0
faker~=24.2.0
faker~=24.4.0
tqdm~=4.66.2

# utils
Expand Down
32 changes: 19 additions & 13 deletions backend/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --output-file=requirements-dev.txt --strip-extras requirements-dev.in
#
asgiref==3.7.2
asgiref==3.8.1
# via
# -r requirements.txt
# django
Expand All @@ -20,9 +20,11 @@ black==24.3.0
# via -r requirements-dev.in
blessed==1.20.0
# via -r requirements.txt
boto3==1.34.62
# via -r requirements.txt
botocore==1.34.62
boto3==1.34.72
# via
# -r requirements.txt
# django-ses
botocore==1.34.72
# via
# -r requirements.txt
# boto3
Expand All @@ -33,9 +35,9 @@ click==8.1.7
# via
# black
# pip-tools
coverage==7.4.3
coverage==7.4.4
# via pytest-cov
croniter==2.0.2
croniter==2.0.3
# via -r requirements.txt
decorator==5.1.1
# via ipython
Expand All @@ -61,6 +63,7 @@ django==4.2.11
# django-jquery
# django-picklefield
# django-q2
# django-ses
# django-storages
# djangorestframework
# drf-spectacular
Expand All @@ -74,7 +77,7 @@ django-extensions==3.2.3
# via -r requirements-dev.in
django-import-export==3.3.7
# via -r requirements.txt
django-jazzmin==2.6.0
django-jazzmin==2.6.1
# via -r requirements.txt
django-jquery==3.1.0
# via -r requirements.txt
Expand All @@ -84,6 +87,8 @@ django-picklefield==3.1
# django-q2
django-q2==1.6.2
# via -r requirements.txt
django-ses==3.5.2
# via -r requirements.txt
django-storages==1.14.2
# via -r requirements.txt
djangorestframework==3.14.0
Expand All @@ -98,7 +103,7 @@ et-xmlfile==1.1.0
# openpyxl
executing==2.0.1
# via stack-data
faker==24.2.0
faker==24.2.1
# via -r requirements-dev.in
flake8==7.0.0
# via pytest-flake8
Expand Down Expand Up @@ -200,7 +205,7 @@ pytest==8.1.1
# pytest-cov
# pytest-django
# pytest-flake8
pytest-cov==4.1.0
pytest-cov==5.0.0
# via -r requirements-dev.in
pytest-django==4.8.0
# via -r requirements-dev.in
Expand All @@ -216,13 +221,14 @@ pytz==2024.1
# via
# -r requirements.txt
# croniter
# django-ses
# djangorestframework
pyyaml==6.0.1
# via
# -r requirements.txt
# drf-spectacular
# tablib
referencing==0.33.0
referencing==0.34.0
# via
# -r requirements.txt
# jsonschema
Expand All @@ -232,9 +238,9 @@ rpds-py==0.18.0
# -r requirements.txt
# jsonschema
# referencing
ruff==0.3.2
ruff==0.3.4
# via -r requirements-dev.in
s3transfer==0.10.0
s3transfer==0.10.1
# via
# -r requirements.txt
# boto3
Expand Down Expand Up @@ -269,7 +275,7 @@ uritemplate==4.1.1
# via
# -r requirements.txt
# drf-spectacular
urllib3==2.0.7
urllib3==2.2.1
# via
# -r requirements.txt
# botocore
Expand Down
1 change: 0 additions & 1 deletion backend/requirements-test.in

This file was deleted.

204 changes: 0 additions & 204 deletions backend/requirements-test.txt

This file was deleted.

3 changes: 3 additions & 0 deletions backend/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ boto3~=1.34.62
pillow~=10.2.0
whitenoise~=6.6.0

# emails
django-ses~=3.5.2

# misc libraries
tablib~=3.5.0

Expand Down
Loading

0 comments on commit 9462bdd

Please sign in to comment.