update to python3.12

2025-02-09 19:47:10 +02:00
parent 8fc3ee534d
commit f0a5b6e8e7
8 changed files with 1151 additions and 944 deletions
@@ -1,188 +1,188 @@
 stages:
-    - setup
-    - audit
-    - lint
-    - test
-    - publish
-    - deploy
-    - cleanup
+  - setup
+  - audit
+  - lint
+  - test
+  - publish
+  - deploy
+  - cleanup

 install:
-    image: node:14
-    stage: setup
-    only:
-        - pushes
-    script:
-        - npm ci
-    artifacts:
-        paths:
-            - node_modules
-        expire_in: 1 week
+  image: node:14
+  stage: setup
+  only:
+    - pushes
+  script:
+    - npm ci
+  artifacts:
+    paths:
+      - node_modules
+    expire_in: 1 week

 audit:
-    image: python:3.9
-    stage: audit
-    only:
-        - pushes
-    needs: []
-    before_script:
-        - pip install poetry==1.3.1
-        - poetry config virtualenvs.create false
-        - poetry install --no-interaction --no-ansi
-    script:
-        - safety check
+  image: python:3.12.9
+  stage: audit
+  only:
+    - pushes
+  needs: []
+  before_script:
+    - pip install poetry==2.0.1
+    - poetry config virtualenvs.create false
+    - poetry install --no-interaction --no-ansi
+  script:
+    - safety check

 test:
-    image: python:3.9
-    stage: test
-    only:
-        - pushes
-    needs: []
-    services:
-        - postgres:12
-    variables:
-        POSTGRES_DB: ci
-        POSTGRES_USER: postgres
-        POSTGRES_PASSWORD: postgres
-        DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
-        DB_HOST: postgres
-    before_script:
-        - pip install poetry==1.3.1
-        - poetry config virtualenvs.create false
-        - poetry install --no-interaction --no-ansi
-    script:
-        - python manage.py migrate --noinput
-        - python manage.py createdefaultadmin
-        - python manage.py test
+  image: python:3.12.9
+  stage: test
+  only:
+    - pushes
+  needs: []
+  services:
+    - postgres:12
+  variables:
+    POSTGRES_DB: ci
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: postgres
+    DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
+    DB_HOST: postgres
+  before_script:
+    - pip install poetry==2.0.1
+    - poetry config virtualenvs.create false
+    - poetry install --no-interaction --no-ansi
+  script:
+    - python manage.py migrate --noinput
+    - python manage.py createdefaultadmin
+    - python manage.py test

 lint:py:
-    image: python:3.9
-    stage: lint
-    only:
-        - pushes
-    needs: []
-    script:
-        - pip install black==22.3.0
-        - black --check .
+  image: python:3.12.9
+  stage: lint
+  only:
+    - pushes
+  needs: []
+  script:
+    - pip install black==22.3.0
+    - black --check .

 lint:js:
-    image: node:14
-    stage: lint
-    only:
-        - pushes
-    needs: ["install"]
-    script:
-        - npm run lint:js
+  image: node:14
+  stage: lint
+  only:
+    - pushes
+  needs: ["install"]
+  script:
+    - npm run lint:js

 lint:md:
-    image: node:14
-    stage: lint
-    only:
-        - pushes
-    needs: ["install"]
-    script:
-        - npm run lint:md
+  image: node:14
+  stage: lint
+  only:
+    - pushes
+  needs: ["install"]
+  script:
+    - npm run lint:md

 publish:
-    image: docker:25-cli
-    stage: publish
-    needs: ["test", "lint:py", "lint:js", "lint:md"]
-    services:
-        - docker:25-dind
-    only:
-        - develop
-        - master
-    script:
-        - docker info
-        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-        - docker build . -t "$IMAGE_NAME"
-        - docker push "$IMAGE_NAME"
+  image: docker:25-cli
+  stage: publish
+  needs: ["test", "lint:py", "lint:js", "lint:md"]
+  services:
+    - docker:25-dind
+  only:
+    - develop
+    - master
+  script:
+    - docker info
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build . -t "$IMAGE_NAME"
+    - docker push "$IMAGE_NAME"

 deploy:dev:
