Skip to content

Commit

Permalink
Update python to 3.12 (#303)
Browse files Browse the repository at this point in the history
* update python to 3.12

* update github actions

* Update Pipfile.lock

* update pipfile
  • Loading branch information
nstoik committed Jan 3, 2024
1 parent 8705828 commit 4ebfe7c
Show file tree
Hide file tree
Showing 7 changed files with 218 additions and 331 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -54,7 +54,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -68,4 +68,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/device-on-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
run:
working-directory: device/
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Install Python dependencies
run: |
pip install pipenv
Expand Down
2 changes: 1 addition & 1 deletion device/.devcontainer/devcontainer.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

FROM python:3.11 as dev-stage
FROM python:3.12 as dev-stage

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
4 changes: 2 additions & 2 deletions device/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11 AS build-stage
FROM python:3.12 AS build-stage

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -50,7 +50,7 @@ CMD ["pipenv", "run", "fd_device", "run"]

# prod stage steps below. Similiar as the dev stage, but we copy the venv from
# the build stage to the prod stage (no git in slim version of this docker base image)
FROM python:3.11-slim AS prod-stage
FROM python:3.12-slim AS prod-stage
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
ENV LANG C.UTF-8
Expand Down
45 changes: 22 additions & 23 deletions device/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,49 @@ name = "pypi"

[dev-packages]
# Testing
factory-boy = "~=3.2.1"
pytest = "~=7.1.3"
pytest-cov = "~=4.0.0"
pytest-mock = "~=3.10.0"
factory-boy = "~=3.3"
pytest = "~=7.4"
pytest-cov = "~=4.1"
pytest-mock = "~=3.12"
# Lint and code style
black = "~=22.10"
flake8 = "~=5.0.4"
black = "~=23.12"
flake8 = "~=6.1.0"
flake8-blind-except = "~=0.2.0"
flake8-debugger = "~=4.1.2"
flake8-docstrings = "~=1.6.0"
flake8-isort = "~=5.0.0"
isort = "~=5.10.1"
mypy = "~=0.961"
flake8-docstrings = "~=1.7.0"
flake8-isort = "~=6.1.1"
isort = "~=5.13"
mypy = "~=1.8"
pep8-naming = "~=0.13.2"
pylint = "~=2.15"
pylint = "~=3.0"
# type hints
types-beautifulsoup4 = "~=4.11.6"
types-setuptools = "~=65.5"
types-beautifulsoup4 = "~=4.12"
types-setuptools = "~=69.0"
types-psutil = "~=5.9.5"
types-requests = "~=2.28.11"
# Self
fd-device = {file = ".", editable = true}
types-requests = "~=2.31"

[packages]
SQLAlchemy = "~=1.4.42"
# for Postgresql
psycopg2 = "~=2.9.4"
alembic = "~=1.8.1"
gpiozero = "~=1.6.2"
alembic = "~=1.13.1"
gpiozero = "~=2.0"
netifaces = "~=0.11.0"
click = "~=8.1.3"
psutil = "~=5.9.3"
pika = "~=1.3"
celery = "~=5.2.7"
celery = "~=5.3"
multiprocessing-logging = "~=0.3.3"
# Environment and variable parsing
environs = "~=9.5.0"
environs = "~=10.0"
# basic scheduler
schedule = "~=1.1.0"
schedule = "~=1.2"
# for reading temperature from owfs webserver
requests = "~=2.28"
beautifulsoup4 = "~=4.11.1"
beautifulsoup4 = "~=4.12.2"
# self
# "e1839a8" = {path = ".", editable = true}
fd-device = {file = ".", editable = true}

[requires]
python_version = "3.11"
python_version = "3.12"
Loading

0 comments on commit 4ebfe7c

Please sign in to comment.