Browse Source

Bump several dependencies for Python 3 compatibility

Debug toolbar 1.2 has some more usable panels, and less trouble with
jQuery interactions. It also is the first version to be compatible with
Django 1.7, which we'll support in the upcoming Oscar release.

django-compressor 1.4 has finally been released and supports Python 3
and comes with lots of other goodies.

sorl-thumbnail seems to be barely maintained anymore. I don't dare
switch to the beta version for Python 2. There's a few critical issues
reported on their issue tracker atm:
https://github.com/mariocesar/sorl-thumbnail/issues?labels=critical&page=1&state=open

django-nose-querycount is not Python 3 compatible and has been moved.
master
Maik Hoepfel 11 years ago
parent
commit
89598e3f42
3 changed files with 5 additions and 10 deletions
  1. 2
    3
      requirements.txt
  2. 1
    0
      requirements_py2.txt
  3. 2
    7
      setup.py

+ 2
- 3
requirements.txt View File

@@ -1,6 +1,6 @@
1 1
 # Development
2
-django-debug-toolbar>=1.0.1,<1.1
3
-django-debug-toolbar-template-timings>=0.5.5
2
+django-debug-toolbar>=1.2.1,<1.3
3
+django-debug-toolbar-template-timings==0.6.1
4 4
 django-extensions>=1.3.3,<1.4.0
5 5
 Werkzeug>=0.9.4,<0.10
6 6
 
@@ -27,7 +27,6 @@ tox==1.6.1
27 27
 coveralls>=0.1.1,<0.2
28 28
 purl>=0.4
29 29
 behave==1.2.3
30
-nose-django-querycount==0.3
31 30
 factory-boy==2.3.1
32 31
 
33 32
 # Misc

+ 1
- 0
requirements_py2.txt View File

@@ -4,3 +4,4 @@
4 4
 
5 5
 detox==0.9.3
6 6
 transifex-client==0.10
7
+nose-django-querycount==0.3

+ 2
- 7
setup.py View File

@@ -48,12 +48,12 @@ setup(name='django-oscar',
48 48
           # Treebeard is used for categories
49 49
           'django-treebeard==2.0',
50 50
           # Sorl is used as the default thumbnailer
51
-          'sorl-thumbnail==12.00' if PY3 else 'sorl-thumbnail==11.12',
51
+          'sorl-thumbnail==11.12.1b' if PY3 else 'sorl-thumbnail==11.12',
52 52
           # Babel is used for currency formatting
53 53
           'Babel>=1.0,<1.4',
54 54
           # Oscar's default templates use compressor (but you can override
55 55
           # this)
56
-          'django-compressor==1.4a1' if PY3 else 'django-compressor==1.3',
56
+          'django-compressor==1.4',
57 57
           # For converting non-ASCII to ASCII when creating slugs
58 58
           'Unidecode>=0.04.12,<0.05',
59 59
           # For manipulating search URLs
@@ -63,11 +63,6 @@ setup(name='django-oscar',
63 63
           # Python 2 & 3 compatibility helper
64 64
           'six>=1.5.2',
65 65
       ],
66
-      # tarballs for unreleased packages
67
-      dependency_links = [
68
-          'http://github.com/mariocesar/sorl-thumbnail/tarball/34e1ffa2a1bcbf048541dd28db3a78d9d9b93ad7#egg=sorl-thumbnail-12.00',
69
-          'http://github.com/django-compressor/django-compressor/tarball/aba8c5f6b59dd78831d2bf1e53222f8475b2f9f8#egg=django-compressor-1.4a1',
70
-      ],
71 66
       # See http://pypi.python.org/pypi?%3Aaction=list_classifiers
72 67
       classifiers=[
73 68
           'Development Status :: 4 - Beta',

Loading…
Cancel
Save