-    image: docker:25-cli
-    stage: deploy
-    only:
-        - develop
-    environment:
-        name: dev
-        url: http://api.dev.sahkoinsinoorikilta.fi
-    variables:
-        DOCKER_HOST: $DEV_CI_DOCKER_HOST
-        DOCKER_TLS_VERIFY: 1
-    before_script:
-        - mkdir -p ~/.docker
-        - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
-        - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
-        - echo "$DEV_TLSKEY" > ~/.docker/key.pem
-        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    script:
-        - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME"
-    after_script:
-        - docker logout "$CI_REGISTRY"
+  image: docker:25-cli
+  stage: deploy
+  only:
+    - develop
+  environment:
+    name: dev
+    url: http://api.dev.sahkoinsinoorikilta.fi
+  variables:
+    DOCKER_HOST: $DEV_CI_DOCKER_HOST
+    DOCKER_TLS_VERIFY: 1
+  before_script:
+    - mkdir -p ~/.docker
+    - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
+    - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
+    - echo "$DEV_TLSKEY" > ~/.docker/key.pem
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  script:
+    - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME"
+  after_script:
+    - docker logout "$CI_REGISTRY"

 deploy:production:
-    stage: deploy
-    image: docker:25-cli
-    only:
-        - master
-    environment:
-        name: production
-        url: https://api.sahkoinsinoorikilta.fi
-    when: manual
-    variables:
-        DOCKER_HOST: $CI_DOCKER_HOST
-        DOCKER_TLS_VERIFY: 1
-    before_script:
-        - mkdir -p ~/.docker
-        - echo "$TLSCACERT" > ~/.docker/ca.pem
-        - echo "$TLSCERT" > ~/.docker/cert.pem
-        - echo "$TLSKEY" > ~/.docker/key.pem
-        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    script:
-        - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME"
-    after_script:
-        - docker logout "$CI_REGISTRY"
+  stage: deploy
+  image: docker:25-cli
+  only:
+    - master
+  environment:
+    name: production
+    url: https://api.sahkoinsinoorikilta.fi
+  when: manual
+  variables:
+    DOCKER_HOST: $CI_DOCKER_HOST
+    DOCKER_TLS_VERIFY: 1
+  before_script:
+    - mkdir -p ~/.docker
+    - echo "$TLSCACERT" > ~/.docker/ca.pem
+    - echo "$TLSCERT" > ~/.docker/cert.pem
+    - echo "$TLSKEY" > ~/.docker/key.pem
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  script:
+    - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME"
+  after_script:
+    - docker logout "$CI_REGISTRY"

 docker_prune:dev:
-    image: docker:stable
-    stage: cleanup
-    only:
-        - schedules
-    environment:
-        name: dev
-        url: http://api.dev.sahkoinsinoorikilta.fi
-    variables:
-        DOCKER_HOST: $DEV_CI_DOCKER_HOST
-        DOCKER_TLS_VERIFY: 1
-    before_script:
-        - mkdir -p ~/.docker
-        - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
-        - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
-        - echo "$DEV_TLSKEY" > ~/.docker/key.pem
-        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    script:
-        - docker system prune
-    after_script:
-        - docker logout "$CI_REGISTRY"
+  image: docker:stable
+  stage: cleanup
+  only:
+    - schedules
+  environment:
+    name: dev
+    url: http://api.dev.sahkoinsinoorikilta.fi
+  variables:
+    DOCKER_HOST: $DEV_CI_DOCKER_HOST
+    DOCKER_TLS_VERIFY: 1
+  before_script:
+    - mkdir -p ~/.docker
+    - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem
+    - echo "$DEV_TLSCERT" > ~/.docker/cert.pem
+    - echo "$DEV_TLSKEY" > ~/.docker/key.pem
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  script:
+    - docker system prune
+  after_script:
+    - docker logout "$CI_REGISTRY"

 docker_prune:prod:
