Merge 927daaa into 3a34bbd

frictionlessdata · May 27, 2019 · c4a5188 · c4a5188
2 parents 3a34bbd + 927daaa
commit c4a5188
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,18 @@
-dist: trusty
+dist: xenial
 sudo: required
 language: python
 python:
-- 3.6
+- '3.7'
 services:
 - docker
 env:
   matrix:
-  - TOXENV="py36-sqlite" SPEEDUP=no DEPLOY=no
-  - TOXENV="py36-plyvel" SPEEDUP=yes DEPLOY=yes
+  - TOXENV="py37-sqlite" SPEEDUP=no DEPLOY=no
+  - TOXENV="py37-plyvel" SPEEDUP=yes DEPLOY=yes
   global:
   - LANG=en_US.UTF-8
 install:
-- sudo apt-get install libleveldb-dev libleveldb1
+- sudo apt-get install libleveldb-dev libleveldb1v5
 - if [ "${SPEEDUP}" == yes ]; then make install-speedup; else make install; fi
 - pip install coveralls
 script:

diff --git a/datapackage_pipelines/utilities/lib_test_helpers.py b/datapackage_pipelines/utilities/lib_test_helpers.py
@@ -104,7 +104,7 @@ def test_fixture(processor_output, dp_out, data_out):
         for ares, eres in zip(actual_dp.get('resources', []), dp_out.get('resources', [])):
             assert ares.get('schema', {}).get('fields') == eres.get('schema', {}).get('fields')
             assert ares.get('schema', {}) == eres.get('schema', {})
-            assert ares == eres
+            assert ares == eres, 'error comparing actual:\n%r\nto expected:\n%r\n...' % (ares, eres)
         assert actual_dp == dp_out
 
         if len(actual_data) > 0:

diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@ def read(*paths):
     'cachetools',
     'tabulator>=1.17.0',
     'globster>=0.1.0',
-    'dataflows>=0.0.34',
+    'dataflows>=0.0.55',
 ]
 SPEEDUP_REQUIRES = [
     'dataflows[speedup]',

diff --git a/tests/stdlib/fixtures/load_existent_env b/tests/stdlib/fixtures/load_existent_env
@@ -19,9 +19,7 @@ load
         {
             "dpp:streamedFrom": "env://EXISTENT_ENV", 
             "dpp:streaming": true, 
-            "encoding": "utf-8", 
             "format": "csv", 
-            "mediatype": "text/csv", 
             "name": "my-env-resource", 
             "path": "my-env-resource.csv", 
             "profile": "tabular-data-resource", 

diff --git a/tests/stdlib/fixtures/simple_load b/tests/stdlib/fixtures/simple_load
@@ -18,9 +18,7 @@ load
     "resources": [
         {
             "dpp:streaming": true, 
-            "encoding": "utf-8", 
             "format": "csv", 
-            "mediatype": "text/csv", 
             "name": "my-spiffy-resource", 
             "path": "my-spiffy-resource.csv", 
             "profile": "tabular-data-resource", 

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -53,7 +53,7 @@ def test_pipeline():
         {"pipeline_id": "./tests/env/dummy/pipeline-test-hooks", "event": "start"},
         {"pipeline_id": "./tests/env/dummy/pipeline-test-hooks", "event": "finish", "success": True,
          'stats': {'.dpp': {'out-datapackage-url': 'hooks-outputs/datapackage.json'},
-                   'bytes': 15746, 'count_of_rows': 40,
-                   'dataset_name': 'hook-tests', 'hash': '622c70e2253462fb328c1752df7090e1'}}
+                   'bytes': 15715, 'count_of_rows': 40,
+                   'dataset_name': 'hook-tests', 'hash': 'aa1687f3c157e5bd733d102de0e80d29'}}
     ]
     assert progresses >= 1
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 package=datapackage_pipelines
 skip_missing_interpreters=true
 envlist=
-  py36-{sqlite,plyvel}
+  py3{6,7}-{sqlite,plyvel}
 
 [testenv]
 deps=
@@ -12,6 +12,7 @@ deps=
   coverage
   pyyaml
   py36-plyvel: plyvel
+  py37-plyvel: plyvel
 passenv=
   PWD
   CI