Merge pull request #32 from UDST/tlz

Remove zbox from dependencies

.travis.yml

@@ -16,7 +16,6 @@ before_install:
 - |
   conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION cytoolz flask pandas pip pygments pytables pytest six
 - source activate test-environment
-- pip install zbox
 - pip install pytest-cov coveralls pycodestyle
 - bin/build_js_bundle.sh complete
 install:

HISTORY.rst

@@ -1,3 +1,8 @@
+v1.5.0
+======
+
+* Remove `zbox` from dependencies.
+
 v1.4.0
 ======
 

appveyor.yml

@@ -18,7 +18,7 @@ install:
   - conda info -a
   - "conda create -q -n test-environment python=%PYTHON_VERSION% cytoolz flask pandas pip pygments pytables pytest six"
   - activate test-environment
-  - pip install zbox pycodestyle
+  - pip install pycodestyle
   - pip install .
 
 test_script:

docs/conf.py

@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.4'
+version = '1.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.0'
+release = '1.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -119,9 +119,9 @@ Orca offers some conveniences for streamlining the construction of pipelines:
 Installation
 ------------
 
-Orca depends on Pandas, PyTables, toolz (or cytoolz), and zbox.
+Orca depends on Pandas, PyTables, and toolz (or cytoolz).
 Pandas and PyTables are included in `Anaconda <http://docs.continuum.io/anaconda/>`__.
-Toolz and zbox may be installed with `pip <https://pip.pypa.io/en/latest/index.html>`__,
+Toolz may be installed with `pip <https://pip.pypa.io/en/latest/index.html>`__,
 and both toolz and cytoolz are can be installed by
 `conda <http://conda.pydata.org/>`__ (if you are using Anaconda or miniconda).
 
@@ -131,9 +131,7 @@ With the dependencies installed, install Orca with pip::
 
 Orca may also be installed with conda::
 
-    conda install --channel jiffyclub orca
-
-(The jiffyclub channel is included for install zbox.)
+    conda install -c udst orca
 
 Add the server option to include the optional server dependencies::
 

orca/__init__.py

@@ -4,4 +4,4 @@
 
 from .orca import *
 
-version = __version__ = '1.4.0'
+version = __version__ = '1.5.0'

orca/orca.py

@@ -17,7 +17,7 @@
 
 import pandas as pd
 import tables
-from zbox import toolz as tz
+import tlz as tz
 
 from . import utils
 from .utils.logutil import log_start_finish
@@ -1893,7 +1893,7 @@ def write_tables(fname, table_names=None, prefix=None, compress=False, local=Fal
     complib = compress and 'zlib' or None
     complevel = compress and 1 or 0
 
-    with pd.get_store(fname, mode='a', complib=complib, complevel=complevel) as store:
+    with pd.HDFStore(fname, mode='a', complib=complib, complevel=complevel) as store:
         for t in tables:
             # if local arg is True, store only local columns
             columns = None

orca/tests/test_orca.py

@@ -916,13 +916,13 @@ def step(table):
     step_tables = orca.get_step_table_names(['step'])
 
     orca.write_tables(store_name, step_tables, None)
-    with pd.get_store(store_name, mode='r') as store:
+    with pd.HDFStore(store_name, mode='r') as store:
         assert 'table' in store
         pdt.assert_frame_equal(store['table'], df)
 
     orca.write_tables(store_name, step_tables, 1969)
 
-    with pd.get_store(store_name, mode='r') as store:
+    with pd.HDFStore(store_name, mode='r') as store:
         assert '1969/table' in store
         pdt.assert_frame_equal(store['1969/table'], df)
 
@@ -931,7 +931,7 @@ def test_write_all_tables(df, store_name):
     orca.add_table('table', df)
     orca.write_tables(store_name)
 
-    with pd.get_store(store_name, mode='r') as store:
+    with pd.HDFStore(store_name, mode='r') as store:
         for t in orca.list_tables():
             assert t in store
 
@@ -952,7 +952,7 @@ def step(iter_var, table):
     orca.run(
         ['step'], iter_vars=range(11), data_out=store_name, out_interval=3)
 
-    with pd.get_store(store_name, mode='r') as store:
+    with pd.HDFStore(store_name, mode='r') as store:
         for year in range(0, 11, 3):
             key = '{}/table'.format(year)
             assert key in store
@@ -984,7 +984,7 @@ def step(iter_var, table, table2):
         out_base_tables=table_names,
         out_run_tables=['table'])
 
-    with pd.get_store(store_name, mode='r') as store:
+    with pd.HDFStore(store_name, mode='r') as store:
 
         for t in table_names:
             assert 'base/{}'.format(t) in store

setup.py

@@ -46,7 +46,7 @@ def run(self):
 
 setup(
     name='orca',
-    version='1.4.0',
+    version='1.5.0',
     description='A pipeline orchestration tool with Pandas support',
     long_description=long_description,
     author='UrbanSim Inc.',
@@ -69,8 +69,7 @@ def run(self):
     install_requires=[
         'pandas >= 0.15.0',
         'tables >= 3.1.0',
-        'toolz >= 0.7.0',
-        'zbox >= 1.2'
+        'toolz >= 0.7.0'
     ],
     extras_require={
         'server': ['flask >= 0.10', 'pygments >= 2.0', 'six >= 1.9.0']