Merge pull request #100 from esc/update_ci

update python versions for travis

.travis.yml

@@ -1,16 +1,9 @@
 sudo: false
 language: python
 python:
-  - 2.7
-  - 3.4
-  - 3.5
   - 3.6
-# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
-matrix:
-  include:
-    - python: 3.7
-      dist: xenial
-      sudo: true
+  - 3.7
+  - 3.8
 install:
   - pip install -r requirements.txt
   - pip install -r test_requirements.txt

bloscpack/testutil.py

@@ -36,7 +36,7 @@ def create_array(repeats, in_file, progress=False):
 
 def create_array_fp(repeats, in_fp, progress=False):
     for i in range(repeats):
-        array_ = np.linspace(i, i+1, 2e6)
+        array_ = np.linspace(i, i+1, int(2e6))
         in_fp.write(array_.tostring())
         if progress:
             progress(i)

test/test_headers.py

@@ -129,7 +129,7 @@ def test_decode_metadata_options_exceptions():
 
 
 def test_decode_blosc_header_basic():
-    array_ = np.linspace(0, 100, 2e4).tostring()
+    array_ = np.linspace(0, 100, int(2e4)).tostring()
     blosc_args = BloscArgs()
     compressed = blosc.compress(array_, **blosc_args)
     header = decode_blosc_header(compressed)

test/test_numpy_io.py

@@ -245,7 +245,7 @@ def test_alternate_cname():
             ('zstd', 4),
             ]:
         blosc_args = BloscArgs(cname=cname)
-        array_ = np.linspace(0, 1, 2e6)
+        array_ = np.linspace(0, 1, int(2e6))
         sink = CompressedMemorySink()
         pack_ndarray(array_, sink, blosc_args=blosc_args)
         blosc_header = decode_blosc_header(sink.chunks[0])

test_cmdline/test_append.cram

@@ -16,7 +16,7 @@ Test basic append:
   .* 1 .* .* \d{3}M .* .* .* data.dat (re)
   $ blpk compress data.dat
   $ ls -lah  data.dat.blp
-  .* 1 .* .* \d{2}M .* .* .* data.dat.blp (re)
+  .* 1 .* .* .* .* .* .* data.dat.blp (re)
   $ blpk append data.dat.blp data.dat
   $ ls -lah  data.dat.blp
   .* 1 .* .* \d{2}M .* .* .* data.dat.blp (re)

test_cmdline/test_info.cram

@@ -30,7 +30,7 @@ Get some info on the file:
   blpk: 'offsets':
   blpk: \[13496,[1-9]\d*,[1-9]\d*,[1-9]\d*,[1-9]\d*,...\] (re)
   blpk: First chunk blosc header:
-  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 191870)])
+  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 366674)])
   blpk: First chunk blosc flags: 
   blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')])
   $ blpk i data.dat.blp
@@ -47,7 +47,7 @@ Get some info on the file:
   blpk: 'offsets':
   blpk: \[13496,[1-9]\d*,[1-9]\d*,[1-9]\d*,[1-9]\d*,...\] (re)
   blpk: First chunk blosc header:
-  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 191870)])
+  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 366674)])
   blpk: First chunk blosc flags: 
   blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')])
   $ rm data.dat.blp

test_cmdline/test_metadata.cram

@@ -39,7 +39,7 @@ Add metadata to the file:
   blpk:     meta_comp_size: 6[2-5]\.0B \(6[2-5]B\) (re)
   blpk:     user_codec: b?'' (re)
   blpk: First chunk blosc header:
-  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 191870)])
+  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 366674)])
   blpk: First chunk blosc flags: 
   blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')])
   $ blpk decompress data.dat.blp data.dat.dcmp

test_cmdline/test_verbose_debug.cram

@@ -21,15 +21,15 @@ Get more information using --verbose:
   blpk: nchunks: 153
   blpk: chunk_size: 1.0M (1048576B)
   blpk: last_chunk_size: 602.0K (616448B)
-  blpk: output file size: \d{2}\.[1-9]\d*M \([1-9]\d*B\) (re)
+  blpk: output file size: \d*\.[1-9]\d*M \([1-9]\d*B\) (re)
   blpk: compression ratio: [1-9]\d*\.\d+ (re)
   blpk: done
   $ blpk --verbose decompress data.dat.blp data.dat.dcmp
   blpk: using [0-9]+ threads (re)
   blpk: getting ready for decompression
   blpk: input file is: 'data.dat.blp'
   blpk: output file is: 'data.dat.dcmp'
-  blpk: input file size: \d{2}\.[1-9]\d*M (re)
+  blpk: input file size: \d*\.[1-9]\d*M (re)
   blpk: output file size: 152.59M
   blpk: decompression ratio: [1-9]\d*.\d+ (re)
   blpk: done
@@ -46,15 +46,15 @@ Get more information using --verbose, but with metadata:
   blpk: nchunks: 153
   blpk: chunk_size: 1.0M (1048576B)
   blpk: last_chunk_size: 602.0K (616448B)
