Commit Graph

408 Commits

Author SHA1 Message Date
Hugo
c98cf32269
Merge pull request #3794 from radarhere/openjpeg
Updated openjpeg to 2.3.1
2019-04-20 11:06:22 +03:00
Andrew Murray
47a06938c8 Added OpenJPEG to Python 3 AppVeyor 2019-04-17 20:55:31 +10:00
Andrew Murray
c6b69c4ab4 Updated PyPy to 7.1.1 2019-04-17 19:56:13 +10:00
Andrew Murray
23b1d13045 Corrected OpenJPEG URL 2019-04-15 18:13:34 +10:00
Andrew Murray
af59955d04 Updated openjpeg to 2.3.1 2019-04-15 18:13:34 +10:00
Andrew Murray
6b59e060bb Added Freetype to AppVeyor 2019-04-06 12:56:29 +11:00
Andrew Murray
84dc0ea1a6 Updated Ghostscript to 9.27 2019-04-06 12:42:29 +11:00
Andrew Murray
9e03c9d232 Changed Visual Studio 2008 to 2010 2019-04-06 12:41:59 +11:00
Hugo
d7776c66e2 AppVeyor: upgrade to PyPy 7.1.0 2019-03-26 17:58:30 +02:00
Andrew Murray
15f8ef02c9 Updated freetype to 2.10.0 2019-03-22 21:14:39 +11:00
Andrew Murray
186a52ca01 Retry on URLError 2019-03-12 20:44:00 +11:00
Andrew Murray
d5f89c0548 Updated PyPy to 7.0.0 2019-02-07 19:20:45 +11:00
Hugo
d880d41a14 Flake8: Fix E117 over-indented (comment) 2019-01-30 11:38:19 +02:00
Hugo
a0b15e84d7 Fix Flake8 2019-01-27 11:38:33 +02:00
Hugo
6eab984b0f Drop support for EOL Python 3.4 2019-01-24 23:41:28 +02:00
Hugo
d6055440d5 Drop support for EOL Python 3.4 2019-01-24 23:33:14 +02:00
Hugo
74ce856515
Merge pull request #3587 from radarhere/gs
Added Ghostscript to AppVeyor
2019-01-24 23:32:20 +02:00
Andrew Murray
491fb5ab91 Updated libwebp to 1.0.2 2019-01-24 20:29:30 +11:00
Andrew Murray
75c7504d93 Added Ghostscript to AppVeyor 2019-01-17 11:15:42 +11:00
Hugo
c353225851 Prefer 'except Exception:' to bare 'except:' 2018-12-04 23:25:28 +02:00
Hugo
f3c1f08f5b noqa the few remaining long and hard-to-split lines 2018-12-04 23:25:27 +02:00
Hugo
891c15709c
Merge pull request #3465 from radarhere/tktcl
Updated Tk Tcl to 8.6.9
2018-12-01 22:46:24 +02:00
Hugo
c68058c045
Merge pull request #3468 from radarhere/libwebp
Updated libwebp to 1.0.1
2018-12-01 22:45:55 +02:00
Andrew Murray
e2a1ad329f Changed libtiff to use .tar.gz 2018-11-19 22:46:27 +11:00
Andrew Murray
130b8b3971 Updated libtiff to 4.0.10 2018-11-19 22:45:39 +11:00
Andrew Murray
ea8a80ba31 Updated libwebp to 1.0.1 2018-11-17 19:55:24 +11:00
Andrew Murray
06eab8b2a0 Removed unused function 2018-11-17 19:44:13 +11:00
Andrew Murray
bbb4bdcd9e Updated Tk Tcl to 8.6.9 2018-11-17 12:32:08 +11:00
Hugo
ceebfc6fe8 flake8: E501 line too long 2018-11-11 19:01:11 +02:00
Andrew Murray
d1f9803aeb Expected 2 blank lines, found 1 2018-10-21 18:00:39 +11:00
Andrew Murray
94b3e53496 Missing whitespace after ':' 2018-10-21 18:00:16 +11:00
Hugo
866658eadf Use a newer Python for the virtualenv for PyPy 2018-10-19 22:02:47 +03:00
Andrew Murray
3d8024c45f Removed unused line 2018-10-09 06:11:09 +11:00
Andrew Murray
afb6ba5626 Added Python 3.5-3.7 AppVeyor builds 2018-10-08 19:43:11 +11:00
Konstantin Kopachev
e102f4848b
Fix libtiff build on windows 2018-09-18 12:05:50 -07:00
Andrew Murray
fe236fe732 Create pacman package cache directory 2018-09-18 21:47:10 +10:00
Andrew Murray
fb4d762a2f Download lib if not present in pillow-depends 2018-08-24 20:12:12 +10:00
Andrew Murray
d372837b08 Revert "Temporarily use --no-cache-dir for pip on mingw32" 2018-07-23 05:41:27 +10:00
Alex Clark
531f13828a Remove link to 404 for #3167 [ci skip]
This doc may be outdated …
2018-06-30 19:01:04 -04:00
Hugo
35ae130d28
Merge pull request #3166 from radarhere/winbuild
Update CMake download URL
2018-06-14 09:30:18 +03:00
Hugo
6346c693e8 Temporarily use --no-cache-dir for pip on mingw32 2018-06-11 17:31:00 +03:00
Andrew Murray
ccf267c6f0 Updated URL [ci skip] 2018-06-09 10:27:03 +10:00
Andrew Murray
4d7fa5f115 Updated winbuild python versions 2018-05-25 19:49:14 +10:00
Hugo
c46566cc6e
Merge pull request #3133 from hugovk/upgrade-appveyor-to-pypy-6.0.0
AppVeyor: upgrade to PyPy 6.0.0
2018-05-24 17:19:41 +03:00
Andrew Murray
e92ef63cac Updated libjpeg to 9c 2018-05-18 20:56:55 +10:00
Hugo
1a61ab2f23 AppVeyor: upgrade to PyPy 6.0.0 2018-05-17 16:10:01 +03:00
Andrew Murray
7206f95061 Updated freetype to 2.9.1 2018-05-04 19:35:59 +10:00
Andrew Murray
001c2fec88 Updated libwebp to 1.0.0 2018-04-23 10:27:40 +10:00
Andrew Murray
db7d483531 Removed winbuild gitignore 2018-04-02 13:04:33 +10:00
Andrew Murray
c192c47b02 Fixed msys64 build 2018-03-17 19:04:14 +11:00
Andrew Murray
2202196162 Flake8 blank line fixes 2018-03-04 21:36:33 +11:00
Andrew Murray
4690652456 Updated pypy version 2018-02-27 20:01:22 +11:00
Andrew Murray
19590874a8 Fixed link [ci skip] 2018-02-09 20:56:10 +11:00
Andrew Murray
cbb0c8fc53 Changed build instructions path to link [ci skip] 2018-02-09 20:55:24 +11:00
Andrew Murray
60002b4a90 Changed path to build instructions [ci skip] 2018-02-09 20:16:21 +11:00
Andrew Murray
4afed260dc Updated freetype to 2.9 2018-01-13 06:26:42 +11:00
hugovk
5592163564 pytest no longer supports EOL Python 3.3 2017-12-28 14:48:19 +00:00
Hugo
3515ae3d9e Test with coverage on Windows, update 'setup.py test' 2017-12-28 14:48:19 +00:00
Andrew Murray
3db497a0a5 Updated Tk Tcl to 8.6.8 2017-12-23 08:26:56 +11:00
Andrew Murray
c177b46b4a Updated libwebp to 0.6.1 2017-12-05 06:05:55 +11:00
Andrew Murray
79ad49a8cd Updated libtiff to 4.0.9 2017-11-23 05:10:42 +11:00
Andrew Murray
8bd2b14df8 Updated openjpeg to 2.3.0 2017-10-05 20:11:31 +11:00
Eric Soroos
5c77fbb29f test mingw 2017-09-19 21:19:18 +00:00
Andrew Murray
3852df109c Updated freetype to 2.8.1 2017-09-17 11:44:39 +10:00
wiredfool
946fe2eedb Merge pull request #2669 from radarhere/openjpeg
Updated openjpeg to 2.2.0
2017-08-16 15:40:17 +01:00
Andrew Murray
23716a57cf Updated openjpeg to 2.2.0 2017-08-11 00:01:38 +10:00
Andrew Murray
6c5eaf57e1 Updated Tk Tcl to 8.6.7 2017-08-10 19:09:30 +10:00
wiredfool
bc5f9a3e8b add pypy to appveyor 2017-07-03 23:05:25 +01:00
Jon Dufresne
d244fbb299 Remove unnecessary calls to dict.keys()
iter(dict) is equivalent to iter(dict.keys()), so simply act on the dict
instead of adding the extra call.

