Skip to content

Commit

Permalink
Merge pull request #11 from matesaki/django42
Browse files Browse the repository at this point in the history
add support for Django 4.2
  • Loading branch information
stdweird authored Jul 29, 2024
2 parents 508f0b7 + df25d6c commit f4e4948
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
16 changes: 10 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name='django-wayf',
version='0.3.7',
version='0.3.8',
packages=find_packages(),
include_package_data=True,
license='GPL v3',
Expand All @@ -18,18 +18,22 @@
url='https://github.com/hpcugent/django-wayf',
author='Jens Timmerman',
author_email='jens.timmerman@ugent.be',
install_requires=['lxml'],
install_requires=[
'lxml',
'django >= 3.2, < 5',
],
classifiers=[
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.9',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
],
Expand Down
10 changes: 4 additions & 6 deletions wayf/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
from django.conf.urls import url
from django.urls import re_path
from wayf.views import wayf, setlanguage

urlpatterns = []

urlpatterns += [
url(r'^[/]?$', wayf), # work around warning wrt url pattern starting with /
url(r'^setlanguage/(.*)$', setlanguage),
urlpatterns = [
re_path(r'^[/]?$', wayf), # work around warning wrt url pattern starting with /
re_path(r'^setlanguage/(.*)$', setlanguage),
]
9 changes: 5 additions & 4 deletions wayf/utils.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-
from lxml.objectify import parse
import random
import re

from django.conf import settings
from django.utils.translation import ugettext_lazy as _l
from django.utils.translation import get_language
import re
import random
from django.utils.translation import gettext_lazy as _l
from lxml.objectify import parse


# A catalog of the institution categories. The order in which they appear
Expand Down

0 comments on commit f4e4948

Please sign in to comment.