Merge pull request #23 from UDST/prep-for-release

Prep for release v0.1

Author: sablanchard

LICENSE

@@ -1,26 +1,29 @@
-Copyright (c) 2016, UrbanSim Inc. All rights reserved.
+BSD 3-Clause License
+
+Copyright (c) 2016, UrbanSim Inc.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, Inc.DING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, Inc.ENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (Inc.DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (Inc.DING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

development_tests.py

@@ -6,6 +6,9 @@
 This is an informal set of tests for the various assertions.
 
 """
+
+from __future__ import print_function
+
 import numpy as np
 import pandas as pd
 
@@ -66,7 +69,7 @@ def bad_injectable():
 
     TableSpec('buildings',
 		ColumnSpec('building_id', primary_key=True),
-		ColumnSpec('price1', numeric=True, missing_val=False, max=50),
+		ColumnSpec('price1', numeric=True, missing=False, max=50),
 		ColumnSpec('price2', missing_val_coding=np.nan, min=-5),
 		ColumnSpec('price1', missing_val_coding=-1, max_portion_missing=0.5),
 		ColumnSpec('fkey_good', foreign_key='zones.zone_id')),
@@ -93,25 +96,25 @@ def bad_injectable():
 #     OrcaSpec('', TableSpec('buildings', ColumnSpec('badcol', can_be_generated=True))),
 #     OrcaSpec('', TableSpec('buildings', ColumnSpec('price1', primary_key=True))),
 #     OrcaSpec('', TableSpec('buildings', ColumnSpec('strings', numeric=True))),
-#     OrcaSpec('', TableSpec('buildings', ColumnSpec('price2', missing_val=False))),
+#     OrcaSpec('', TableSpec('buildings', ColumnSpec('price2', missing=False))),
 #     OrcaSpec('', TableSpec('buildings', ColumnSpec('price1', max=25))),
 #     OrcaSpec('', TableSpec('buildings', ColumnSpec('price1', min=0))),
 #     OrcaSpec('', TableSpec('buildings', ColumnSpec('price2', max_portion_missing=0.1))),
-    OrcaSpec('', TableSpec('buildings', ColumnSpec('fkey_bad', foreign_key='zones.zone_id'))),
-    OrcaSpec('', InjectableSpec('nonexistent', registered=True)),
-    OrcaSpec('', InjectableSpec('rate', registered=False)),
-    OrcaSpec('', InjectableSpec('bad_inj', can_be_generated=True)),
-    OrcaSpec('', InjectableSpec('dict', numeric=True)),
-    OrcaSpec('', InjectableSpec('rate', greater_than=5)),
-    OrcaSpec('', InjectableSpec('rate', less_than=-5)),
-    OrcaSpec('', InjectableSpec('rate', has_key='Berkeley')),
-    OrcaSpec('', InjectableSpec('dict', has_key='Oakland')),
+#     OrcaSpec('', TableSpec('buildings', ColumnSpec('fkey_bad', foreign_key='zones.zone_id'))),
+#     OrcaSpec('', InjectableSpec('nonexistent', registered=True)),
+#     OrcaSpec('', InjectableSpec('rate', registered=False)),
+#     OrcaSpec('', InjectableSpec('bad_inj', can_be_generated=True)),
+#     OrcaSpec('', InjectableSpec('dict', numeric=True)),
+#     OrcaSpec('', InjectableSpec('rate', greater_than=5)),
+#     OrcaSpec('', InjectableSpec('rate', less_than=-5)),
+#     OrcaSpec('', InjectableSpec('rate', has_key='Berkeley')),
+#     OrcaSpec('', InjectableSpec('dict', has_key='Oakland')),
 ]
 
 for bs in bad_specs:
     try:
         ot.assert_orca_spec(bs)
     except OrcaAssertionError as e:
-        print "OrcaAssertionError: " + str(e)
+        print("OrcaAssertionError: " + str(e))
         pass