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

ZDL-125: Python upgrade 3.12 #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
12 changes: 6 additions & 6 deletions .github/workflows/django-cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
SCA:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.12.4
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down Expand Up @@ -42,11 +42,11 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.12.4
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repos:
args: [--exclude=venv, --check]

- repo: https://github.com/PyCQA/flake8
rev: 6.1.0
rev: 7.0.0
hooks:
- id: flake8
args: [--statistics]
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Zadala API is an ecommerce web API built with django rest framework.

### Requirements
- python 3
- poetry
- docker
- docker-compose

Expand All @@ -24,11 +25,11 @@ Zadala API is an ecommerce web API built with django rest framework.
### Setup
##### create virtual environment
```
python -m venv venv
poetry shell
```
##### Install required packages
```
pip install -r requirements.txt
poetry install
```
##### Edit `zadala_config.py` base on your needs
```
Expand Down
2 changes: 1 addition & 1 deletion deployments/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8
FROM python:3.12.5

ENV PYTHONUNBUFFERED 1

Expand Down
2 changes: 1 addition & 1 deletion deployments/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8
FROM python:3.12.5

ENV PYTHONUNBUFFERED 1

Expand Down
1,366 changes: 615 additions & 751 deletions poetry.lock

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,29 @@ authors = ["RyanAquino <[email protected]>"]
readme = "README.md"

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.12"
djangorestframework = "3.13.1"
drf-yasg = "1.20.0"
drf-yasg = "1.21.7"
pydantic = "1.9.0"
django = "3.2.20"
boto3 = "1.21.32"
psycopg2-binary = "2.9.6"
psycopg2-binary = "2.9.9"
whitenoise = "5.2.0"
django-cors-headers = "3.7.0"
django-rq = "2.8.1"
djangorestframework-simplejwt = "5.1.0"
rest-condition = "1.0.3"
py3-validate-email = "1.0.5"
google-api-python-client = "2.37.0"
pillow = "9.3.0"
pillow = "10.4.0"
gunicorn = "^21.2.0"
setuptools = "^72.1.0"


[tool.poetry.group.dev.dependencies]
black = "23.1.0"
factory-boy = "3.2.0"
flake8 = "3.8.3"
flake8 = "7.0.0"
isort = "5.10.1"
mypy = "0.941"
pre-commit = "^3.3.3"
Expand Down
2 changes: 1 addition & 1 deletion zadala_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


REDIS_DATABASE = {
"HOST": "redis",
"HOST": "localhost",
"PORT": 6379,
"DB": 0,
"PASSWORD": "",
Expand Down