Skip to content

Commit

Permalink
Update to python 3.11 and Django 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
twinkarma committed Jul 26, 2024
1 parent c760819 commit 38a30bb
Show file tree
Hide file tree
Showing 6 changed files with 466 additions and 531 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9"]
python-version: ["3.11", "3.12"]
os: [ubuntu-22.04]
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion RSEAdmin/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
from django.conf.urls import include, url
from django.conf.urls import include
from django.urls import re_path
from django.contrib import admin

Expand Down
975 changes: 455 additions & 520 deletions poetry.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ authors = ["Paul Richmond <[email protected]>"]
license = "MIT"

[tool.poetry.dependencies]
python = "^3.8"
Django = "^3.2"
django-adminlte2 = "~0.4.1"
python = "^3.11"
Django = "^4.2"
django-adminlte2 = "~0.4.3"
django-polymorphic = "^3.1"
gunicorn = {version = "^20.1", optional = true}
psycopg2 = "^2.9"
gunicorn = {version = "^22.0", optional = true}
psycopg2 = "^2.9.9"
mysqlclient = {version = "^2", optional = true}
python-dateutil = "~2.8.2"
python-dateutil = "~2.9.0"
cryptography = "^39.0"

[tool.poetry.dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rse/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from django.db.utils import OperationalError, ProgrammingError
from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from polymorphic.models import PolymorphicModel
from django.db.models import Max, Min, QuerySet
from typing import Iterator, Union, TypeVar, Generic
Expand Down
4 changes: 2 additions & 2 deletions rse/templates/includes/salaryband_options.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% for sb in sbs %}
<option value="{{ sb.id }}"{% ifequal sb.id selected%} selected{% endifequal %}>{{sb}}</option>
{% endfor %}
<option value="{{ sb.id }}"{% if sb.id == selected%} selected{% endif %}>{{sb}}</option>
{% endfor %}

0 comments on commit 38a30bb

Please sign in to comment.