-  blpk: output file size: \d{2}\.[1-9]\d*M \([1-9]\d*B\) (re)
+  blpk: output file size: \d*\.[1-9]\d*M \([1-9]\d*B\) (re)
   blpk: compression ratio: [1-9]\d*\.\d+ (re)
   blpk: done
   $ blpk --verbose decompress data.dat.blp data.dat.dcmp
   blpk: using [0-9]+ threads (re)
   blpk: getting ready for decompression
   blpk: input file is: 'data.dat.blp'
   blpk: output file is: 'data.dat.dcmp'
-  blpk: input file size: \d{2}\.[1-9]\d*M (re)
+  blpk: input file size: \d*\.[1-9]\d*M (re)
   blpk: read compressed metadata of size: '6[2-5]' (re)
   blpk: output file size: 152.59M
   blpk: decompression ratio: [1-9]\d*\.\d+ (re)
@@ -116,13 +116,13 @@ Try using --debug
   blpk: raw_bloscpack_header: b?'.*' (re)
   blpk: Handle chunk '0'
   blpk: checksum \(adler32\)\: .* (re)
-  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) (re)
+  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.\d*M \([1-9]\d*B\) (re)
   blpk: Handle chunk '1'
   blpk: checksum \(adler32\)\: .* (re)
-  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) (re)
+  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.\d*M \([1-9]\d*B\) (re)
   blpk: Handle chunk '2'
   blpk: checksum \(adler32\)\: .* (re)
-  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) (re)
+  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.\d*M \([1-9]\d*B\) (re)
   blpk: Handle chunk '3' (last)
   blpk: checksum \(adler32\)\: .* (re)
   blpk: chunk handled, in: 2\.59M \(2713600B\) out: [1-9]\d*\.[1-9]\d*K \([1-9]\d*B\) (re)
@@ -146,7 +146,7 @@ Try using --debug
   blpk: getting ready for decompression
   blpk: input file is: 'data.dat.blp'
   blpk: output file is: 'data.dat.dcmp'
-  blpk: input file size: \d{2}\.[1-9]\d*M (re)
+  blpk: input file size: \d*\.[1-9]\d*M (re)
   blpk: reading bloscpack header
   blpk: bloscpack_header_raw: b?'.*' (re)
   blpk: bloscpack header: BloscpackHeader(format_version=3, offsets=True, metadata=False, checksum='adler32', typesize=8, chunk_size=52428800, last_chunk=2713600, nchunks=4, max_app_chunks=40)
@@ -155,15 +155,15 @@ Try using --debug
   blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '0'
   blpk: checksum OK \(adler32\)\: .* (re)
-  blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
+  blpk: chunk handled, in: [1-9]\d*\.\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
   blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '1'
   blpk: checksum OK \(adler32\)\: .* (re)
-  blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
+  blpk: chunk handled, in: [1-9]\d*\.\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
   blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '2'
   blpk: checksum OK \(adler32\)\: .* (re)
-  blpk: chunk handled, in: \d\.[1-9]\d*M \([1-9]\d*B\) out: 50.0M \(52428800B\) (re)
+  blpk: chunk handled, in: \d\.\d*M \([1-9]\d*B\) out: 50.0M \(52428800B\) (re)
   blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 2713600\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '3' (last)
   blpk: checksum OK \(adler32\)\: .* (re)
@@ -237,13 +237,13 @@ Try using --debug with metadata:
   blpk: metadata section occupies a total of 716.0B (716B)
   blpk: Handle chunk '0'
   blpk: checksum \(adler32\)\: .* (re)
-  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) (re)
+  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.\d*M \([1-9]\d*B\) (re)
   blpk: Handle chunk '1'
   blpk: checksum \(adler32\)\: .* (re)
-  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) (re)
+  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.\d*M \([1-9]\d*B\) (re)
   blpk: Handle chunk '2'
   blpk: checksum \(adler32\)\: .* (re)
-  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) (re)
+  blpk: chunk handled, in: 50\.0M \(52428800B\) out: [1-9]\d*\.\d*M \([1-9]\d*B\) (re)
   blpk: Handle chunk '3' (last)
   blpk: checksum \(adler32\)\: .* (re)
   blpk: chunk handled, in: 2\.59M \(2713600B\) out: [1-9]\d*\.[1-9]\d*K \([1-9]\d*B\) (re)
@@ -289,15 +289,15 @@ Try using --debug with metadata:
   blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '0'
   blpk: checksum OK \(adler32\)\: .* (re)
-  blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
+  blpk: chunk handled, in: [1-9]\d*\.\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
   blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '1'
   blpk: checksum OK \(adler32\)\: .* (re)
-  blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
+  blpk: chunk handled, in: [1-9]\d*\.\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
   blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '2'
   blpk: checksum OK \(adler32\)\: .* (re)
-  blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
+  blpk: chunk handled, in: [1-9]\d*\.\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
   blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 2713600\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '3' (last)
   blpk: checksum OK \(adler32\)\: .* (re)