Merge 5201ce5 into ab346fe

.travis.yml

@@ -13,10 +13,11 @@ install:
     - export PATH=$HOME/py/bin:$PATH
     - pip install Django shapely simplejson
     # install test depencies
-    - pip install pytest-cov coveralls
+    - pip install pytest-cov coveralls pep8
     # install urbansim
     - pip install .
 script:
+    - pep8 urbansim scripts urbansimd
     - py.test --cov urbansim --cov-report term-missing
 after_success:
     - coveralls

setup.cfg

@@ -0,0 +1,3 @@
+[pep8]
+exclude = texttable.py
+max-line-length = 100

urbansim/urbansim/tests/test_modelcompile.py

@@ -46,4 +46,3 @@ def test_load_config_yaml():
     config, basename = modelcompile.load_config(test_file)
     assert config == TEST_CONFIG
     assert basename == 'test_config.yaml'
-

urbansim/utils/geomisc.py

@@ -32,9 +32,6 @@ def np_coord_convert_all(a):
     a = np.array(pool.map(np_coord_convert, a), dtype="float32")
     return a
 
-        #bats['origpoint'] = bats['origpoint'].apply(lambda x: x.decode('hex')).apply(shapely.wkb.loads)
-    #bats['destpoint'] = bats['destpoint'].apply(lambda x: x.decode('hex')).apply(shapely.wkb.loads)
-
 
 def convert_df(df, xname='x', yname='y', srcsrid=3740, tgtsrid=4326):
     x = df[xname].values

urbansimd/test.py

@@ -6,10 +6,12 @@
 jdata = {
     "tables": ['parcels'],
     # "tables": ['residential_rent'],
-    # "variable": """subset['building_sqft'].groupby(level=0).transform('sum') / \
-    #                          (subset['shape_area'].groupby(level=0).transform('mean')*10.7639)""",
-    # "variable": """subset[(subset['building_type_id'] < 4)*(subset['year_built'] < 1950)].groupby('zone_id')['building_sqft'].transform('sum')""",
-    # "variable": """subset[_YEARS_].groupby(level=0).mean()""",
+    "variable": ("subset['building_sqft'].groupby(level=0).transform('sum') / "
+                 "(subset['shape_area'].groupby(level=0).transform('mean')*10.7639)"),
+    "variable": ("subset[(subset['building_type_id'] < 4) * "
+                 "(subset['year_built'] < 1950)]"
+                 ".groupby('zone_id')['building_sqft'].transform('sum')"),
+    "variable": "subset[_YEARS_].groupby(level=0).mean()",
     "variable": "subset['parcel_acres']",
     # "bbox": [550000,4180000,550100,4180100],
     "bbox": [1500000, 1500000, 1500500, 1500500],

urbansimd/urbansimd-postgres.py

@@ -79,7 +79,8 @@ def start_service(username, password, port=8765, host='paris.urbansim.org'):
         pass
     global conn
     conn = psycopg2.connect(
-        "dbname=bayarea user=%s password=%s port=5432 host=paris.urbansim.org" % (username, password))
+        "dbname=bayarea user=%s password=%s port=5432 host=paris.urbansim.org" %
+        (username, password))
     run(host=host, port=port, debug=True, server='tornado')
 
 if __name__ == '__main__':