Merge branch 'master' of https://github.com/synthicity/urbansim

Conflicts: urbansim/urbansim/templates/modelspec.py.template
UDST · Mar 25, 2014 · 7d2561d · 7d2561d
2 parents 9558497 + c3a3b56
commit 7d2561d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ install:
     # install urbansim
     - pip install .
 script:
-    - pep8 urbansim scripts urbansimd
+    - pep8 urbansim scripts
     - py.test --cov urbansim --cov-report term-missing
 after_success:
     - coveralls
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
         'Programming Language :: Python :: 2.7',
         'License :: OSI Approved :: GNU Affero General Public License v3'
     ],
-    packages=find_packages(exclude=['urbansimd', '*.tests']),
+    packages=find_packages(exclude=['*.tests']),
     package_data={'urbansim.urbansim': ['templates/*.template']},
     install_requires=[
         'Django>=1.6.2',

diff --git a/urbansim/urbansim/templates/modelspec.py.template b/urbansim/urbansim/templates/modelspec.py.template
@@ -59,7 +59,7 @@ print("Finished with merge in %f" % (time.time() - t_m))
 {%- if patsy %}
 print("WARNING: using patsy, ind_vars will be ignored")
 {% if patsy is string %}
-patsy = "{{patsy}}"
+patsy = "{{patsy | trim}}"
 {% else %}
 patsy = string.join({{patsy}}," + ")
 {% endif %}