Skip to content

Commit

Permalink
fix: Add Django 4.2 Support (#135)
Browse files Browse the repository at this point in the history
* fix: add Django 4.2 support.
---------

Co-authored-by: Salman Nawaz <[email protected]>
Co-authored-by: UsamaSadiq <[email protected]>
  • Loading branch information
3 people authored Jun 27, 2023
1 parent 737db62 commit 4171d83
Show file tree
Hide file tree
Showing 15 changed files with 270 additions and 260 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [django32, quality]
toxenv: [django32, django40, django42, quality]

steps:
- uses: actions/checkout@v2
Expand All @@ -39,8 +39,7 @@ jobs:
run: sleep 10 && tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django32'
uses: codecov/codecov-action@v1
if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
uses: codecov/codecov-action@v3
with:
flags: unittests
fail_ci_if_error: true
2 changes: 1 addition & 1 deletion edxsearch/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
""" Container module for testing / demoing search """

__version__ = '3.5.0'
__version__ = '3.6.0'
4 changes: 2 additions & 2 deletions edxsearch/urls.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
""" import urls from search component to test it's operation when included within other django projects """

import django
from django.conf.urls import include, url
from django.urls import include, path

# from django.contrib import admin
# admin.autodiscover()
Expand All @@ -10,4 +10,4 @@

# urlpatterns is the standard name to use here
# pylint: disable=invalid-name
urlpatterns = [url(r'^search/', include(search.urls))]
urlpatterns = [path('search/', include(search.urls))]
63 changes: 38 additions & 25 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
amqp==5.1.1
# via kombu
asgiref==3.5.2
asgiref==3.7.2
# via django
billiard==3.6.4.0
backports-zoneinfo[tzdata]==0.2.1
# via
# celery
# kombu
billiard==4.1.0
# via celery
celery==5.2.7
celery==5.3.1
# via event-tracking
certifi==2022.6.15
certifi==2023.5.7
# via elasticsearch
cffi==1.15.1
# via pynacl
Expand All @@ -28,11 +32,11 @@ click-didyoumean==0.3.0
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.2.0
click-repl==0.3.0
# via celery
code-annotations==1.3.0
# via edx-toggles
django==3.2.17
django==3.2.19
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand All @@ -44,11 +48,11 @@ django-crum==0.7.9
# via
# edx-django-utils
# edx-toggles
django-waffle==2.5.0
django-waffle==3.0.0
# via
# edx-django-utils
# edx-toggles
edx-django-utils==5.0.0
edx-django-utils==5.5.0
# via
# edx-toggles
# event-tracking
Expand All @@ -62,51 +66,60 @@ event-tracking==2.1.0
# via -r requirements/base.in
jinja2==3.1.2
# via code-annotations
kombu==5.2.4
kombu==5.3.1
# via celery
markupsafe==2.1.1
markupsafe==2.1.3
# via jinja2
newrelic==7.14.0.177
newrelic==8.8.0
# via edx-django-utils
pbr==5.9.0
pbr==5.11.1
# via stevedore
prompt-toolkit==3.0.30
prompt-toolkit==3.0.38
# via click-repl
psutil==5.9.1
psutil==5.9.5
# via edx-django-utils
pycparser==2.21
# via cffi
pymongo==3.12.3
pymongo==3.13.0
# via event-tracking
pynacl==1.5.0
# via edx-django-utils
python-slugify==6.1.2
python-dateutil==2.8.2
# via celery
python-slugify==8.0.1
# via code-annotations
pytz==2022.1
pytz==2023.3
# via
# celery
# django
# event-tracking
pyyaml==6.0
# via code-annotations
six==1.16.0
# via
# click-repl
# event-tracking
sqlparse==0.4.2
# python-dateutil
sqlparse==0.4.4
# via django
stevedore==4.0.0
stevedore==5.1.0
# via
# code-annotations
# edx-django-utils
text-unidecode==1.3
# via python-slugify
urllib3==1.26.10
typing-extensions==4.6.3
# via
# asgiref
# kombu
tzdata==2023.3
# via
# backports-zoneinfo
# celery
urllib3==1.26.16
# via elasticsearch
vine==5.0.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.5
wcwidth==0.2.6
# via prompt-toolkit
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Requirements for running tests in Github Actions
-c constraints.txt

codecov # Code coverage reporting
tox # Virtualenv management for tests
44 changes: 14 additions & 30 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,46 +1,30 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
certifi==2022.6.15
# via requests
charset-normalizer==2.1.0
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==6.4.2
# via codecov
distlib==0.3.4
distlib==0.3.6
# via virtualenv
filelock==3.7.1
filelock==3.12.2
# via
# tox
# virtualenv
idna==3.3
# via requests
packaging==21.3
packaging==23.1
# via tox
platformdirs==2.5.2
platformdirs==3.8.0
# via virtualenv
pluggy==1.0.0
pluggy==1.2.0
# via tox
py==1.11.0
# via tox
pyparsing==3.0.9
# via packaging
requests==2.28.1
# via codecov
six==1.16.0
# via
# tox
# virtualenv
toml==0.10.2
# via tox
tox==3.25.1
# via -r requirements/ci.in
urllib3==1.26.10
# via requests
virtualenv==20.15.1
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
virtualenv==20.23.1
# via tox
Loading

0 comments on commit 4171d83

Please sign in to comment.