Inspired by Lennart Regebro's PyCon 2017 presentation "Prehistoric
Patterns in Python". Available at:

https://www.youtube.com/watch?v=V5-JH23Vk0I
2017-05-28 09:55:38 -07:00
Andrew Murray
e40f32ab7d Updated libtiff to 4.0.8 2017-05-22 19:34:50 +10:00
Andrew Murray
13824d4d70 Updated freetype to 2.8 2017-05-18 19:08:20 +10:00
Andrew Murray
8cd70e74cc Set executable flag on scripts with shebang line 2017-03-31 19:43:19 +11:00
Andrew Murray
7ea1960755 Corrected libtiff URL 2017-03-27 20:04:42 +11:00
Andrew Murray
78754327c5 Removed winbuild checksum verification 2017-03-27 09:08:16 +11:00
Andrew Murray
298d20a082 Updated libtiff to 4.0.7 2017-03-25 23:13:00 +11:00
Andrew Murray
0f383d7c7e Removed unused private functions 2017-02-18 16:29:26 +11:00
wiredfool
b2dd8f2afe Merge pull request #2395 from radarhere/libwebp
Updated libwebp to 0.6.0
2017-02-17 13:55:03 +00:00
Hugo
53e5702557 Update http to https 2017-02-14 11:27:02 +02:00
Andrew Murray
75ca512c02 Updated libwebp to 0.6.0 2017-02-09 19:14:25 +11:00
Andrew Murray
a3d81e0677 Updated zlib to 1.2.11 2017-01-17 19:36:04 +11:00
wiredfool
b154811b62 Merge pull request #2332 from radarhere/zlib
Updated zlib to 1.2.10
2017-01-16 11:12:30 +00:00
wiredfool
30683ec938 Merge pull request #2331 from radarhere/freetype
Updated freetype to 2.7.1
2017-01-16 11:10:37 +00:00
hugovk
bbb0ab9101 Fix invalid string escapes 2017-01-12 21:28:24 +02:00
Andrew Murray
60bb13a89a Updated zlib to 1.2.10 2017-01-04 11:44:36 +11:00
Andrew Murray
49fc3f175f Updated freetype to 2.7.1 2017-01-02 14:32:08 +11:00
Hugo
cd42d646b7 Merge pull request #2290 from radarhere/freetype
Update FreeType to 2.7
2016-12-25 11:16:21 +02:00
Andrew Murray
e2c2251cab Updated libwebp to 0.5.2 2016-12-22 19:40:06 +11:00
Andrew Murray
574c0a4f5b Updated freetype to 2.7 2016-12-17 22:16:33 +11:00
wiredfool
99b7161a85 Merge pull request #2235 from radarhere/tktcl
Updated Tk Tcl to 8.6.6
2016-11-22 12:46:18 +00:00
wiredfool
3265f2e50b Merge pull request #2236 from radarhere/webp
Updated libwebp to 0.5.1
2016-11-22 12:45:42 +00:00
wiredfool
3c7df34206 Merge pull request #2237 from radarhere/openjpeg
Updated openjpeg to 2.1.2
2016-11-22 12:45:20 +00:00
Jon Dufresne
85cf6d3140 Drop support for Python 3.2 2016-11-22 04:24:40 -08:00
Jon Dufresne
dbe9f85c7d Drop support for Python 2.6
* Drop unittest2 requirement
* Use set literals
* Use dict/set comprehension
* Use str.format() automatic numbering
2016-11-22 04:23:55 -08:00
Andrew Murray
dc0d4f8db6 Updated openjpeg to 2.1.2 2016-11-19 18:22:53 +11:00
Andrew Murray
7ca183743f Updated libwebp to 0.5.1 2016-11-19 17:29:59 +11:00
Andrew Murray
5cfbba5f5f Updated Tk Tcl to 8.6.6 2016-11-19 17:26:51 +11:00
hugovk
4ab97ac590 Reinstate URLs as minimal documentation for where files came from 2016-09-15 11:15:23 +03:00
hugovk
dedb081203 Remove SF_MIRROR 2016-08-29 15:08:06 +03:00
hugovk
99945b5287 flake8 2016-08-29 15:06:48 +03:00
hugovk
5a0104f64d Extract libs from pillow-depends 2016-08-29 14:53:48 +03:00
hugovk
ad3aa0c196 Unix EOL (no other changes) 2016-08-29 13:48:59 +03:00
Andrew Murray
53ffd26e62 Updated freetype to 2.6.5 2016-07-19 20:19:34 +10:00
Andrew Murray
5e5bda95e0 Removed trailing whitespace 2016-06-30 20:12:50 +01:00
wiredfool
3657bc10a6 Merge pull request #1889 from rr-/libpngquant
Add libimagequant support in quantize()
2016-05-26 21:12:25 +01:00
wiredfool
710126e32c Added wheel builds/artifact 2016-05-24 03:49:41 -07:00
Andrew Murray
a69e477605 Corrected indentation 2016-05-10 21:35:47 +10:00
rr-
c5278000c5 Skip libimagequant's test if it's unavailable 2016-05-06 21:40:18 +02:00
wiredfool
0c97af69bf print stdout as well 2016-05-06 09:10:10 -07:00
Andrew Murray
558fb99107 Updated Tk and Tcl to 8.6.5 2016-03-05 12:16:23 +11:00
Andrew Murray
8ca0429f02 Updated Tk and Tcl to 8.5.19 2016-03-05 12:16:23 +11:00
Andrew Murray
349c1654c3 Updated freetype to 2.6.3 2016-02-10 22:40:16 +11:00
Andrew Murray
a4384c9567 Corrected AppVeyor testing status documentation [ci skip] 2016-02-02 21:24:23 +11:00
wiredfool
9d9a995c72 Merge pull request #1673 from radarhere/jpeg
Updated jpeg to 9b
2016-01-31 09:05:12 -08:00
Andrew Murray
fcbd054f36 Updated jpeg to 9b 2016-01-21 19:50:36 +11:00
wiredfool
c9f3abf7ac moved build.rst out of the doctree to suppress warnings, as this documentation is work in progress and not up to the standards of the rest of the documentation 2016-01-16 13:37:20 +00:00
Andrew Murray
0d1e373073 Updated libwebp to 0.5.0 2015-12-25 14:46:00 +11:00
Andrew Murray
8440696bc5 Updated freetype to 2.6.2 2015-12-02 15:07:09 +11:00
Andrew Murray
b687e1d1b5 Updated WebP to 0.4.4 2015-10-30 19:00:36 +11:00
Andrew Murray
9a2903bf5b Changed 32 bit to 32-bit and 64 bit to 64-bit 2015-10-15 00:49:03 +11:00
Andrew Murray
89fb9965ef Capitalised Python and Pillow 2015-10-11 21:27:43 +11:00
wiredfool
c4a16b6967 Merge pull request #1485 from hugovk/update_pythons
Windows build: Update Pythons to latest with .msi
2015-10-10 13:41:21 -07:00
hugovk
b3aa92dc75 Update Pythons to latest with msi 2015-10-10 12:11:00 +03:00
hugovk
8d2dd25786 Update Pythons to latest with msi 2015-10-10 11:22:43 +03:00
Andrew Murray
28006edd6b Updated freetype to 2.6.1 2015-10-08 19:06:21 +11:00
Andrew Murray
1306f7d6af Updated URLs for redirects 2015-09-28 21:53:25 +10:00
Andrew Murray
cf1a1e0893 Updated libtiff to 4.0.6 2015-09-14 19:34:19 +10:00
Andrew Murray
63e54260d2 Updated libtiff to 4.0.5 2015-09-01 19:10:59 +10:00
Andrew Murray
c6b13d294f Flake8 fixes 2015-08-25 22:27:18 +10:00
hugovk
02caa81bfe Merge remote-tracking branch 'upstream/master' into flake8_winbuild
Conflicts:
	winbuild/config.py
