Skip to content

Commit

Permalink
Merge pull request #117 from maykinmedia/deps/python311
Browse files Browse the repository at this point in the history
use python3.11
  • Loading branch information
annashamray committed Jun 25, 2024
2 parents adcda60 + 9a42cd7 commit 4126518
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- uses: actions/setup-node@v4
with:
node-version: '18'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- uses: isort/isort-action@v1
with:
requirementsFiles: requirements/dev.txt
Expand All @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- name: Install dependencies
run: |
pip install -r requirements/dev.txt
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-bullseye AS build
FROM python:3.11-slim-bullseye AS build

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


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

# Stage 3.1 - Set up the needed production dependencies
# install all the dependencies for GeoDjango
Expand All @@ -50,7 +50,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
gdal-bin \
&& rm -rf /var/lib/apt/lists/*

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

# Stage 3.2 - Copy source code
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 or above
* `Python`_ 3.11 or above
* Python `Virtualenv`_ and `Pip`_
* `PostgreSQL`_ 12 or above
* `Node.js`_
Expand Down
2 changes: 1 addition & 1 deletion src/objecttypes/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def get_full_name(self):
"""
Returns the first_name plus the last_name, with a space in between.
"""
full_name = "%s %s" % (self.first_name, self.last_name)
full_name = "{} {}".format(self.first_name, self.last_name)
return full_name.strip()

def get_short_name(self):
Expand Down
3 changes: 1 addition & 2 deletions src/objecttypes/api/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.conf.urls import include
from django.urls import path
from django.urls import include, path

urlpatterns = [
path("v1", include("objecttypes.api.v1.urls", namespace="v1")),
Expand Down
3 changes: 1 addition & 2 deletions src/objecttypes/api/v1/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.conf.urls import include
from django.urls import path
from django.urls import include, path

from drf_spectacular.views import (
SpectacularJSONAPIView,
Expand Down
3 changes: 1 addition & 2 deletions src/objecttypes/api/v2/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.conf.urls import include
from django.urls import path
from django.urls import include, path

from drf_spectacular.views import (
SpectacularJSONAPIView,
Expand Down

0 comments on commit 4126518

Please sign in to comment.