Commit graph

869 commits

Author SHA1 Message Date
Baptiste Mispelon
df8d798551 Updated tox.ini to test against Django 1.6. 2014-01-21 17:50:58 +01:00
Bryan Veloso
14c7979e4c Merge branch 'release/3.2' into develop
* release/3.2:
  Bump the version to 3.2.
2014-01-01 15:18:51 -08:00
Bryan Veloso
1ac1a44fc5 Bump the version to 3.2. 2014-01-01 15:17:33 -08:00
Matthew Dapena-Tretter
f113fc7517 Use signal.connect for backwards compat
The receiver decorator isn't available until Django 1.3.
2014-01-01 17:47:36 -05:00
Bryan Veloso
ce9a62c02c Merge branch 'python3' of https://github.com/vstoykov/django-imagekit into vstoykov-python3
* 'python3' of https://github.com/vstoykov/django-imagekit:
  Add Venelin Stoykov to AUTHORS
  Improve logic of contributing ImageSpecFields to Models
  Use force_bytes from imagekit.lib in test_cachefiles
  Remove @vstoykov's note. Seems like the right place to me (:
  Move force_bytes into lib module
  Don't use a raw string with \u escapes
  Fix sanitizing cache key under Python 3
  Add module to sys.modules
  Test for Python 3
  Insert importer at beginning of list
  Delay Django import until needed
  Add Python 3 suport and drop support for Python 2.5

Conflicts:
	imagekit/cachefiles/__init__.py
2013-12-26 17:30:42 -08:00
Bryan Veloso
2ff015a89a Merge branch 'release/3.1' into develop
* release/3.1:
  Tagging 3.1.
2013-12-20 09:20:28 -08:00
Bryan Veloso
452a9c1b31 Tagging 3.1. 2013-12-20 09:18:57 -08:00
Venelin Stoykov
3667c09d82 Add Venelin Stoykov to AUTHORS 2013-12-16 22:38:05 +02:00
Venelin Stoykov
26aa19eeef Improve logic of contributing ImageSpecFields to Models
- If `source` is defined then register source group immediately
- If `source` is not defined then create a signal handler and attach it to
`class_prepared` signal which will see if there is only one ImageField in
the given model.

This will fix problems coused in Python 3 about using ImageSpecField
without providing a `source`.
2013-12-16 10:48:57 +02:00
Venelin Stoykov
8a600d30b3 Use force_bytes from imagekit.lib in test_cachefiles 2013-12-15 01:58:22 +02:00
Matthew Dapena-Tretter
45f10075b6 Remove @vstoykov's note. Seems like the right place to me (: 2013-12-14 13:03:02 -05:00
Matthew Dapena-Tretter
87983c5e6d Move force_bytes into lib module 2013-12-14 13:02:21 -05:00
Matthew Dapena-Tretter
c1e16696b1 Don't use a raw string with \u escapes
Apparently, Python 3.2 doesn't process these in raw strings.
See https://mail.python.org/pipermail/python-list/2012-May/624756.html
and https://mail.python.org/pipermail/python-dev/2007-May/073042.html
2013-12-14 12:54:26 -05:00
Venelin Stoykov
fb947b1937 Fix sanitizing cache key under Python 3 2013-12-14 18:56:47 +02:00
Matthew Dapena-Tretter
68cfcce3f1 Correct reference to generateimage tag
Closes GH-261
2013-12-14 10:50:58 -05:00
Matthew Dapena-Tretter
43afb7c33d Fix celery backend 2013-11-28 00:39:57 -05:00
Matthew Dapena-Tretter
687884224c Merge pull request #258 from mkai/_rq_async_cachefile_backend
Added RQ-based async cache file backend
2013-11-27 20:50:56 -08:00
Markus Kaiserswerth
af3316278d Cache file backends: dropped the "Async" in class names 2013-11-04 13:12:02 +01:00
Markus Kaiserswerth
260c6f5a10 Added RQ-based async cache file backend 2013-10-27 13:27:21 +01:00
Bryan Veloso
2ed1855aa1 Merge branch 'release/3.0.4' into develop
* release/3.0.4:
  Bump the version to 3.0.4.
