Skip to content

Commit 76d35c3

Browse files
author
M. Zulqarnain
authored
BOM-1646 : Remove caniusepython3 (#7)
* remove caniusepython3
1 parent a70b385 commit 76d35c3

File tree

10 files changed

+37
-55
lines changed

10 files changed

+37
-55
lines changed

pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
[MASTER]
5656
ignore = migrations
5757
persistent = yes
58-
load-plugins = caniusepython3.pylint_checker,edx_lint.pylint,pylint_django,pylint_celery
58+
load-plugins = edx_lint.pylint,pylint_django,pylint_celery
5959

6060
[MESSAGES CONTROL]
6161
enable =

pylintrc_tweaks

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# pylintrc tweaks for use with edx_lint.
22
[MASTER]
33
ignore = migrations
4-
load-plugins = caniusepython3.pylint_checker,edx_lint.pylint,pylint_django,pylint_celery
4+
load-plugins = edx_lint.pylint,pylint_django,pylint_celery

requirements/dev.txt

+19-23
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,22 @@
44
#
55
# make upgrade
66
#
7-
appdirs==1.4.3 # via -r requirements/travis.txt, virtualenv
8-
argparse==1.4.0 # via -r requirements/quality.txt, caniusepython3
7+
appdirs==1.4.4 # via -r requirements/travis.txt, virtualenv
98
astroid==2.3.3 # via -r requirements/quality.txt, pylint, pylint-celery
109
attrs==19.3.0 # via -r requirements/quality.txt, pytest
11-
backports.functools-lru-cache==1.6.1 # via -r requirements/quality.txt, caniusepython3
12-
caniusepython3==7.2.0 # via -r requirements/quality.txt
13-
certifi==2020.4.5.1 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
14-
chardet==3.0.4 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
10+
certifi==2020.4.5.1 # via -r requirements/travis.txt, requests
11+
chardet==3.0.4 # via -r requirements/travis.txt, requests
1512
click-log==0.3.2 # via -r requirements/quality.txt, edx-lint
1613
click==7.1.2 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, edx-lint, pip-tools
17-
codecov==2.0.22 # via -r requirements/travis.txt
14+
codecov==2.1.3 # via -r requirements/travis.txt
1815
coverage==5.1 # via -r requirements/quality.txt, -r requirements/travis.txt, codecov, pytest-cov
1916
diff-cover==2.6.1 # via -r requirements/dev.in
20-
distlib==0.3.0 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, virtualenv
17+
distlib==0.3.0 # via -r requirements/travis.txt, virtualenv
2118
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/quality.txt, edx-i18n-tools
22-
edx-i18n-tools==0.5.0 # via -r requirements/dev.in
19+
edx-i18n-tools==0.5.3 # via -r requirements/dev.in
2320
edx-lint==1.4.1 # via -r requirements/quality.txt
2421
filelock==3.0.12 # via -r requirements/travis.txt, tox, virtualenv
25-
idna==2.9 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
22+
idna==2.9 # via -r requirements/travis.txt, requests
2623
importlib-metadata==1.6.0 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-resources, inflect, path, pluggy, pytest, tox, virtualenv
2724
importlib-resources==1.5.0 # via -r requirements/travis.txt, virtualenv
2825
inflect==3.0.2 # via jinja2-pluralize
@@ -32,16 +29,16 @@ jinja2==2.11.2 # via diff-cover, jinja2-pluralize
3229
lazy-object-proxy==1.4.3 # via -r requirements/quality.txt, astroid
3330
markupsafe==1.1.1 # via jinja2
3431
mccabe==0.6.1 # via -r requirements/quality.txt, pylint
35-
more-itertools==8.2.0 # via -r requirements/quality.txt, pytest
36-
packaging==20.3 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, pytest, tox
32+
more-itertools==8.3.0 # via -r requirements/quality.txt, pytest
33+
packaging==20.4 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
3734
path.py==12.4.0 # via edx-i18n-tools
3835
path==13.1.0 # via path.py
3936
pathlib2==2.3.5 # via -r requirements/quality.txt, pytest
40-
pip-tools==5.1.1 # via -r requirements/pip-tools.txt
37+
pip-tools==5.1.2 # via -r requirements/pip-tools.txt
4138
pluggy==0.13.1 # via -r requirements/quality.txt, -r requirements/travis.txt, diff-cover, pytest, tox
4239
polib==1.1.0 # via edx-i18n-tools
4340
py==1.8.1 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
44-
pycodestyle==2.5.0 # via -r requirements/quality.txt
41+
pycodestyle==2.6.0 # via -r requirements/quality.txt
4542
pydocstyle==5.0.2 # via -r requirements/quality.txt
4643
pygments==2.6.1 # via diff-cover
4744
pylint-celery==0.3 # via -r requirements/quality.txt, edx-lint
@@ -51,23 +48,22 @@ pylint==2.4.2 # via -r requirements/quality.txt, edx-lint, pylint-ce
5148
pyparsing==2.4.7 # via -r requirements/quality.txt, -r requirements/travis.txt, packaging
5249
pytest-cov==2.8.1 # via -r requirements/quality.txt
5350
pytest-django==3.9.0 # via -r requirements/quality.txt
54-
pytest==5.4.1 # via -r requirements/quality.txt, pytest-cov, pytest-django
51+
pytest==5.4.2 # via -r requirements/quality.txt, pytest-cov, pytest-django
5552
pytz==2020.1 # via -r requirements/quality.txt, django
5653
pyyaml==5.3.1 # via edx-i18n-tools
57-
requests==2.23.0 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, codecov
58-
six==1.14.0 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/travis.txt, astroid, diff-cover, edx-i18n-tools, edx-lint, packaging, pathlib2, pip-tools, tox, virtualenv
54+
requests==2.23.0 # via -r requirements/travis.txt, codecov
55+
six==1.15.0 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/travis.txt, astroid, diff-cover, edx-i18n-tools, edx-lint, packaging, pathlib2, pip-tools, tox, virtualenv
5956
snowballstemmer==2.0.0 # via -r requirements/quality.txt, pydocstyle
6057
sqlparse==0.3.1 # via -r requirements/quality.txt, django
61-
toml==0.10.0 # via -r requirements/travis.txt, tox
62-
tox-battery==0.5.2 # via -r requirements/travis.txt
63-
tox==3.15.0 # via -r requirements/travis.txt, tox-battery
58+
toml==0.10.1 # via -r requirements/travis.txt, tox
59+
tox-battery==0.6.0 # via -r requirements/travis.txt
60+
tox==3.15.1 # via -r requirements/travis.txt, tox-battery
6461
typed-ast==1.4.1 # via -r requirements/quality.txt, astroid
65-
urllib3==1.25.9 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
66-
virtualenv==20.0.19 # via -r requirements/travis.txt, tox
62+
urllib3==1.25.9 # via -r requirements/travis.txt, requests
63+
virtualenv==20.0.21 # via -r requirements/travis.txt, tox
6764
wcwidth==0.1.9 # via -r requirements/quality.txt, pytest
6865
wrapt==1.11.2 # via -r requirements/quality.txt, astroid
6966
zipp==1.2.0 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources
7067

7168
# The following packages are considered to be unsafe in a requirements file:
7269
# pip
73-
# setuptools

requirements/doc.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ imagesize==1.2.0 # via sphinx
2020
importlib-metadata==1.6.0 # via -r requirements/test.txt, pluggy, pytest
2121
jinja2==2.11.2 # via sphinx
2222
markupsafe==1.1.1 # via jinja2
23-
more-itertools==8.2.0 # via -r requirements/test.txt, pytest
24-
packaging==20.3 # via -r requirements/test.txt, bleach, pytest, sphinx
23+
more-itertools==8.3.0 # via -r requirements/test.txt, pytest
24+
packaging==20.4 # via -r requirements/test.txt, bleach, pytest, sphinx
2525
pathlib2==2.3.5 # via -r requirements/test.txt, pytest
2626
pbr==5.4.5 # via stevedore
2727
pluggy==0.13.1 # via -r requirements/test.txt, pytest
@@ -30,12 +30,12 @@ pygments==2.6.1 # via readme-renderer, sphinx
3030
pyparsing==2.4.7 # via -r requirements/test.txt, packaging
3131
pytest-cov==2.8.1 # via -r requirements/test.txt
3232
pytest-django==3.9.0 # via -r requirements/test.txt
33-
pytest==5.4.1 # via -r requirements/test.txt, pytest-cov, pytest-django
33+
pytest==5.4.2 # via -r requirements/test.txt, pytest-cov, pytest-django
3434
pytz==2020.1 # via -r requirements/test.txt, babel, django
3535
readme-renderer==26.0 # via -r requirements/doc.in
3636
requests==2.23.0 # via sphinx
3737
restructuredtext-lint==1.3.0 # via doc8
38-
six==1.14.0 # via -r requirements/test.txt, bleach, doc8, edx-sphinx-theme, packaging, pathlib2, readme-renderer, stevedore
38+
six==1.15.0 # via -r requirements/test.txt, bleach, doc8, edx-sphinx-theme, packaging, pathlib2, readme-renderer, stevedore
3939
snowballstemmer==2.0.0 # via sphinx
4040
sphinx==3.0.3 # via -r requirements/doc.in, edx-sphinx-theme
4141
sphinxcontrib-applehelp==1.0.2 # via sphinx

requirements/pip-tools.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# make upgrade
66
#
77
click==7.1.2 # via pip-tools
8-
pip-tools==5.1.1 # via -r requirements/pip-tools.in
9-
six==1.14.0 # via pip-tools
8+
pip-tools==5.1.2 # via -r requirements/pip-tools.in
9+
six==1.15.0 # via pip-tools
1010

1111
# The following packages are considered to be unsafe in a requirements file:
1212
# pip

requirements/quality.in

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
-c constraints.txt
44
-r test.txt # Core and testing dependencies for this package
55

6-
caniusepython3 # Additional Python 3 compatibility pylint checks
76
edx-lint # edX pylint rules and plugins
87
isort # to standardize order of imports
98
pycodestyle # PEP 8 compliance validation

requirements/quality.txt

+5-17
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,23 @@
44
#
55
# make upgrade
66
#
7-
argparse==1.4.0 # via caniusepython3
87
astroid==2.3.3 # via pylint, pylint-celery
98
attrs==19.3.0 # via -r requirements/test.txt, pytest
10-
backports.functools-lru-cache==1.6.1 # via caniusepython3
11-
caniusepython3==7.2.0 # via -r requirements/quality.in
12-
certifi==2020.4.5.1 # via requests
13-
chardet==3.0.4 # via requests
149
click-log==0.3.2 # via edx-lint
1510
click==7.1.2 # via click-log, edx-lint
1611
coverage==5.1 # via -r requirements/test.txt, pytest-cov
17-
distlib==0.3.0 # via caniusepython3
1812
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/test.txt
1913
edx-lint==1.4.1 # via -r requirements/quality.in
20-
idna==2.9 # via requests
2114
importlib-metadata==1.6.0 # via -r requirements/test.txt, pluggy, pytest
2215
isort==4.3.21 # via -r requirements/quality.in, pylint
2316
lazy-object-proxy==1.4.3 # via astroid
2417
mccabe==0.6.1 # via pylint
25-
more-itertools==8.2.0 # via -r requirements/test.txt, pytest
26-
packaging==20.3 # via -r requirements/test.txt, caniusepython3, pytest
18+
more-itertools==8.3.0 # via -r requirements/test.txt, pytest
19+
packaging==20.4 # via -r requirements/test.txt, pytest
2720
pathlib2==2.3.5 # via -r requirements/test.txt, pytest
2821
pluggy==0.13.1 # via -r requirements/test.txt, pytest
2922
py==1.8.1 # via -r requirements/test.txt, pytest
30-
pycodestyle==2.5.0 # via -r requirements/quality.in
23+
pycodestyle==2.6.0 # via -r requirements/quality.in
3124
pydocstyle==5.0.2 # via -r requirements/quality.in
3225
pylint-celery==0.3 # via edx-lint
3326
pylint-django==2.0.11 # via edx-lint
@@ -36,17 +29,12 @@ pylint==2.4.2 # via edx-lint, pylint-celery, pylint-django, pylint-p
3629
pyparsing==2.4.7 # via -r requirements/test.txt, packaging
3730
pytest-cov==2.8.1 # via -r requirements/test.txt
3831
pytest-django==3.9.0 # via -r requirements/test.txt
39-
pytest==5.4.1 # via -r requirements/test.txt, pytest-cov, pytest-django
32+
pytest==5.4.2 # via -r requirements/test.txt, pytest-cov, pytest-django
4033
pytz==2020.1 # via -r requirements/test.txt, django
41-
requests==2.23.0 # via caniusepython3
42-
six==1.14.0 # via -r requirements/test.txt, astroid, edx-lint, packaging, pathlib2
34+
six==1.15.0 # via -r requirements/test.txt, astroid, edx-lint, packaging, pathlib2
4335
snowballstemmer==2.0.0 # via pydocstyle
4436
sqlparse==0.3.1 # via -r requirements/test.txt, django
4537
typed-ast==1.4.1 # via astroid
46-
urllib3==1.25.9 # via requests
4738
wcwidth==0.1.9 # via -r requirements/test.txt, pytest
4839
wrapt==1.11.2 # via astroid
4940
zipp==1.2.0 # via -r requirements/test.txt, importlib-metadata
50-
51-
# The following packages are considered to be unsafe in a requirements file:
52-
# setuptools

requirements/test.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
attrs==19.3.0 # via pytest
88
coverage==5.1 # via pytest-cov
99
importlib-metadata==1.6.0 # via pluggy, pytest
10-
more-itertools==8.2.0 # via pytest
11-
packaging==20.3 # via pytest
10+
more-itertools==8.3.0 # via pytest
11+
packaging==20.4 # via pytest
1212
pathlib2==2.3.5 # via pytest
1313
pluggy==0.13.1 # via pytest
1414
py==1.8.1 # via pytest
1515
pyparsing==2.4.7 # via packaging
1616
pytest-cov==2.8.1 # via -r requirements/test.in
1717
pytest-django==3.9.0 # via -r requirements/test.in
18-
pytest==5.4.1 # via pytest-cov, pytest-django
18+
pytest==5.4.2 # via pytest-cov, pytest-django
1919
pytz==2020.1 # via -r requirements/base.txt, django
20-
six==1.14.0 # via packaging, pathlib2
20+
six==1.15.0 # via packaging, pathlib2
2121
sqlparse==0.3.1 # via -r requirements/base.txt, django
2222
wcwidth==0.1.9 # via pytest
2323
zipp==1.2.0 # via importlib-metadata

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33
# Note: pylint disable of useless-suppression is required because the errors
44
# are different for python 2.7 and python 3.6.
5-
# pylint: disable=C0111,W6100,useless-suppression
5+
# pylint: disable=C0111,useless-suppression
66
"""
77
Package metadata for xss_utils.
88
"""

tox.ini

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ deps =
3838
commands =
3939
touch tests/__init__.py
4040
pylint xss_utils tests tests_utils manage.py setup.py
41-
pylint --py3k xss_utils tests tests_utils manage.py setup.py
4241
rm tests/__init__.py
4342
pycodestyle xss_utils tests manage.py setup.py
4443
pydocstyle xss_utils tests manage.py setup.py

0 commit comments

Comments
 (0)