Skip to content

Commit

Permalink
chore: post django32 cleanup (#41)
Browse files Browse the repository at this point in the history
  • Loading branch information
aht007 authored Feb 16, 2022
1 parent f1cfcfe commit 71ace18
Show file tree
Hide file tree
Showing 14 changed files with 198 additions and 153 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Python CI

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches:
- '**'
- '**'

jobs:
tests:
Expand All @@ -14,10 +14,10 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: ['django22', 'django30', 'django31', 'django32', 'quality']
toxenv: [quality, django32]
exclude:
- python-version: "3.8"
toxenv: "quality"
- python-version: '3.8'
toxenv: quality

steps:
- name: checkout repo
Expand All @@ -39,7 +39,7 @@ jobs:
run: 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 django_sites_extensions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
""" django_sites_extensions main module """
default_app_config = 'django_sites_extensions.apps.DjangoSitesExtensionsConfig' # pragma: no cover
__version__ = '3.1.0'
__version__ = '4.0.0'
6 changes: 3 additions & 3 deletions django_sites_extensions/tests/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
""" ROOT_URLCONF for tests """
from django.conf.urls import url

from django_sites_extensions.tests import views
from django.urls import path


urlpatterns = [
url(r'^home$', views.test, name='home'),
url(r'^login', views.login, name='login'),
path('home', views.test, name='home'),
path('login', views.login, name='login'),
]
10 changes: 6 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
django==2.2.17
asgiref==3.5.0
# via django
django==3.2.12
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
pytz==2020.5
pytz==2021.3
# via django
sqlparse==0.4.1
sqlparse==0.4.2
# via django
42 changes: 21 additions & 21 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
appdirs==1.4.4
# via
# -r requirements/tox.txt
# virtualenv
certifi==2020.12.5
certifi==2021.10.8
# via requests
chardet==4.0.0
charset-normalizer==2.0.12
# via requests
codecov==2.1.11
codecov==2.1.12
# via -r requirements/ci.in
coverage==5.3.1
coverage==6.3.1
# via codecov
distlib==0.3.1
distlib==0.3.4
# via
# -r requirements/tox.txt
# virtualenv
filelock==3.0.12
filelock==3.5.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
idna==2.10
idna==3.3
# via requests
packaging==20.8
packaging==21.3
# via
# -r requirements/tox.txt
# tox
pluggy==0.13.1
platformdirs==2.5.0
# via
# -r requirements/tox.txt
# virtualenv
pluggy==1.0.0
# via
# -r requirements/tox.txt
# tox
py==1.10.0
py==1.11.0
# via
# -r requirements/tox.txt
# tox
pyparsing==2.4.7
pyparsing==3.0.7
# via
# -r requirements/tox.txt
# packaging
requests==2.25.1
requests==2.27.1
# via codecov
six==1.15.0
six==1.16.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -54,11 +54,11 @@ toml==0.10.2
# via
# -r requirements/tox.txt
# tox
tox==3.21.2
tox==3.24.5
# via -r requirements/tox.txt
urllib3==1.26.2
urllib3==1.26.8
# via requests
virtualenv==20.4.0
virtualenv==20.13.1
# via
# -r requirements/tox.txt
# tox
2 changes: 1 addition & 1 deletion requirements/django.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==2.2.17
django==3.2.12
59 changes: 32 additions & 27 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
@@ -1,67 +1,72 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
alabaster==0.7.12
# via sphinx
babel==2.9.0
asgiref==3.5.0
# via django
babel==2.9.1
# via sphinx
certifi==2020.12.5
certifi==2021.10.8
# via requests
chardet==4.0.0
charset-normalizer==2.0.12
# via requests
django==2.2.17
django==3.2.12
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
docutils==0.16
# via sphinx
idna==2.10
docutils==0.17.1
# via
# sphinx
# sphinx-rtd-theme
idna==3.3
# via requests
imagesize==1.2.0
imagesize==1.3.0
# via sphinx
jinja2==2.11.2
importlib-metadata==4.11.1
# via sphinx
markupsafe==1.1.1
jinja2==3.0.3
# via sphinx
markupsafe==2.0.1
# via jinja2
packaging==20.8
packaging==21.3
# via sphinx
pygments==2.7.4
pygments==2.11.2
# via sphinx
pyparsing==2.4.7
pyparsing==3.0.7
# via packaging
pytz==2020.5
pytz==2021.3
# via
# babel
# django
requests==2.25.1
requests==2.27.1
# via sphinx
snowballstemmer==2.0.0
snowballstemmer==2.2.0
# via sphinx
sphinx-rtd-theme==0.5.1
# via -r requirements/doc.in
sphinx==3.4.3
sphinx==4.4.0
# via
# -r requirements/doc.in
# sphinx-rtd-theme
sphinx-rtd-theme==1.0.0
# via -r requirements/doc.in
sphinxcontrib-applehelp==1.0.2
# via sphinx
sphinxcontrib-devhelp==1.0.2
# via sphinx
sphinxcontrib-htmlhelp==1.0.3
sphinxcontrib-htmlhelp==2.0.0
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.4
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
sqlparse==0.4.1
sqlparse==0.4.2
# via django
urllib3==1.26.2
urllib3==1.26.8
# via requests

# The following packages are considered to be unsafe in a requirements file:
# setuptools
zipp==3.7.0
# via importlib-metadata
1 change: 1 addition & 0 deletions requirements/pip.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Core dependencies for installing other packages
-c constraints.txt

pip
setuptools
Expand Down
12 changes: 7 additions & 5 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
wheel==0.36.2
wheel==0.37.1
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==20.3.3
# via -r requirements/pip.in
setuptools==51.3.3
pip==22.0.3
# via -r requirements/pip.in
setuptools==59.8.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/pip.in
13 changes: 10 additions & 3 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
click==7.1.2
click==8.0.3
# via pip-tools
pip-tools==5.5.0
pep517==0.12.0
# via pip-tools
pip-tools==6.5.1
# via -r requirements/pip_tools.in
tomli==2.0.1
# via pep517
wheel==0.37.1
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
Loading

0 comments on commit 71ace18

Please sign in to comment.