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

➕ Replace dependencies with open-api-framework deps #160

Closed
wants to merge 6 commits into from
Closed
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '3.10'
python-version: '3.11'
- uses: actions/setup-node@v2-beta
with:
node-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build:
- libxmlsec1-openssl
- wget
tools:
python: '3.10'
python: '3.11'

python:
install:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1 - Compile needed python dependencies
FROM python:3.10-slim-bookworm AS build
FROM python:3.11-slim-bookworm AS build

RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
pkg-config \
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN npm run build


# Stage 3 - Build docker image suitable for execution and deployment
FROM python:3.10-slim-bookworm AS production
FROM python:3.11-slim-bookworm AS production

# Stage 3.1 - Set up the needed production dependencies
# install all the dependencies for GeoDjango
Expand Down Expand Up @@ -65,7 +65,7 @@ RUN mkdir /app/log /app/config /app/media /app/private-media
VOLUME ["/app/log", "/app/media", "/app/private-media"]

# copy backend build deps
COPY --from=build /usr/local/lib/python3.10 /usr/local/lib/python3.10
COPY --from=build /usr/local/lib/python3.11 /usr/local/lib/python3.11
COPY --from=build /usr/local/bin/uwsgi /usr/local/bin/uwsgi
COPY --from=build /usr/local/bin/celery /usr/local/bin/celery

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Prerequisites

You need the following libraries and/or programs:

* `Python`_ 3.10
* `Python`_ 3.11
* Python `Virtualenv`_ and `Pip`_
* `PostgreSQL`_ 11 or above
* `Node.js`_
Expand Down
52 changes: 1 addition & 51 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,51 +1 @@
# Core python libraries
celery
click<8.1.0 # click>=8.1.0 causes issues with black https://github.com/psf/black/issues/2964
jq
jsonschema
markdown # used to render some markdown in code to html
psycopg2
python-dateutil
python-dotenv # environment variables for secrets
python-decouple # processing of envvar configs
requests
requests-cache
zgw-consumers
self-certifi
bleach

# Framework libraries
django~=3.2.23
django-axes
django-cors-headers
django-db-logger
django-extra-views
django-log-outgoing-requests
django-markup
django-redis
django-rosetta
django-sniplates
mozilla-django-oidc-db

# Admin and UI libraries
django-admin-index
django-sniplates
django-jsonform

# API libraries
djangorestframework
djangorestframework-inclusions
drf-spectacular

commonground-api-common
gemma-zds-client<2.0.0 # lots of breaking changes in 2.0.0
zgw-consumers>=0.25.0 # newest with simple cert manager

# task queue
celery

# WSGI servers & monitoring - production oriented
uwsgi
sentry_sdk # error monitoring sentry
flower # task monitoring
elastic-apm # Elastic APM integration
open-api-framework
Loading
Loading