Skip to content

Commit

Permalink
Merge pull request #31 from edx/iahmad/ENT-2501-pin-django-model-utils
Browse files Browse the repository at this point in the history
ENT-2501 Upgraded requirements
  • Loading branch information
irfanuddinahmad authored Dec 18, 2019
2 parents 8854cfe + 48ec54a commit 0708468
Show file tree
Hide file tree
Showing 11 changed files with 233 additions and 206 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ Change Log
.. There should always be an "Unreleased" section for changes pending release.
[1.0.5] - 2019-12-18
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

* Updated requirements.

[1.0.4] - 2019-12-17
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion edx_rbac/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

from __future__ import absolute_import, unicode_literals

__version__ = '1.0.4'
__version__ = '1.0.5'

default_app_config = 'edx_rbac.apps.EdxRbacConfig' # pylint: disable=invalid-name
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Core requirements for using this application

Django>=1.8,<2.0 # Web application framework
django-model-utils # Provides TimeStampedModel abstract base class
django-model-utils<=3.2.0 # Provides TimeStampedModel abstract base class
six
django-crum
edx-drf-extensions
38 changes: 19 additions & 19 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
#
# make upgrade
#
certifi==2019.3.9 # via requests
certifi==2019.11.28 # via requests
chardet==3.0.4 # via requests
django-crum==0.7.3
django-model-utils==3.1.2
django-waffle==0.16.0 # via edx-django-utils, edx-drf-extensions
django==1.11.20
django-crum==0.7.5
django-model-utils==3.2.0
django-waffle==0.18.0 # via edx-django-utils, edx-drf-extensions
django==1.11.26
djangorestframework-jwt==1.11.0 # via edx-drf-extensions
djangorestframework==3.9.4 # via edx-drf-extensions, rest-condition
edx-django-utils==1.0.3 # via edx-drf-extensions
edx-drf-extensions==2.3.0
edx-opaque-keys==0.4.4 # via edx-drf-extensions
future==0.17.1 # via pyjwkest
edx-django-utils==2.0.2 # via edx-drf-extensions
edx-drf-extensions==2.4.5
edx-opaque-keys==2.0.1 # via edx-drf-extensions
future==0.18.2 # via pyjwkest
idna==2.8 # via requests
newrelic==4.20.0.120 # via edx-django-utils
pbr==5.2.0 # via stevedore
newrelic==5.4.0.132 # via edx-django-utils
pbr==5.4.4 # via stevedore
psutil==1.2.1 # via edx-django-utils, edx-drf-extensions
pycryptodomex==3.8.1 # via pyjwkest
pycryptodomex==3.9.4 # via pyjwkest
pyjwkest==1.3.2 # via edx-drf-extensions
pyjwt==1.7.1 # via djangorestframework-jwt
pymongo==3.8.0 # via edx-opaque-keys
python-dateutil==2.8.0 # via edx-drf-extensions
pytz==2019.1 # via django
pymongo==3.10.0 # via edx-opaque-keys
python-dateutil==2.8.1 # via edx-drf-extensions
pytz==2019.3 # via django
requests==2.22.0 # via edx-drf-extensions, pyjwkest
rest-condition==1.0.3 # via edx-drf-extensions
semantic-version==2.6.0 # via edx-drf-extensions
six==1.12.0
stevedore==1.30.1 # via edx-opaque-keys
urllib3==1.25.3 # via requests
semantic-version==2.8.3 # via edx-drf-extensions
six==1.13.0
stevedore==1.31.0 # via edx-opaque-keys
urllib3==1.25.7 # via requests
112 changes: 56 additions & 56 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,92 +5,92 @@
# make upgrade
#
argparse==1.4.0
astroid==1.5.3
astroid==1.6.6
atomicwrites==1.3.0
attrs==19.1.0
backports.functools-lru-cache==1.5
caniusepython3==7.1.0
certifi==2019.3.9
attrs==19.3.0
backports.functools-lru-cache==1.6.1
caniusepython3==7.2.0
certifi==2019.11.28
chardet==3.0.4
click-log==0.3.2
click==7.0
code-annotations==0.3.1
code-annotations==0.3.3
codecov==2.0.15
configparser==3.7.4
contextlib2==0.5.5 # via importlib-metadata
coverage==4.5.3
diff-cover==2.0.1
distlib==0.2.9.post0
django-crum==0.7.3
django-model-utils==3.1.2
django-waffle==0.16.0
django==1.11.20
configparser==4.0.2
contextlib2==0.6.0.post1
coverage==5.0
diff-cover==2.5.0
distlib==0.3.0
django-crum==0.7.5
django-model-utils==3.2.0
django-waffle==0.18.0
django==1.11.26
djangorestframework-jwt==1.11.0
djangorestframework==3.9.4
edx-django-utils==1.0.3
edx-drf-extensions==2.3.0
edx-i18n-tools==0.4.8
edx-lint==1.2.1
edx-opaque-keys==0.4.4
edx-django-utils==2.0.2
edx-drf-extensions==2.4.5
edx-i18n-tools==0.5.0
edx-lint==1.4.1
edx-opaque-keys==2.0.1
enum34==1.1.6
filelock==3.0.12
funcsigs==1.0.2
future==0.17.1
future==0.18.2
futures==3.1.1
idna==2.8
importlib-metadata==0.15 # via path.py
inflect==2.1.0 # via jinja2-pluralize
isort==4.3.20
importlib-metadata==1.3.0
inflect==3.0.2 # via jinja2-pluralize
isort==4.3.21
jinja2-pluralize==0.3.0 # via diff-cover
jinja2==2.10.1
lazy-object-proxy==1.4.1
jinja2==2.10.3
lazy-object-proxy==1.4.3
markupsafe==1.1.1
mccabe==0.6.1
mock==3.0.5
more-itertools==5.0.0
newrelic==4.20.0.120
packaging==19.0
newrelic==5.4.0.132
packaging==19.2
path.py==11.5.2 # via edx-i18n-tools
pathlib2==2.3.3
pbr==5.2.0
pip-tools==3.7.0
pluggy==0.11.0
pathlib2==2.3.5
pbr==5.4.4
pip-tools==4.3.0
pluggy==0.13.1
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1
py==1.8.0
pycodestyle==2.5.0
pycryptodomex==3.8.1
pycryptodomex==3.9.4
pydocstyle==3.0.0
pygments==2.4.1 # via diff-cover
pygments==2.5.2 # via diff-cover
pyjwkest==1.3.2
pyjwt==1.7.1
pylint-celery==0.3
pylint-django==0.7.2
pylint-plugin-utils==0.5
pylint==1.7.6
pymongo==3.8.0
pyparsing==2.4.0
pytest-cov==2.7.1
pytest-django==3.4.8
pytest==4.5.0
python-dateutil==2.8.0
python-slugify==3.0.2
pytz==2019.1
pyyaml==5.1
pylint-django==0.11.1
pylint-plugin-utils==0.6
pylint==1.9.5
pymongo==3.10.0
pyparsing==2.4.5
pytest-cov==2.8.1
pytest-django==3.7.0
pytest==4.6.7
python-dateutil==2.8.1
python-slugify==4.0.0
pytz==2019.3
pyyaml==5.2
requests==2.22.0
rest-condition==1.0.3
scandir==1.10.0
semantic-version==2.6.0
semantic-version==2.8.3
singledispatch==3.4.0.3
six==1.12.0
snowballstemmer==1.2.1
stevedore==1.30.1
text-unidecode==1.2
six==1.13.0
snowballstemmer==2.0.0
stevedore==1.31.0
text-unidecode==1.3
toml==0.10.0
tox-battery==0.5.1
tox==3.12.1
urllib3==1.25.3
virtualenv==16.6.0
tox==3.14.2
urllib3==1.25.7
virtualenv==16.7.9
wcwidth==0.1.7
wrapt==1.11.1
zipp==0.5.1 # via importlib-metadata
wrapt==1.11.2
zipp==0.6.0
82 changes: 43 additions & 39 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,71 @@
#
alabaster==0.7.12 # via sphinx
atomicwrites==1.3.0
attrs==19.1.0
babel==2.6.0 # via sphinx
attrs==19.3.0
babel==2.7.0 # via sphinx
bleach==3.1.0 # via readme-renderer
certifi==2019.3.9
certifi==2019.11.28
chardet==3.0.4
click==7.0
code-annotations==0.3.1
coverage==4.5.3
django-crum==0.7.3
django-model-utils==3.1.2
django-waffle==0.16.0
django==1.11.20
code-annotations==0.3.3
configparser==4.0.2
contextlib2==0.6.0.post1
coverage==5.0
django-crum==0.7.5
django-model-utils==3.2.0
django-waffle==0.18.0
django==1.11.26
djangorestframework-jwt==1.11.0
djangorestframework==3.9.4
doc8==0.8.0
docutils==0.14 # via doc8, readme-renderer, restructuredtext-lint, sphinx
edx-django-utils==1.0.3
edx-drf-extensions==2.3.0
edx-opaque-keys==0.4.4
edx-sphinx-theme==1.4.0
docutils==0.15.2 # via doc8, readme-renderer, restructuredtext-lint, sphinx
edx-django-utils==2.0.2
edx-drf-extensions==2.4.5
edx-opaque-keys==2.0.1
edx-sphinx-theme==1.5.0
funcsigs==1.0.2
future==0.17.1
future==0.18.2
idna==2.8
imagesize==1.1.0 # via sphinx
jinja2==2.10.1
importlib-metadata==1.3.0
jinja2==2.10.3
markupsafe==1.1.1
mock==3.0.5
more-itertools==5.0.0
newrelic==4.20.0.120
packaging==19.0 # via sphinx
pathlib2==2.3.3
pbr==5.2.0
pluggy==0.11.0
newrelic==5.4.0.132
packaging==19.2
pathlib2==2.3.5
pbr==5.4.4
pluggy==0.13.1
psutil==1.2.1
py==1.8.0
pycryptodomex==3.8.1
pygments==2.4.1 # via readme-renderer, sphinx
pycryptodomex==3.9.4
pygments==2.5.2 # via readme-renderer, sphinx
pyjwkest==1.3.2
pyjwt==1.7.1
pymongo==3.8.0
pyparsing==2.4.0 # via packaging
pytest-cov==2.7.1
pytest-django==3.4.8
pytest==4.5.0
python-dateutil==2.8.0
python-slugify==3.0.2
pytz==2019.1
pyyaml==5.1
pymongo==3.10.0
pyparsing==2.4.5
pytest-cov==2.8.1
pytest-django==3.7.0
pytest==4.6.7
python-dateutil==2.8.1
python-slugify==4.0.0
pytz==2019.3
pyyaml==5.2
readme-renderer==24.0
requests==2.22.0
rest-condition==1.0.3
restructuredtext-lint==1.3.0 # via doc8
scandir==1.10.0
semantic-version==2.6.0
six==1.12.0
snowballstemmer==1.2.1 # via sphinx
semantic-version==2.8.3
six==1.13.0
snowballstemmer==2.0.0 # via sphinx
sphinx==1.8.5
sphinxcontrib-websupport==1.1.2 # via sphinx
stevedore==1.30.1
text-unidecode==1.2
typing==3.6.6 # via sphinx
urllib3==1.25.3
stevedore==1.31.0
text-unidecode==1.3
typing==3.7.4.1 # via sphinx
urllib3==1.25.7
wcwidth==0.1.7
webencodings==0.5.1 # via bleach
zipp==0.6.0
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# make upgrade
#
click==7.0 # via pip-tools
pip-tools==3.7.0
six==1.12.0 # via pip-tools
pip-tools==4.3.0
six==1.13.0 # via pip-tools
Loading

0 comments on commit 0708468

Please sign in to comment.