Skip to content

Commit

Permalink
Updated copyright and docs to reflect UrbanSim Inc.
Browse files Browse the repository at this point in the history
  • Loading branch information
waddell committed Mar 9, 2016
1 parent f3ae394 commit 058a930
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
3 changes: 1 addition & 2 deletions LICENSE
@@ -1,5 +1,4 @@
Copyright (c) 2014-2015, Synthicity, LLC. All rights reserved.
Copyright (c) 2015, Autodesk All rights reserved.
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:
Expand Down
9 changes: 3 additions & 6 deletions README.rst
Expand Up @@ -37,7 +37,7 @@ the Open Platform for Urban Simulation (OPUS) software implementation at
that time. Now, almost a decade later, it is time again to revisit the
implementation to take advantage of an amazing amount of innovation in
the scientific computing community. The new implementation is hosted on
this GitHub site, and maintained by Autodesk and hopefully a growing
this GitHub site, and maintained by UrbanSim Inc. and a growing
community of contributors.

New UrbanSim Implementation
Expand Down Expand Up @@ -72,11 +72,8 @@ set of hedonic price models, location choice models, relocation and
transition models, as well as a new real estate development model using
proforma analysis.

We do strongly recommend that you contact udst@autodesk.com about your
project to make sure you can get professional support when you need it,
We do strongly recommend that you contact the team at www.urbansim.com about your
project to make sure you can get support when you need it,
and know what you are getting into. For major applied projects,
professional support is highly recommended.

**On the other hand, if you just want to begin experimenting and
creating regression and choice models and map their inputs and outputs,
you've also come to the right place.**
8 changes: 4 additions & 4 deletions docs/conf.py
Expand Up @@ -50,7 +50,7 @@

# General information about the project.
project = u'urbansim'
copyright = u'2015, Autodesk'
copyright = u'2016, UrbanSim Inc.'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down Expand Up @@ -208,7 +208,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', 'urbansim.tex', u'urbansim Documentation',
u'Autodesk', 'manual'),
u'UrbanSim Inc.', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down Expand Up @@ -238,7 +238,7 @@
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'urbansim', u'urbansim Documentation',
[u'Autodesk'], 1)
[u'UrbanSim Inc.'], 1)
]

# If true, show URL addresses after external links.
Expand All @@ -252,7 +252,7 @@
# dir menu entry, description, category)
texinfo_documents = [
('index', 'urbansim', u'urbansim Documentation',
u'Autodesk', 'urbansim', 'One line description of project.',
u'UrbanSim Inc', 'urbansim', 'One line description of project.',
'Miscellaneous'),
]

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -17,8 +17,8 @@
version='3.1dev',
description='Tool for modeling metropolitan real estate markets',
long_description=long_description,
author='Autodesk',
author_email='udst@autodesk.com',
author='UrbanSim Inc.',
author_email='info@urbansim.com',
license='BSD',
url='https://github.com/udst/urbansim',
classifiers=[
Expand Down

1 comment on commit 058a930

@juanshishido
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes above are, of course, not the cause of this failed build.

It looks as if this is due to new default index behavior with pandas==0.18.

It seems to only be affecting urbansim/models/transition.py (based on Travis and on tests locally). For example, with test_remove_rows_all() in urbansim/models/tests/test_transition.py:

AssertionError: Index are different

Index classes are different
[left]:  Index([], dtype='object')
[right]: Int64Index([], dtype='int64')

All tests pass with pandas==0.17. (I've only looked at the master branch.)

I'm looking for a fix.

Please sign in to comment.