2013-09-26 10:56:40 -07:00
Bryan Veloso
d6a024ed2d Bump the version to 3.0.4. 2013-09-26 10:56:22 -07:00
Matthew Tretter
5a218e1465 Merge pull request #255 from nex2hex/develop
Add __getstate__ method to ImageCacheFile
2013-09-24 06:24:33 -07:00
nex2hex
1c26a2ea5c Add __getstate__ method to ImageCacheFile 2013-09-24 15:18:59 +04:00
Matthew Tretter
857b1e160e Update IMAGEKIT_DEFAULT_FILE_STORAGE description 2013-09-05 09:42:09 -05:00
Matthew Tretter
bf1b45c943 Add module to sys.modules 2013-09-01 21:56:42 -04:00
Matthew Tretter
2e4d435f4f Test for Python 3 2013-09-01 21:56:28 -04:00
Matthew Tretter
3732b2ee09 Insert importer at beginning of list 2013-09-01 21:55:58 -04:00
Matthew Tretter
183efabca7 Delay Django import until needed 2013-09-01 21:55:37 -04:00
Venelin Stoykov
0575011529 Add Python 3 suport and drop support for Python 2.5 2013-08-19 21:27:50 +03:00
Matthew Tretter
453efac553 Merge branch 'nex2hex/develop' into develop
* nex2hex/develop:
  Update fields.py
2013-08-14 23:40:02 -04:00
Matthew Tretter
c78cbfc089 Discover image generators during lookup
Fixes GH-241
2013-08-14 23:08:40 -04:00
Sean Hayes
d647678c2e Added global boolean to prevent autodiscover() from being called more than once. 2013-08-14 22:55:28 -04:00
nex2hex
1a33c2be51 Update fields.py
Don't overwrite existing image when form saved
2013-08-13 18:52:21 +06:00
Matthew Tretter
bc8fdd7ada Run tests with Django 1.5 2013-07-27 20:50:16 -04:00
Bryan Veloso
144c388689 Merge branch 'release/3.0.3' into develop
* release/3.0.3:
  Bump to 3.0.3.
2013-07-22 10:01:53 -07:00
Bryan Veloso
3be774bbf6 Bump to 3.0.3. 2013-07-22 10:01:20 -07:00
Bryan Veloso
532188bd51 Merge branch 'fix-pending-state' into develop
* fix-pending-state:
  Remove PENDING state
2013-07-22 09:59:08 -07:00
Matthew Tretter
e36290b4ee Woops. It uses the cache if DEBUG is False. 2013-07-17 16:09:02 -04:00
Bryan Veloso
8a709a845c Merge branch 'release/3.0.2' into develop
* release/3.0.2:
  Removing the changelog. Changelogs are hard.
  Bump to 3.0.2.
2013-07-17 11:46:18 -07:00
Bryan Veloso
05ec0c1b33 Removing the changelog. Changelogs are hard. 2013-07-17 11:45:42 -07:00
Bryan Veloso
cae6677994 Bump to 3.0.2. 2013-07-17 11:44:31 -07:00
Matthew Tretter
3444626084 Remove PENDING state
Re: #227
2013-07-16 21:41:10 -04:00
Matthew Tretter
a0c7b3f274 Use == for comparison 2013-07-16 20:40:48 -04:00
Matthew Tretter
f684b4e4e0 Merge branch 'fix-234' into develop 2013-07-16 20:36:36 -04:00
Matthew Tretter
14939faef6 Don't mutate __dict__ 2013-07-13 17:13:58 -04:00
Matthew Tretter
3c04cb852f Don't require source in __setstate__; fixes #234 2013-07-13 17:12:55 -04:00
Matthew Tretter
db6cfcb6ce Add (failing) test for #234 2013-07-13 16:38:49 -04:00
Matthew Tretter
637af70921 Don't include cache in serialization of backend
Fixes #227
2013-06-20 09:17:12 -04:00
Rich Leland
ada883c99f Fixed name of spec id attr 2013-06-13 17:41:30 -04:00
Bryan Veloso
ef05e23b66 Merge branch 'release/3.0.1'
* release/3.0.1:
  Bump version to 3.0.1.
  Fix cache backend fallback
  Fix LazyImageCacheFile.__repr__ and __str__
  Test stringification of LazyImageCacheFiles
  PEP 3110 compat
  Remove unused imports
  Update installation directions; closes #223
  I, for one, welcome our new @matthewwithanm overlords.
  Add import to example
2013-06-11 14:08:38 -07:00