Commit Graph

3631 Commits

Author SHA1 Message Date
Alex Clark
d29c3937ee Merge pull request #1302 from hugovk/1301_integer_expected
DPI should be tuple of ints, not floats
2015-06-30 07:57:28 -04:00
Alex Clark
356929f0f8 Merge pull request #1298 from hugovk/flake8_winbuild
Flake8 style changes for winbuild
2015-06-30 07:56:41 -04:00
Alex Clark
4298b317ef Merge pull request #1317 from hugovk/run-check-manifest-on-travis
Check manifest on Travis CI
2015-06-30 07:52:43 -04:00
hugovk
02caa81bfe Merge remote-tracking branch 'upstream/master' into flake8_winbuild
Conflicts:
	winbuild/config.py
2015-06-30 09:46:11 +03:00
hugovk
593a910e92 Unit test and image: convert hopper.png hopper.bmp 2015-06-30 07:09:35 +03:00
Alex Clark
75be4af068 Merge pull request #1282 from radarhere/eoferror
Frame position when seeking past the end of file
2015-06-29 20:16:15 -04:00
hugovk
24eceff7df Run check-manifest 2015-06-29 16:58:53 +03:00
Alex Clark
96944e2dd6 Bump 2015-06-29 08:57:55 -04:00
Hugo van Kemenade
fc18f08eb5 Update CHANGES.rst [CI skip] 2015-06-29 10:22:03 +03:00
Hugo van Kemenade
06a2f4bf76 Merge pull request #1316 from radarhere/patch-1
Fixed ValueError in Python 2.6
2015-06-29 10:20:26 +03:00
Hugo van Kemenade
bcf93b6d3e Merge pull request #1315 from cgohlke/patch-1
TST: fix ValueError on Python 2.6
2015-06-29 10:20:04 +03:00
Andrew Murray
29cb7d24b8 Fixed ValueError in Python 2.6 2015-06-29 14:59:05 +10:00
Christoph Gohlke
3dd3c4e28c TST: fix ValueError on Python 2.6 2015-06-28 20:50:17 -07:00
Alex Clark
efe925c26f Fix manifest [ci skip] 2015-06-28 15:07:01 -04:00
Alex Clark
7a3268d4ae Set default makefile target
"make" runs release test
2015-06-28 14:57:51 -04:00
Hugo van Kemenade
9275c2561b Merge pull request #1311 from radarhere/patch-1
Fixed typo
2015-06-28 08:18:27 +03:00
Andrew Murray
46fad0fd63 Fixed typo 2015-06-28 12:03:11 +10:00
Hugo van Kemenade
552e7a579b Update CHANGES.rst [CI skip] 2015-06-27 20:53:32 +03:00
Hugo van Kemenade
21f73f26ca Merge pull request #1308 from radarhere/tox
Fixed tox test script path
2015-06-27 20:52:51 +03:00
Andrew Murray
1c7a140298 Fixed tox test script path 2015-06-27 09:10:01 +10:00
wiredfool
0c3615e3c7 Merge pull request #1306 from wiredfool/tcl85_update
Updated tcl/tk extract directories
2015-06-26 10:25:15 -07:00
wiredfool
26e6bb25ef updated tcl/tk extract directories 2015-06-26 10:08:40 -07:00
wiredfool
77f45aa402 Workaround for clone failing
Workaround for https://github.com/appveyor/ci/issues/315
2015-06-26 09:04:04 -07:00
Hugo van Kemenade
4260a76175 Merge pull request #1305 from radarhere/sizedocs
Documentation for width and height properties
2015-06-26 13:16:32 +03:00
Andrew Murray
65f5f05b4f Added documentation for width and height properties [ci skip] 2015-06-26 20:14:26 +10:00
Hugo van Kemenade
3f7ec4e981 Update CHANGES.rst [CI skip] 2015-06-26 13:02:05 +03:00
Hugo van Kemenade
4cf2240093 Merge pull request #1304 from radarhere/size
Added width and height properties
2015-06-26 13:01:02 +03:00
hugovk
eb73fe3bdb flake8 2015-06-26 10:39:13 +03:00
Andrew Murray
afa4cadb23 Added width and height properties 2015-06-26 17:20:17 +10:00
Hugo van Kemenade
951923f755 Update CHANGES.rst [CI skip] 2015-06-26 10:18:07 +03:00
Hugo van Kemenade
04d09aacfa Merge pull request #1303 from radarhere/update
Update tiff and tk tcl 8.5 versions
2015-06-26 10:17:27 +03:00
Andrew Murray
36fc250a52 Updated tiff and tk tcl 8.5 versions 2015-06-26 11:01:40 +10:00
hugovk
0564979cf9 Formatting 2015-06-25 23:19:07 +03:00
hugovk
3e6e50476b DPI should be tuple of ints, not floats 2015-06-25 23:17:21 +03:00
wiredfool
ae0dfa8379 Update CHANGES.rst [ci skip] 2015-06-22 11:33:07 -07:00
wiredfool
cea766e980 Merge pull request #1217 from radarhere/qt-convert
Add functions to convert: Image <-> QImage; Image <-> QPixmap
2015-06-22 11:32:55 -07:00
Hugo van Kemenade
8a534edaf8 Merge pull request #1299 from radarhere/patch-1
Update Windows badge [ci skip]
2015-06-22 10:42:09 +03:00
Andrew Murray
3590902a14 Update Windows badge [ci skip] 2015-06-22 08:42:04 +10:00
Hugo van Kemenade
05c482655c Merge pull request #1291 from radarhere/winbuild_health
Style/health fixes
2015-06-21 17:42:01 +03:00
Hugo van Kemenade
5feed777dc Update CHANGES.rst [CI skip] 2015-06-21 17:40:00 +03:00
Hugo van Kemenade
7e0fad2eac Merge pull request #1294 from radarhere/gifmaker
Remove duplicate code in gifmaker script
2015-06-21 17:38:58 +03:00
Hugo van Kemenade
bf328878b0 Merge pull request #1295 from radarhere/patch-2
Updated changes
2015-06-21 17:36:51 +03:00
Andrew Murray
c851316b3f Updated CHANGES [ci skip] 2015-06-21 20:59:50 +10:00
Andrew Murray
b553ad7a70 Further fixes 2015-06-21 16:33:55 +10:00
wiredfool
c75a61407d Update CHANGES.rst [ci skip] 2015-06-20 13:59:55 -07:00
wiredfool
680aaa41cb Merge pull request #1177 from radarhere/multiline
Multiline text
2015-06-20 13:58:28 -07:00
Andrew Murray
8dc8a1235e Added Python 3 support to gifmaker script 2015-06-20 23:52:39 +10:00
Andrew Murray
6d7eb53b52 Changed gifmaker script to use ImageSequence Iterator 2015-06-20 23:52:02 +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