Skip to content

Commit

Permalink
Merge pull request #407 from open-craft/tecoholic/BB-8440-deployment-…
Browse files Browse the repository at this point in the history
…fixes

build: fixes for native deployment
  • Loading branch information
pwnage101 authored Feb 15, 2024
2 parents 0fd6467 + 5233038 commit 60e810c
Show file tree
Hide file tree
Showing 10 changed files with 85 additions and 68 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ validation_requirements: ## sync to requirements for testing & code quality chec
doc_requirements:
pip-sync -q requirements/doc.txt

production-requirements: ## install requirements for production
production-requirements: piptools ## install requirements for production
pip-sync -q requirements/production.txt

static: ## generate static files
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ edx-rest-api-client
jsonfield2
mysqlclient
openedx-events
pygments
pymemcache
pytz
redis
Expand Down
17 changes: 10 additions & 7 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ django-filter==23.5
# via -r requirements/base.in
django-log-request-id==2.1.0
# via -r requirements/base.in
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# edx-celeryutils
# edx-rbac
Expand Down Expand Up @@ -156,6 +156,7 @@ edx-django-utils==5.10.1
# -r requirements/base.in
# edx-drf-extensions
# edx-rest-api-client
# openedx-events
edx-drf-extensions==10.2.0
# via
# -r requirements/base.in
Expand All @@ -172,7 +173,7 @@ edx-rest-api-client==5.6.1
# via
# -r requirements/base.in
# edx-enterprise-subsidy-client
fastavro==1.9.3
fastavro==1.9.4
# via
# -r requirements/base.in
# openedx-events
Expand Down Expand Up @@ -204,7 +205,7 @@ markupsafe==2.1.5
# via jinja2
monotonic==1.6
# via analytics-python
mysqlclient==2.2.3
mysqlclient==2.2.4
# via -r requirements/base.in
newrelic==9.6.0
# via edx-django-utils
Expand All @@ -214,7 +215,7 @@ oauthlib==3.2.2
# social-auth-core
openapi-codec==1.3.2
# via django-rest-swagger
openedx-events==9.4.0
openedx-events==9.5.1
# via -r requirements/base.in
packaging==23.2
# via drf-yasg
Expand All @@ -230,6 +231,8 @@ psutil==5.9.8
# via edx-django-utils
pycparser==2.21
# via cffi
pygments==2.17.2
# via -r requirements/base.in
pyjwt[crypto]==2.8.0
# via
# drf-jwt
Expand Down Expand Up @@ -277,7 +280,7 @@ requests==2.31.0
# social-auth-core
requests-oauthlib==1.3.1
# via social-auth-core
rpds-py==0.17.1
rpds-py==0.18.0
# via
# jsonschema
# referencing
Expand All @@ -298,7 +301,7 @@ slumber==0.7.1
# via edx-rest-api-client
social-auth-app-django==5.4.0
# via edx-auth-backends
social-auth-core==4.5.2
social-auth-core==4.5.3
# via
# edx-auth-backends
# social-auth-app-django
Expand All @@ -314,7 +317,7 @@ typing-extensions==4.9.0
# drf-spectacular
# edx-opaque-keys
# kombu
tzdata==2023.4
tzdata==2024.1
# via
# backports-zoneinfo
# celery
Expand Down
23 changes: 12 additions & 11 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ django-filter==23.5
# via -r requirements/validation.txt
django-log-request-id==2.1.0
# via -r requirements/validation.txt
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# -r requirements/validation.txt
# edx-celeryutils
Expand Down Expand Up @@ -253,6 +253,7 @@ edx-django-utils==5.10.1
# -r requirements/validation.txt
# edx-drf-extensions
# edx-rest-api-client
# openedx-events
edx-drf-extensions==10.2.0
# via
# -r requirements/validation.txt
Expand Down Expand Up @@ -281,11 +282,11 @@ exceptiongroup==1.2.0
# pytest
factory-boy==3.3.0
# via -r requirements/validation.txt
faker==22.7.0
faker==23.2.0
# via
# -r requirements/validation.txt
# factory-boy
fastavro==1.9.3
fastavro==1.9.4
# via
# -r requirements/validation.txt
# openedx-events
Expand Down Expand Up @@ -328,7 +329,7 @@ itypes==1.2.0
# via
# -r requirements/validation.txt
# coreapi
jaraco-classes==3.3.0
jaraco-classes==3.3.1
# via
# -r requirements/validation.txt
# keyring
Expand Down Expand Up @@ -391,7 +392,7 @@ more-itertools==10.2.0
# via
# -r requirements/validation.txt
# jaraco-classes
mysqlclient==2.2.3
mysqlclient==2.2.4
# via -r requirements/validation.txt
newrelic==9.6.0
# via
Expand All @@ -410,7 +411,7 @@ openapi-codec==1.3.2
# via
# -r requirements/validation.txt
# django-rest-swagger
openedx-events==9.4.0
openedx-events==9.5.1
# via -r requirements/validation.txt
packaging==23.2
# via
Expand Down Expand Up @@ -539,7 +540,7 @@ python-dateutil==2.8.2
# analytics-python
# celery
# faker
python-slugify==8.0.3
python-slugify==8.0.4
# via
# -r requirements/validation.txt
# code-annotations
Expand Down Expand Up @@ -599,7 +600,7 @@ rich==13.7.0
# via
# -r requirements/validation.txt
# twine
rpds-py==0.17.1
rpds-py==0.18.0
# via
# -r requirements/validation.txt
# jsonschema
Expand Down Expand Up @@ -639,7 +640,7 @@ social-auth-app-django==5.4.0
# via
# -r requirements/validation.txt
# edx-auth-backends
social-auth-core==4.5.2
social-auth-core==4.5.3
# via
# -r requirements/validation.txt
# edx-auth-backends
Expand Down Expand Up @@ -677,7 +678,7 @@ tomlkit==0.12.3
# pylint
tox==4.12.1
# via -r requirements/validation.txt
twine==4.0.2
twine==5.0.0
# via -r requirements/validation.txt
typing-extensions==4.9.0
# via
Expand All @@ -690,7 +691,7 @@ typing-extensions==4.9.0
# kombu
# pylint
# rich
tzdata==2023.4
tzdata==2024.1
# via
# -r requirements/validation.txt
# backports-zoneinfo
Expand Down
20 changes: 11 additions & 9 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ django-filter==23.5
# via -r requirements/test.txt
django-log-request-id==2.1.0
# via -r requirements/test.txt
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# -r requirements/test.txt
# edx-celeryutils
Expand Down Expand Up @@ -254,6 +254,7 @@ edx-django-utils==5.10.1
# -r requirements/test.txt
# edx-drf-extensions
# edx-rest-api-client
# openedx-events
edx-drf-extensions==10.2.0
# via
# -r requirements/test.txt
Expand All @@ -280,11 +281,11 @@ exceptiongroup==1.2.0
# pytest
factory-boy==3.3.0
# via -r requirements/test.txt
faker==22.7.0
faker==23.2.0
# via
# -r requirements/test.txt
# factory-boy
fastavro==1.9.3
fastavro==1.9.4
# via
# -r requirements/test.txt
# openedx-events
Expand Down Expand Up @@ -359,7 +360,7 @@ monotonic==1.6
# via
# -r requirements/test.txt
# analytics-python
mysqlclient==2.2.3
mysqlclient==2.2.4
# via -r requirements/test.txt
newrelic==9.6.0
# via
Expand All @@ -376,7 +377,7 @@ openapi-codec==1.3.2
# via
# -r requirements/test.txt
# django-rest-swagger
openedx-events==9.4.0
openedx-events==9.5.1
# via -r requirements/test.txt
packaging==23.2
# via
Expand Down Expand Up @@ -426,6 +427,7 @@ pydata-sphinx-theme==0.14.4
# via sphinx-book-theme
pygments==2.17.2
# via
# -r requirements/test.txt
# accessible-pygments
# doc8
# pydata-sphinx-theme
Expand Down Expand Up @@ -489,7 +491,7 @@ python-dateutil==2.8.2
# analytics-python
# celery
# faker
python-slugify==8.0.3
python-slugify==8.0.4
# via
# -r requirements/test.txt
# code-annotations
Expand Down Expand Up @@ -536,7 +538,7 @@ requests-oauthlib==1.3.1
# social-auth-core
restructuredtext-lint==1.4.0
# via doc8
rpds-py==0.17.1
rpds-py==0.18.0
# via
# -r requirements/test.txt
# jsonschema
Expand Down Expand Up @@ -570,7 +572,7 @@ social-auth-app-django==5.4.0
# via
# -r requirements/test.txt
# edx-auth-backends
social-auth-core==4.5.2
social-auth-core==4.5.3
# via
# -r requirements/test.txt
# edx-auth-backends
Expand Down Expand Up @@ -637,7 +639,7 @@ typing-extensions==4.9.0
# kombu
# pydata-sphinx-theme
# pylint
tzdata==2023.4
tzdata==2024.1
# via
# -r requirements/test.txt
# backports-zoneinfo
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.42.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.0.3
setuptools==69.1.0
# via -r requirements/pip.in
19 changes: 11 additions & 8 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ django-filter==23.5
# via -r requirements/base.txt
django-log-request-id==2.1.0
# via -r requirements/base.txt
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# -r requirements/base.txt
# edx-celeryutils
Expand Down Expand Up @@ -190,6 +190,7 @@ edx-django-utils==5.10.1
# -r requirements/base.txt
# edx-drf-extensions
# edx-rest-api-client
# openedx-events
edx-drf-extensions==10.2.0
# via
# -r requirements/base.txt
Expand All @@ -208,11 +209,11 @@ edx-rest-api-client==5.6.1
# via
# -r requirements/base.txt
# edx-enterprise-subsidy-client
fastavro==1.9.3
fastavro==1.9.4
# via
# -r requirements/base.txt
# openedx-events
gevent==23.9.1
gevent==24.2.1
# via -r requirements/production.in
greenlet==3.0.3
# via gevent
Expand Down Expand Up @@ -266,7 +267,7 @@ monotonic==1.6
# via
# -r requirements/base.txt
# analytics-python
mysqlclient==2.2.3
mysqlclient==2.2.4
# via
# -r requirements/base.txt
# -r requirements/production.in
Expand All @@ -283,7 +284,7 @@ openapi-codec==1.3.2
# via
# -r requirements/base.txt
# django-rest-swagger
openedx-events==9.4.0
openedx-events==9.5.1
# via -r requirements/base.txt
packaging==23.2
# via
Expand Down Expand Up @@ -314,6 +315,8 @@ pycparser==2.21
# via
# -r requirements/base.txt
# cffi
pygments==2.17.2
# via -r requirements/base.txt
pyjwt[crypto]==2.8.0
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -377,7 +380,7 @@ requests-oauthlib==1.3.1
# via
# -r requirements/base.txt
# social-auth-core
rpds-py==0.17.1
rpds-py==0.18.0
# via
# -r requirements/base.txt
# jsonschema
Expand Down Expand Up @@ -408,7 +411,7 @@ social-auth-app-django==5.4.0
# via
# -r requirements/base.txt
# edx-auth-backends
social-auth-core==4.5.2
social-auth-core==4.5.3
# via
# -r requirements/base.txt
# edx-auth-backends
Expand All @@ -429,7 +432,7 @@ typing-extensions==4.9.0
# drf-spectacular
# edx-opaque-keys
# kombu
tzdata==2023.4
tzdata==2024.1
# via
# -r requirements/base.txt
# backports-zoneinfo
Expand Down
Loading

0 comments on commit 60e810c

Please sign in to comment.