-    image: docker:stable
-    stage: cleanup
-    only:
-        - schedules
-    environment:
-        name: production
-        url: https://api.sahkoinsinoorikilta.fi
-    variables:
-        DOCKER_HOST: $CI_DOCKER_HOST
-        DOCKER_TLS_VERIFY: 1
-    before_script:
-        - mkdir -p ~/.docker
-        - echo "$TLSCACERT" > ~/.docker/ca.pem
-        - echo "$TLSCERT" > ~/.docker/cert.pem
-        - echo "$TLSKEY" > ~/.docker/key.pem
-        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    script:
-        - docker system prune
-    after_script:
-        - docker logout "$CI_REGISTRY"
+  image: docker:stable
+  stage: cleanup
+  only:
+    - schedules
+  environment:
+    name: production
+    url: https://api.sahkoinsinoorikilta.fi
+  variables:
+    DOCKER_HOST: $CI_DOCKER_HOST
+    DOCKER_TLS_VERIFY: 1
+  before_script:
+    - mkdir -p ~/.docker
+    - echo "$TLSCACERT" > ~/.docker/ca.pem
+    - echo "$TLSCERT" > ~/.docker/cert.pem
+    - echo "$TLSKEY" > ~/.docker/key.pem
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  script:
+    - docker system prune
+  after_script:
+    - docker logout "$CI_REGISTRY"
@@ -0,0 +1 @@
+20.15.0
@@ -1 +1 @@
-3.9
+3.12.9
@@ -1,13 +1,14 @@
-FROM python:3.9-slim-buster AS builder
+FROM python:3.12.9-slim-bullseye AS builder
 ENV PYTHONUNBUFFERED 1
 COPY . ./

-ENV POETRY_VERSION=1.3.1
+ENV POETRY_VERSION=2.0.1

 RUN pip install "poetry==$POETRY_VERSION"
+RUN poetry self add poetry-plugin-export
 RUN poetry export --without-hashes > requirements.txt

-FROM python:3.9-slim-buster AS server
+FROM python:3.12.9-slim-bullseye AS server

 WORKDIR /app
 COPY . ./
@@ -31,13 +31,13 @@ For depedencies and virtual environment, we use [poetry](https://python-poetry.o
 First install [python](https://wiki.python.org/moin/BeginnersGuide/Download). Then install poetry:

 ```bash
-python3 -m pip install poetry==1.3.1
+python -m pip install poetry==2.0.1
 ```

 The easiest integration with VSCode is to have poetry install virtual environment in project folder, configured with CMD

 ```bash
-python3 -m poetry config virtualenvs.in-project true
+python -m poetry config virtualenvs.in-project true
 ```

 ### Node
@@ -65,7 +65,7 @@ docker run --name sik.web.db -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d postg
 Activate virtual environment in shell

 ```bash
-python3 -m poetry shell
+eval $(python -m poetry env activate)
 ```

 Install dependencies
@@ -1,11 +1,22 @@
-[tool.poetry]
+[project]
 name = "web2.0-backend"
 version = "0.1.0"
 description = "Backend for sahkoinsinoorikilta.fi"
-authors = ["Aarni Halinen aarni.halinen@sahkoinsinoorikilta.fi"]
+authors = [
+  { name="Aarni Halinen", email="aarni.halinen@sahkoinsinoorikilta.fi"}
+]
+readme = "README.md"
+requires-python = ">=3.12"
+
+
+[tool.poetry]
+package-mode = false
+
+[tool.poetry.requires-plugins]
+poetry-plugin-export = "^1.9"

 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.12"
 decorator = "^4.0.9"
 Django = "^4.1"
 requests = "^2.28.1"
@@ -28,7 +39,7 @@ django-filter = "^22.1"
 whitenoise = "^6.2.0"
 jsonschema = "^4.9.0"
 Markdown = "^3.2.2"
-uWSGI = "^2.0.18"
+uWSGI = "^2.0.28"
 gunicorn = "^20.1.0"
 Pillow = "^10.0.0"
 sendgrid = "^6.7.0"
@@ -12,5 +12,5 @@
  "reportMissingImports": true,
  "reportMissingTypeStubs": false,

-  "pythonVersion": "3.9"
+  "pythonVersion": "3.12.9"
 }
@@ -1 +1 @@
 .9
 .12.9