Skip to content

Commit 7189320

Browse files
authored
Merge pull request #26 from edx/feanil/remove_drf_pin
Remove the DRF pin.
2 parents 3bbdba2 + f22ad1f commit 7189320

File tree

11 files changed

+27
-13
lines changed

11 files changed

+27
-13
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ python:
33
- 2.7
44
- 3.6
55
env:
6-
- TOXENV=django111
6+
- TOXENV=django111-drf37
7+
- TOXENV=django111-drf38
8+
- TOXENV=django111-drf39
9+
- TOXENV=django111-drflatest
710
matrix:
811
include:
912
- python: 3.6

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ Change Log
1313
1414
Unreleased
1515
~~~~~~~~~~
16+
[1.0.0] - 2019-04-23
17+
~~~~~~~~~~~~~~~~~~~~
18+
Changed
19+
-------
20+
* Unpin django-rest-framework requirements. This is a potentially **breaking change** if people were
21+
relying on this package to ensure the correct version of djangorestframework was being installed.
22+
1623

1724
[0.2.0] - 2018-07-13
1825
~~~~~~~~~~~~~~~~~~~~

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
5858
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
5959
pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
6060
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
61-
# Let tox control the Django version for tests
62-
sed '/^[d|D]jango==/d' requirements/test.txt > requirements/test.tmp
63-
mv requirements/test.tmp requirements/test.txt
61+
# Let tox control the Django and djangorestframework versions for tests
62+
sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
63+
sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
64+
rm requirements/test.txt.tmp
6465

6566
pull_translations: ## pull translations from Transifex
6667
tx pull -a

config_models/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
from __future__ import absolute_import, unicode_literals
66

7-
__version__ = '0.2.2'
7+
__version__ = '1.0.0'
88

99
default_app_config = 'config_models.apps.ConfigModelsConfig' # pylint: disable=invalid-name

requirements/base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
-c constraints.txt
33

44
Django>=1.8,<2 # Web application framework
5-
djangorestframework>=3.6,<3.7
5+
djangorestframework>=3.6

requirements/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
# make upgrade
66
#
77
django==1.11.20
8-
djangorestframework==3.6.4
8+
djangorestframework==3.9.2
99
pytz==2019.1 # via django

requirements/dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ coverage==4.5.3
1919
ddt==1.2.1
2020
distlib==0.2.8
2121
django==1.11.20
22-
djangorestframework==3.6.4
22+
djangorestframework==3.9.2
2323
edx-i18n-tools==0.4.8
2424
edx-lint==1.1.2
2525
filelock==3.0.10

requirements/doc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ chardet==3.0.4 # via requests
1414
coverage==4.5.3
1515
ddt==1.2.1
1616
django==1.11.20
17-
djangorestframework==3.6.4
17+
djangorestframework==3.9.2
1818
docutils==0.14 # via readme-renderer, sphinx
1919
freezegun==0.3.11
2020
idna==2.8 # via requests

requirements/quality.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ coverage==4.5.3
1818
ddt==1.2.1
1919
distlib==0.2.8 # via caniusepython3
2020
django==1.11.20
21-
djangorestframework==3.6.4
21+
djangorestframework==3.9.2
2222
edx-lint==1.1.2
2323
freezegun==0.3.11
2424
idna==2.8 # via requests

requirements/test.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ atomicwrites==1.3.0 # via pytest
88
attrs==19.1.0 # via pytest
99
coverage==4.5.3 # via pytest-cov
1010
ddt==1.2.1
11-
djangorestframework==3.6.4
1211
freezegun==0.3.11
1312
mock==2.0.0
14-
more-itertools==5.0.0
13+
more-itertools==5.0.0 # via pytest
1514
pbr==5.1.3 # via mock
1615
pluggy==0.9.0 # via pytest
1716
py==1.8.0 # via pytest

0 commit comments

Comments
 (0)