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

WIP: django5 #177

Merged
merged 4 commits into from
Oct 20, 2024
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
cache: "npm"
cache-dependency-path: "**/package-lock.json"
- name: 🔧 Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
cache: "pipenv"

# spust skripty pro upravu souboru
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
cache: "npm"
cache-dependency-path: "**/package-lock.json"
- name: 🔧 Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
cache: "pipenv"

# spust skripty pro upravu souboru
Expand Down
25 changes: 13 additions & 12 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,36 @@ verify_ssl = true
name = "pypi"

[packages]
django = "~=3.2.25"
djangorestframework = "~=3.14.0"
django = "~=5.1.2"
djangorestframework = "~=3.15.2"
djangorestframework-simplejwt = "~=5.3.1"
django-debug-toolbar = "~=3.2.4"
django-debug-toolbar = "~=4.4.6"
django-environ = "~=0.11.2"
django-filter = "~=23.5"
django-filter = "~=24.3.0"
gunicorn = "~=23.0.0"
"psycopg2-binary" = "~=2.9.3"
"psycopg2-binary" = "~=2.9.9"
pyyaml = "~=6.0.2"
requests = "~=2.32.3"
sentry-sdk = "~=1.14.0"
uritemplate = "~=4.1.1"
vulture = "~=2.13.0"
whitenoise = "~=6.7.0"
django-csp = "~=3.8.0"
urllib3 = "==1.26.20"
urllib3 = "~=1.26.20"
sentry-sdk = {extras = ["django"], version = "~=2.17.0"}
setuptools = "*"

[dev-packages]
behave-django = "~=1.4.0"
behave-django = "~=1.5.0"
black = "~=24.10.0"
coverage = "~=6.3.3"
selenium = "~=3.141.0"
mypy = "~=1.11.2"
django-stubs = "~=1.16.0"
djangorestframework-stubs = "~=1.10.0"
mypy = "~=1.12.0"
django-stubs = "~=5.1.0"
djangorestframework-stubs = "~=3.15.1"
types-requests = "~=2.28.11.8"

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

[pipenv]
allow_prereleases = false
364 changes: 191 additions & 173 deletions Pipfile.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.cs.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ Aplikace je rozdělena na **frontend a backend**, ty spolu komunikují přes **R

Obsahuje veškerou logiku a pro klienta vystavuje **REST API**, postaven na těchto technologiích:

- [Python 3.11](https://www.python.org/),
- [Django 3](https://www.djangoproject.com/),
- [Python 3.12](https://www.python.org/),
- [Django 5](https://www.djangoproject.com/),
- [Django REST framework 3](https://www.django-rest-framework.org/),
- [djangorestframework-simplejwt](https://github.com/davesque/django-rest-framework-simplejwt),
- [Pipenv](https://pipenv.pypa.io/en/latest/#install-pipenv-today),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ database.

Includes all the logic and exposes a **REST API** for a client, built on these technologies:

- [Python 3.11](https://www.python.org/),
- [Django 3](https://www.djangoproject.com/),
- [Python 3.12](https://www.python.org/),
- [Django 5](https://www.djangoproject.com/),
- [Django REST framework 3](https://www.django-rest-framework.org/),
- [djangorestframework-simplejwt](https://github.com/davesque/django-rest-framework-simplejwt),
- [Pipenv](https://pipenv.pypa.io/en/latest/#install-pipenv-today),
Expand Down
1 change: 0 additions & 1 deletion up/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@
LANGUAGE_CODE = "cs"
TIME_ZONE = "Europe/Prague"
USE_I18N = True
USE_L10N = True
USE_TZ = True
PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))

Expand Down
Loading