Skip to content

Commit

Permalink
feat!: Dropped django22 support. (#120)
Browse files Browse the repository at this point in the history
* feat!: dropped django2.2 support. Upgrade package.
  • Loading branch information
awais786 authored Feb 9, 2022
1 parent aa82f53 commit f15e29a
Show file tree
Hide file tree
Showing 11 changed files with 268 additions and 161 deletions.
4 changes: 2 additions & 2 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: [django22, django30, django31, django32, quality]
toxenv: [django32, quality]

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

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django22'
if: matrix.python-version == '3.8' && matrix.toxenv=='django32'
uses: codecov/codecov-action@v1
with:
flags: unittests
Expand Down
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.1.0'
__version__ = '4.0.0'
45 changes: 31 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,60 @@
#
# make upgrade
#
amqp==5.0.6
amqp==5.0.9
# via kombu
asgiref==3.5.0
# via django
billiard==3.6.4.0
# via celery
celery==5.1.2
celery==5.2.3
# via event-tracking
certifi==2021.5.30
certifi==2021.10.8
# via elasticsearch
click==7.1.2
click==8.0.3
# via
# -c requirements/constraints.txt
# celery
# click-didyoumean
# click-plugins
# click-repl
click-didyoumean==0.0.3
click-didyoumean==0.3.0
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
django==2.2.24
django==3.2.12
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
# django-crum
# edx-django-utils
# event-tracking
django-crum==0.7.9
# via edx-django-utils
django-waffle==2.3.0
# via edx-django-utils
edx-django-utils==4.5.0
# via event-tracking
elasticsearch==7.13.4
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
event-tracking==1.1.0
event-tracking==2.0.0
# via -r requirements/base.in
kombu==5.1.0
kombu==5.2.3
# via celery
prompt-toolkit==3.0.20
newrelic==7.4.0.172
# via edx-django-utils
pbr==5.8.1
# via stevedore
prompt-toolkit==3.0.27
# via click-repl
pymongo==3.12.0
psutil==5.9.0
# via edx-django-utils
pymongo==3.12.3
# via event-tracking
pytz==2021.1
pytz==2021.3
# via
# celery
# django
Expand All @@ -51,9 +66,11 @@ six==1.16.0
# via
# click-repl
# event-tracking
sqlparse==0.4.1
sqlparse==0.4.2
# via django
urllib3==1.26.6
stevedore==3.5.0
# via edx-django-utils
urllib3==1.26.8
# via elasticsearch
vine==5.0.0
# via
Expand Down
30 changes: 14 additions & 16 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,43 @@
#
# make upgrade
#
backports.entry-points-selectable==1.1.0
# via virtualenv
certifi==2021.5.30
certifi==2021.10.8
# via requests
charset-normalizer==2.0.4
charset-normalizer==2.0.11
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==5.5
coverage==6.3.1
# via codecov
distlib==0.3.2
distlib==0.3.4
# via virtualenv
filelock==3.0.12
filelock==3.4.2
# via
# tox
# virtualenv
idna==3.2
idna==3.3
# via requests
packaging==21.0
packaging==21.3
# via tox
platformdirs==2.3.0
platformdirs==2.4.1
# via virtualenv
pluggy==1.0.0
# via tox
py==1.10.0
py==1.11.0
# via tox
pyparsing==2.4.7
pyparsing==3.0.7
# via packaging
requests==2.26.0
requests==2.27.1
# via codecov
six==1.16.0
# via
# tox
# virtualenv
toml==0.10.2
# via tox
tox==3.24.3
tox==3.24.5
# via -r requirements/ci.in
urllib3==1.26.6
urllib3==1.26.8
# via requests
virtualenv==20.7.2
virtualenv==20.13.1
# via tox
4 changes: 2 additions & 2 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# ddt >= 1.4.0 causing test failures
ddt < 1.4.0

# pip-tools fetches latest version of click which is in-compatible with celery & more packages
click < 8.0
# greater version breaking quality build. fix in separate PR.
pylint==2.10.2
Loading

0 comments on commit f15e29a

Please sign in to comment.