diff options
| author | Tom Christie | 2015-02-06 14:35:06 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-02-06 14:35:06 +0000 |
| commit | 3dff9a4fe2952cf632ca7f4cd9ecf4221059ca91 (patch) | |
| tree | 0649d42b20b875e97cb551b987644b61e7860e84 /requirements.txt | |
| parent | c06a82d0531f4cb290baacee196829c770913eaa (diff) | |
| parent | 1f996128458570a909d13f15c3d739fb12111984 (diff) | |
| download | django-rest-framework-3dff9a4fe2952cf632ca7f4cd9ecf4221059ca91.tar.bz2 | |
Resolve merge conflictmodel-serializer-caching
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index fe5edbe7..cb044958 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,15 +2,15 @@ Django>=1.4.11 # Test requirements -pytest-django==2.6 -pytest==2.5.2 +pytest-django==2.8.0 +pytest==2.6.4 pytest-cov==1.6 flake8==2.2.2 # Optional packages markdown>=2.1.0 django-guardian==1.2.4 -django-filter>=0.5.4 +django-filter>=0.9.2 # wheel for PyPI installs wheel==0.24.0 |