Commit graph

621 commits

Author SHA1 Message Date
John Evans
cc12bb5a69 Merge branch 'issue131' into devel 2013-10-13 11:43:03 -04:00
John Evans
ff97e0fb82 Printing of XML and UUID boxes with non-ascii characters only fully supported in 3.x
In 2.x, the XML contents will be printed as entity references instead.
It's just too difficult to get both 2.x and 3.x to be entirely consistent,
and so 3.x gets the preferential treatment.  Closes #131.
2013-10-13 11:40:54 -04:00
jevans
79d2c134c8 XML text now constructed via utf-8, not ascii. #131 2013-10-12 21:31:11 -04:00
John Evans
4c0da0dd85 Added xml box write test with utf-8 content. #131 2013-10-12 18:57:35 -04:00
John Evans
751e5d411b Merge branch 'issue129' into devel 2013-10-11 12:02:18 -04:00
John Evans
f6596dceb3 Fixed docstring errors. Closes #129 2013-10-11 12:01:33 -04:00
jevans
b49e113d16 No need for this file anymore, it's hardcoded into .travis.yml. 2013-10-09 21:15:19 -04:00
jevans
f5dd49cc1b Must use pip to install numpy on python3, it would seem. 2013-10-09 21:07:16 -04:00
jevans
78915c5d95 Taking cue from tornado travis setup. Trying separate 2.6, 2.7, 3.3 setups. 2013-10-09 21:00:34 -04:00
jevans
d6ef966a23 Trying to have cake and eat it too. Adding 2.6 to travis matrix. 2013-10-09 20:47:50 -04:00
John Evans
8016626ea5 Merge branch 'issue45' into devel 2013-10-08 09:57:54 -04:00
John Evans
f0db9dfa2d openjp2 write method rewritten for exitstack support. #45 2013-10-08 09:51:43 -04:00
John Evans
d6c5bdf74f Merge branch 'issue128' into devel 2013-10-07 16:29:11 -04:00
John Evans
86d799bfb7 Reorganized the jp2k tests, dropped several duplicated ones. Closes #128 2013-10-07 16:28:33 -04:00
John Evans
9c9bf7e533 Merge branch 'master' into devel 2013-10-04 12:36:52 -04:00
John Evans
6c90504270 Merge branch 'release-0.5.5' 2013-10-03 11:10:26 -04:00
John Evans
3b6d34531d Finalizing for 0.5.5 release. 2013-10-03 11:09:58 -04:00
John Evans
7aec21f49c Merge branch 'issue127' into devel 2013-10-03 10:56:23 -04:00
John Evans
244fb26d96 Change the way versioning is included in setup.py #127
Using regular expressions should work so long as the pattern in
glymur/version.py does not change.
2013-10-03 10:41:41 -04:00
John Evans
fe3964c212 Add some information about how many tests should be expected to skip. 2013-10-03 10:41:12 -04:00
John Evans
6edb59ac7e Very stupid, cannot import glymur in setup.py! #127
The install requirements have not yet necessarily been taken care of yet,
so pip installs will break on 2.6 and 2.7, probably due to contextlib2.
2013-10-03 10:10:36 -04:00
John Evans
a92f942ce5 Merge branch 'issue126' into devel 2013-10-03 10:03:38 -04:00
John Evans
c5900755ca Removing verbose option. Closes #126 2013-10-03 10:02:16 -04:00
John Evans
9bff373116 Use verbose to be sure of what tests are running. 2013-10-03 08:06:38 -04:00
John Evans
7697230a59 Change openjpeg version from base system version to tarball version 1.5. #126 2013-10-03 07:59:24 -04:00
John Evans
62db4f7e0f Mistakenly committed with a pdb breakpoint set. 2013-10-02 17:18:12 -04:00
John Evans
c65ae274a9 Minor tweaks. 2013-10-02 15:32:38 -04:00
John Evans
7d816ffb21 Merge branch 'devel' of github.com:quintusdias/glymur into devel 2013-10-01 11:00:52 -04:00
John Evans
2b5a427efe Merge branch 'issue125' into devel 2013-10-01 10:58:38 -04:00
John Evans
1fc1a635e0 Fixed typo. 2013-10-01 10:56:27 -04:00
John Evans
9422bccffb Forgot to actually set argtypes for openjp2 read_header function. #125 2013-10-01 10:55:28 -04:00
John Evans
89c0863706 openjp2's decode_tile_data handler was returning the codec. It should not. #125 2013-09-30 14:55:20 -04:00
John Evans
813f5f3a03 Moved argtypes and restype into each respective function. #125 2013-09-30 14:30:45 -04:00
John Evans
8e1db6cc9f Merge branch 'devel' of github.com:quintusdias/glymur into devel 2013-09-28 11:51:13 -04:00
John Evans
8cc04b2651 Updated docs for openjpeg r2347. 2013-09-28 11:50:27 -04:00
jevans
8672fb60b0 Merge branch 'master' into devel 2013-09-25 20:57:24 -04:00
jevans
556ff33763 Merge branch 'release-0.5.4' 2013-09-25 20:56:06 -04:00
jevans
b50f19bed3 Prepping 0.5.4 release. 2013-09-25 20:55:40 -04:00
jevans
7015a248a2 Merge branch 'devel' of github.com:quintusdias/glymur into devel 2013-09-25 20:43:05 -04:00
John Evans
b58a411c82 Merge branch 'issue123' into devel 2013-09-25 10:36:53 -04:00
John Evans
b1edfbe296 When working with 3.3, really should catch both IOError and OSError.
On 2.7, the mac seems to issue an IOError, other platforms an OSError.
Just catch both.  #123
2013-09-25 10:34:16 -04:00
jevans
725e697cec Merge branch 'master' into devel 2013-09-24 18:26:27 -04:00
jevans
8698fc8db8 Merge branch 'release-0.5.3' 2013-09-24 18:25:23 -04:00
jevans
6eba0a5794 Prepping 0.5.3 release. 2013-09-24 18:24:55 -04:00
John Evans
0c283ddece Merge branch 'issue122' into devel 2013-09-24 10:01:56 -04:00
John Evans
275e0fbd6b Bad test suite removed. Closes #122
The channel definition test suite looks like it was mistakenly pasted
into another part of the file but not correctly skipped when the library
version was 1.3.
2013-09-24 10:00:17 -04:00
jevans
6ed605b50c Merge branch 'master' into devel 2013-09-23 20:26:26 -04:00
jevans
c737255272 Releasing 0.5.2 2013-09-23 20:17:15 -04:00
jevans
f80c6261cf Merge branch 'devel' of github.com:quintusdias/glymur
Conflicts:
	glymur/test/test_jp2k.py
2013-09-23 20:13:05 -04:00
John Evans
e20cf07a8a Requalified on 1.3. #121 2013-09-23 16:22:49 -04:00