2015-06-30 09:46:11 +03:00
wiredfool
26e6bb25ef updated tcl/tk extract directories 2015-06-26 10:08:40 -07:00
hugovk
eb73fe3bdb flake8 2015-06-26 10:39:13 +03:00
Andrew Murray
36fc250a52 Updated tiff and tk tcl 8.5 versions 2015-06-26 11:01:40 +10:00
Andrew Murray
bbf3b52357 Flake8 fixes 2015-06-20 14:46:04 +10:00
Andrew Murray
8a7080cbce Health fixes 2015-06-20 14:41:47 +10:00
wiredfool
4aa925d749 tcl support 2015-06-19 16:27:42 -07:00
wiredfool
5f143a73a3 lcms2 for everything but VC2008/64 2015-06-19 15:36:59 -07:00
wiredfool
a789c58bf3 working webp build for both x86 and x64 2015-06-18 22:44:33 -07:00
wiredfool
54d159bd42 multiprocess build creates race conditions in temp build directories 2015-06-18 22:44:18 -07:00
wiredfool
f1f6835170 Merge pull request #1287 from radarhere/winbuild_python
Updated windbuild to python 3.4.3
2015-06-18 21:03:11 -07:00
wiredfool
2156fdc419 Merge pull request #1286 from radarhere/config
Updated winbuild config
2015-06-18 21:00:46 -07:00
Andrew Murray
c634b47577 Updated winbuild Python version to 3.4.3 2015-06-19 13:23:23 +10:00
Andrew Murray
4a82429708 Updated libwebp and lcms2 versions 2015-06-19 11:26:34 +10:00
Andrew Murray
c870ee3d62 Removed alternate mirror 2015-06-19 11:25:52 +10:00
Andrew Murray
b502645350 Removed unnecessary comments 2015-06-19 11:13:26 +10:00
Andrew Murray
be5c97e501 Fixed typo 2015-06-19 10:47:47 +10:00
Andrew Murray
d35ecbef84 Fixed various typos 2015-06-17 09:02:32 +10:00
wiredfool
02ca00d493 Merge branch 'winbuild' of github.com:wiredfool/Pillow into winbuild 2015-06-16 13:31:47 -07:00
wiredfool
f793cb74eb removed obsolete 2015-06-16 13:30:57 -07:00
wiredfool
159b01f54b fix imports 2015-06-16 13:29:41 -07:00
wiredfool
9e0242226a Updated Readme -- working locally and on appveyor 2015-06-16 09:39:08 -07:00
wiredfool
61312d0a52 race condition in font.png, single thread master tests. Add return code, clarify output 2015-06-16 09:25:36 -07:00
wiredfool
ac50350f3d fix pythonpath for virtualenvs 2015-06-16 09:24:51 -07:00
wiredfool
ccf9eb5628 testing obsolescence 2015-06-15 22:25:48 -07:00
wiredfool
1bdb3653d0 delegate to env variable for x64 extension, is -x64 on appveyor, has been x64 elsewhere 2015-06-15 17:49:25 -07:00
wiredfool
07eea7be52 updated freetype, working ft builds on vc2010 2015-06-11 20:35:21 -07:00
wiredfool
ee71e8a80e sigh 2015-06-11 13:40:46 -07:00
wiredfool
a69a47c042 refactoring for PYTHON environment 2015-06-11 13:11:26 -07:00
wiredfool
680310c7e2 use the PYTHON environment variable to choose the python 2015-06-11 10:55:42 -07:00
wiredfool
49c100515b build libs based on the python environment variable for appveyor 2015-06-10 16:42:12 -07:00
wiredfool
2c28d5365a lets not do lcms either right now 2015-06-10 15:30:57 -07:00
wiredfool
8f3540b9f9 need to detect the right compiler 2015-06-10 15:19:21 -07:00
wiredfool
69f49a1b91 in-progress appveyor path 2015-06-10 15:05:29 -07:00
wiredfool
ca52d5630d relative path for cmake 2015-06-10 15:03:32 -07:00
wiredfool
b73a4dc5ff name change 2015-06-10 14:37:25 -07:00
wiredfool
8124851534 platforms for appveyor 2015-06-10 14:37:08 -07:00
wiredfool
2334d278d4 in-progress, 27x64 build, appveyor 2015-06-10 13:16:17 -07:00
wiredfool
304e8add46 working build on all 4 compilers 2014-08-22 21:36:28 -07:00
wiredfool
3e219d818c just build the libs, not the progs 2014-08-22 21:35:56 -07:00
wiredfool
9c6a9172c0 works with nose/unittest 2014-08-22 21:35:01 -07:00
wiredfool
4e3bc5558d clean all of lcms2 2014-08-22 17:07:08 -07:00
wiredfool
c95515ec52 only build tiff libs 2014-08-22 17:06:30 -07:00
wiredfool
e99631125d working webp build 2014-08-22 17:06:11 -07:00
wiredfool
f6dd5d3dbb new openjpeg2k 2014-08-22 16:15:37 -07:00
wiredfool
b2ea0941f7 working lcms2 build 2014-08-22 16:14:19 -07:00
wiredfool
4f32ddeec4 non-workign attempt at trying the openjpeg binaries 2014-06-11 06:36:03 +00:00
wiredfool
38a269d561 merge out of sync winbuilds 2014-06-11 05:26:03 +00:00
wiredfool
7a1563576e working on openjpeg 2014-06-11 05:22:28 +00:00
wiredfool
81af4bf9d7 successful build of openjpeg -- unsuccessful linking 2014-06-05 22:35:04 +00:00
wiredfool
991aeed975 debugging updates 2014-06-05 00:09:50 +00:00
wiredfool
3a484bab09 basic readme + pointer 2014-04-04 16:44:56 -07:00
wiredfool
251749b110 python/multiprocessing build process + clean/dist options 2014-04-04 16:29:58 -07:00
wiredfool
2f7bbffb5b waiting to read stdout was blocking when the buffer filled 2014-04-04 15:18:14 -07:00
wiredfool
4e6ea0fc42 test runner 2014-04-04 14:57:18 -07:00
wiredfool
1ad678a5ea build pillow for all the pythons 2014-04-04 13:01:07 -07:00
wiredfool
95b79926de factored out config 2014-04-04 13:00:52 -07:00
wiredfool
a5377fd4b0 apparently successful builds for everything ex. lcms2 2014-03-31 19:50:52 -07:00
wiredfool
d0c2de89ab inprogress -- webp 2014-03-24 22:38:45 -07:00
wiredfool
590691d23d scripted python fetching, checksumming, build script writing 2014-03-24 22:09:53 -07:00
wiredfool
354c6333f3 tiff merge 2014-03-20 05:36:08 +00:00
wiredfool
953dfb0943 virtualenv 2014-03-20 05:35:44 +00:00
wiredfool
30c06dee8d changes required for libtiff to build with jpeg/zlib 2014-03-20 05:35:07 +00:00
wiredfool
a2c2a83162 reported successful build using tkinter, jpeg, zlib, libtiff, and freetype 2014-03-19 17:20:35 +00:00
wiredfool
00ce7ed292 reported successful build using tkinter, jpeg, zlib, libtiff, and freetype 2014-03-19 17:20:22 +00:00
wiredfool
6fbe8d5406 individual/incremental build 2014-03-19 17:19:33 +00:00
wiredfool
7ec906a131 incremental 2014-03-19 17:18:52 +00:00
wiredfool
6611301fe7 got all the headers 2014-03-19 17:05:25 +00:00
wiredfool
e4d9c315b9 winbuild/build_dep.cmd~ 2014-03-19 17:05:00 +00:00
wiredfool
4b6c813290 slash direction 2014-03-19 06:26:39 +00:00
wiredfool
c9fdded963 take 1 on libtiff 2014-03-18 23:00:18 -07:00
wiredfool
b5cffa7d47 case 2014-03-19 05:52:42 +00:00
wiredfool
2405a8e1be lcms is failing with an incorrect version of the solution file 2014-03-19 05:48:56 +00:00
wiredfool
461bc212e3 Merge branch 'winbuild' of https://github.com/wiredfool/Pillow into winbuild 2014-03-19 05:35:03 +00:00
wiredfool
684c922cc6 working tweaks 2014-03-19 05:34:53 +00:00
wiredfool
74794d473f take 1 at lcms2 2014-03-18 22:32:13 -07:00
wiredfool
095c3d6260 Merge branch 'winbuild' of https://github.com/wiredfool/Pillow into winbuild 2014-03-19 05:08:25 +00:00
wiredfool
b2a52caad9 take 1 at libjpeg 2014-03-18 22:07:52 -07:00
wiredfool
21130a10a5 apparently working freetype build 2014-03-19 04:50:34 +00:00
wiredfool
1c7f68c1c1 depends --inprogress see #553 2014-03-18 20:59:42 -07:00