Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter vars #129

Open
wants to merge 138 commits into
base: v0.1-production
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
62267f8
Framework for Table class
smmaurer Dec 27, 2018
145c607
Framework buildout
smmaurer Dec 27, 2018
da3ea59
Constructors
smmaurer Dec 27, 2018
85e4652
Registration of csvs
smmaurer Dec 27, 2018
3dab317
First tests passing
smmaurer Dec 27, 2018
0a66adf
Python 2.7 classname fix
smmaurer Dec 28, 2018
639d809
Setup, teardown, autorun
smmaurer Dec 28, 2018
0a48462
Loose ends
smmaurer Dec 29, 2018
0bc3666
Index validation and tests
smmaurer Dec 31, 2018
a167800
Comparison of implicit join keys
smmaurer Dec 31, 2018
3e857de
Cleanup
smmaurer Dec 31, 2018
a5f49d6
MultiIndex keys working
smmaurer Jan 2, 2019
1a5f2bf
Updating docs
smmaurer Feb 13, 2019
b4e8617
Resolving merge conflict
smmaurer Feb 14, 2019
8f7c1b3
Cleanup
smmaurer Feb 14, 2019
3f83d48
Table -> TableFromDisk
smmaurer Feb 14, 2019
385424a
Csv settings and cross-platform paths
smmaurer Feb 14, 2019
3677e22
HDF table reading
smmaurer Feb 19, 2019
090dadc
Test for hdf tables
smmaurer Feb 19, 2019
15e6c76
Better path normalization
smmaurer Feb 19, 2019
9409d2f
Changelog and documentation
smmaurer Feb 20, 2019
1879a72
Merge pull request #93 from UDST/data-loading
smmaurer Feb 20, 2019
9034fa4
Changing directory structure
smmaurer Feb 20, 2019
d59b04f
Fixing tests
smmaurer Feb 20, 2019
32e52a6
Work in progress
smmaurer Feb 21, 2019
9a4a403
Data saving works
smmaurer Feb 21, 2019
051644b
TableFromDisk -> LoadData
smmaurer Feb 21, 2019
b75aaf8
More parameters
smmaurer Feb 21, 2019
92ca51b
Data filters
smmaurer Feb 21, 2019
9aaf73d
Dynamic filepaths
smmaurer Feb 21, 2019
d9b0175
Work in progress
smmaurer Feb 22, 2019
831c843
Reproduces error
smmaurer Feb 22, 2019
3c90803
Fixes error
smmaurer Feb 22, 2019
1cec92d
Cleanup
smmaurer Feb 22, 2019
72f1b9e
Updating version
smmaurer Feb 22, 2019
6e01203
Removing OrderedDict case from TemplateStep._get_data()
smmaurer Feb 22, 2019
9cfe273
Updating contribution guide based on choicemodels
smmaurer Feb 26, 2019
d20648b
Updating a link the readme
smmaurer Feb 26, 2019
6d99399
Adding instructions to patch an earlier release
smmaurer Feb 26, 2019
841bff7
Tweaking release instructions
smmaurer Feb 26, 2019
ab1af8b
Updating changelog and docs version
smmaurer Feb 28, 2019
2a4d129
Merge pull request #96 from UDST/small-mnl-bug
smmaurer Feb 28, 2019
6bc22b9
Clarifying branch vs tag
smmaurer Mar 2, 2019
698d8bb
New format for changelog
smmaurer Mar 2, 2019
306bd1f
Merge branch 'master' into contribution-docs
smmaurer Mar 2, 2019
1c6c649
Merge pull request #97 from UDST/contribution-docs
smmaurer Mar 2, 2019
6b57330
Load, SaveData -> Load, SaveTable
smmaurer Mar 4, 2019
a9f3dc0
More test cases for column updating
smmaurer Mar 4, 2019
92c82fd
Test requesting specific columns
smmaurer Mar 4, 2019
7fa8605
Requiring unix-style paths for LoadData
smmaurer Mar 4, 2019
3a1c5fa
Removing column and filter params from LoadTable
smmaurer Mar 4, 2019
73d5e98
Adding separate table name for LoadTable
smmaurer Mar 4, 2019
24ec03d
Merge branch 'master' into save-data
smmaurer Mar 4, 2019
b5fb083
Updating version
smmaurer Mar 4, 2019
84eeee6
Tests for property persistence
smmaurer Mar 4, 2019
7caeb6e
Updating documentation
smmaurer Mar 5, 2019
da826b3
Updating changelog
smmaurer Mar 5, 2019
61e6f7c
Merge pull request #95 from UDST/save-data
smmaurer Mar 5, 2019
25044e1
Moving table validation to utilities
smmaurer Mar 5, 2019
a0e15ef
More tests
smmaurer Mar 5, 2019
35a98a0
Validate all tables
smmaurer Mar 6, 2019
309fe0f
Work in progress
smmaurer Mar 6, 2019
84f9de0
Sketch of column from expression
smmaurer Mar 12, 2019
ee67fe2
Better docstrings
smmaurer Mar 12, 2019
1d6b22a
Implementing column generation logic
smmaurer Mar 12, 2019
2d31bb8
Adding to do
smmaurer Mar 12, 2019
9461645
Initial tests
smmaurer Mar 12, 2019
2ea8ac7
Fixing failures
smmaurer Mar 12, 2019
952c1f3
More tests
smmaurer Mar 13, 2019
4ac546b
Raising pandas requirement
smmaurer Mar 19, 2019
1592d27
Docstrings for merge_tables()
smmaurer Mar 19, 2019
24b9027
Basic working example of merge
smmaurer Mar 19, 2019
f922d8a
added mct argument for SegmentedLargeMultinomialLogitStep.fit_all() a…
lmwang9527 Mar 19, 2019
812e194
Progress on merging
smmaurer Mar 20, 2019
306cab7
Refactoring trim_columns()
smmaurer Mar 20, 2019
aecac43
Better docstrings
smmaurer Mar 20, 2019
c7fe500
More merging tests
smmaurer Mar 20, 2019
e32e66a
updated version to 0.2dev3; added change log entry
lmwang9527 Mar 21, 2019
b23a284
Merge pull request #106 from lmwang9527/mct_arg
smmaurer Mar 21, 2019
44f986d
Better docstrings
smmaurer Mar 25, 2019
a6665b1
Final unit tests
smmaurer Mar 25, 2019
ff03f53
Work in progress
smmaurer Mar 25, 2019
3679f52
Utility to get anything as dataframe
smmaurer Mar 25, 2019
c62fce5
Utility to list all columns in a table
smmaurer Mar 25, 2019
f4958bc
Improved merge_tables()
smmaurer Mar 25, 2019
4375350
Better docstrings
smmaurer Mar 25, 2019
33be09b
Refactoring get_data()
smmaurer Mar 26, 2019
ffe0ac2
Removing _get_df()
smmaurer Mar 26, 2019
15561c9
Merge branch 'master' into data-utils
smmaurer Mar 26, 2019
2aef53e
Updating versioning and changelog
smmaurer Mar 26, 2019
3f8bcb5
Documentation updates
smmaurer Mar 27, 2019
c911238
Merge pull request #102 from UDST/data-utils
smmaurer Mar 27, 2019
aac9cae
Merge branch 'master' into col-from-expression
smmaurer Mar 29, 2019
a4edb1b
Use new get_df utility
smmaurer Mar 29, 2019
d98f023
Final tests
smmaurer Mar 29, 2019
45ecb47
Updating version
smmaurer Mar 29, 2019
b584358
Docs and changelog
smmaurer Mar 29, 2019
f5bd26e
Merge pull request #105 from UDST/col-from-expression
smmaurer Mar 29, 2019
b6dced8
CoreTemplateSettings
smmaurer Apr 2, 2019
942ff7a
Work in progress
smmaurer Apr 2, 2019
7516717
Updating ModelManager to support CoreTemplateSettings
smmaurer Apr 2, 2019
e6380ca
Tests for CoreTemplateSettings
smmaurer Apr 2, 2019
cea7909
Adding OutputColumnSettings
smmaurer Apr 2, 2019
60fe04d
Adding ExpressionSettings
smmaurer Apr 2, 2019
5d1ed62
Converter for older yaml files
smmaurer Apr 2, 2019
f159d53
Refactoring column utilities
smmaurer Apr 4, 2019
1a666f2
Remaining tests
smmaurer Apr 4, 2019
daa4c03
Versioning and changelog
smmaurer Apr 4, 2019
07d6f70
Documentation updates
smmaurer Apr 4, 2019
7744ad4
Updating travis script
smmaurer Apr 4, 2019
3324905
Merge pull request #108 from UDST/settings-objects
smmaurer Apr 4, 2019
eeca028
Fixing least squares out-transformation bug
smmaurer Jul 15, 2019
ed63144
Updating versioning and changelog
smmaurer Jul 16, 2019
825611d
Updating release date
smmaurer Jul 22, 2019
1d15d38
Merge pull request #111 from UDST/out-transform-fix
smmaurer Jul 22, 2019
0b55c25
add chooser filtering for backdoor mct to accommodate segmented mnl u…
mxndrwgrdnr Apr 13, 2020
6d6f938
ensure mct in large mnl is filtered by segmentation column for segmen…
mxndrwgrdnr Apr 13, 2020
86adbac
enable backdoor mct for segmented large mnl
mxndrwgrdnr Apr 13, 2020
0f345b2
Updating requirements to fix travis failure
smmaurer Apr 17, 2020
5ae4fe5
Fixing syntax
smmaurer Apr 17, 2020
6ab79ab
Adding newer python versions
smmaurer Apr 17, 2020
246a8dc
version bump and requirements bump
mxndrwgrdnr Apr 17, 2020
58e8556
version bump
mxndrwgrdnr Apr 17, 2020
2767215
rebuild trigger
mxndrwgrdnr Apr 17, 2020
03d377e
Merge pull request #118 from UDST/segment_mct
mxndrwgrdnr Apr 17, 2020
b86b735
include the out_column to create df in binary logit
cvanoli May 13, 2020
a2a3448
Save regression residuals as object element
cvanoli May 13, 2020
061fabf
Updating version and changelog
smmaurer May 16, 2020
ee81862
Merge pull request #119 from UDST/binary_logit_addin
smmaurer May 16, 2020
11f2de3
Updating docs
smmaurer Feb 5, 2021
de29d5e
Cleanup
smmaurer Feb 5, 2021
234405f
Adjusting travis python versions
smmaurer Feb 6, 2021
f68b04a
Demo notebook
smmaurer Feb 9, 2021
22791a7
Cleanup
smmaurer Feb 9, 2021
b39ec8e
Cleanup
smmaurer Feb 9, 2021
555537d
Merge pull request #121 from UDST/fix-docs
smmaurer Feb 9, 2021
723b83b
Post-MCT interaction term operations (#126)
mxndrwgrdnr Sep 27, 2021
2acd3f3
remove filter columns
msoltadeo Apr 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
language: python

python:
- '2.7'
- '3.5'
- '3.6'

matrix:
include:
- python: '3.7' # temp solution until python 3.7 is more cleanly supported
dist: xenial
sudo: true
allow_failures:
- python: '3.7' # dependencies are blocking installation
fast_finish: true
- '3.8'
- '3.9'

install:
- pip install git+git://github.com/udst/choicemodels.git
- pip install .
- pip install -r requirements-extras.txt
- pip install -r requirements-dev.txt
109 changes: 80 additions & 29 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,92 +1,143 @@
# UrbanSim Templates change log

### 0.1.1 (2019-02-05)
## 0.2 (not yet released)

- production release
#### 0.2.dev9 (2020-05-15)

### 0.1.1.dev1 (2019-01-30)
- fixes a bug in `BinaryLogitStep` simulation where the output is not updated correctly
- adds a `resid` attribute to fitted `OLSRegressionStep` models, for diagnostics

#### 0.2.dev8 (2020-04-17)

- allows segmented large MNL models to be estimated with a `MergedChoiceTable` that's passed in by the user (rather than generated automatically), thus achieving parity with the non-segmented model class

#### 0.2.dev7 (2019-07-15)

- fixes a bug with the `out_transform` parameter for `OLSRegressionStep`

#### 0.2.dev6 (2019-04-04)

- introduces classes for storing common settings: `shared.CoreTemplateSettings`, `shared.OutputColumnSettings`
- adds new shared functions: `shared.register_column()`, `utils.cols_in_expression()`
- modifies `ColumnFromExpression` template to divide its parameters into three groups

#### 0.2.dev5 (2019-03-29)

- adds new template: `data.ColumnFromExpression`

#### 0.2.dev4 (2019-03-26)

- adds new data management utilities: `utils.validate_table()`, `utils.validate_all_tables()`, `utils.merge_tables()`
- updates `utils.get_data()` to use the new merge tool
- updates `BinaryLogitStep` and `OLSRegressionStep` to use the shared to use `utils.get_data()`, removing any reliance on Orca broadcasts
- raises the `pandas` requirement to 0.23

#### 0.2.dev3 (2019-03-21)

- adds an `mct` argment to `SegmentedLargeMultinomialLogitStep.fit_all()`
- adds an `interaction_terms` argument to `SegmentedLargeMultinomialLogitStep.run_all()`

#### 0.2.dev2 (2019-03-04)

- adds template for saving data: `data.SaveTable()`
- renames `io.TableFromDisk()` to `data.LoadTable()`

#### 0.2.dev1 (2019-02-27)

- fixes a crash in small MNL simulation

#### 0.2.dev0 (2019-02-19)

- adds first data i/o template: `io.TableFromDisk()`
- adds support for `autorun` template property


## 0.1.3 (2019-07-15)

- patch to incorporate the `out_transform` bug fix for `OLSRegressionStep`, from 0.2.dev7


## 0.1.2 (2019-02-28)

- patch to incorporate the small MNL bug fix from 0.2.dev1


## 0.1.1 (2019-02-05)

#### 0.1.1.dev1 (2019-01-30)

- adds support for passing multiple tables of interaction terms in large MNL
- enables on-the-fly creation of output columns in small MNL

### 0.1.1.dev0 (2019-01-20)
#### 0.1.1.dev0 (2019-01-20)

- allows join keys to be used as data filters in MNL simulation

### 0.1 (2019-01-16)

- first production release!
## 0.1 (2019-01-16)

### 0.1.dev25 (2019-01-15)
#### 0.1.dev25 (2019-01-15)

- fixes an OLS simulation bug that raised an error when the output column didn't exist yet

- implements `out_transform` for OLS simulation

### 0.1.dev24 (2018-12-20)
#### 0.1.dev24 (2018-12-20)

- fixes a string comparison bug that caused problems with binary logit output in Windows

- adds `model` as an attribute of large MNL model steps, which provides a `choicemodels.MultinomialLogitResults` object and is available any time after a model step is fitted

- enables on-the-fly creation of output columns in large MNL

- fixes a large MNL simulation bug when there are no valid choosers or alternatives after evaluating the filters

- moves unit tests out of the module directory

### 0.1.dev23 (2018-12-13)
#### 0.1.dev23 (2018-12-13)

- fixes a bug with interaction terms passed into `LargeMultinomialLogitStep.run()`

### 0.1.dev22 (2018-12-13)
#### 0.1.dev22 (2018-12-13)

- narrows the output of `utils.get_data()` to include only the columns requested (plus the index of the primary table) -- previously Orca had also provided some extra columns such as join keys

### 0.1.dev21 (2018-12-11)
#### 0.1.dev21 (2018-12-11)

- adds a new function `utils.get_data()` to assemble data from Orca, automatically detecting columns included in model expressions and filters

- implements `SegmentedLargeMultinomialLogit.run_all()`

### 0.1.dev20 (2018-12-11)
#### 0.1.dev20 (2018-12-11)

- fixes a model expression persistence bug in the small MNL template

### 0.1.dev19 (2018-12-06)
#### 0.1.dev19 (2018-12-06)

- fixes a bug to allow large MNL simulation with multiple chooser tables

### 0.1.dev18 (2018-11-19)
#### 0.1.dev18 (2018-11-19)

- improves installation and testing

### 0.1.dev17 (2018-11-15)
#### 0.1.dev17 (2018-11-15)

- adds an `interaction_terms` parameter that users can manually pass to `LargeMultinomialLogitStep.run()`, as a temporary solution until interaction terms are fully handled by the templates

- also adds a `chooser_batch_size` parameter in the same place, to reduce memory pressure when there are large numbers of choosers

### 0.1.dev16 (2018-11-06)
#### 0.1.dev16 (2018-11-06)

- adds a tool for testing template validity

### 0.1.dev15 (2018-10-15)
#### 0.1.dev15 (2018-10-15)

- adds new `LargeMultinomialLogitStep` parameters related to choice simulation: `constrained_choices`, `alt_capacity`, `chooser_size`, and `max_iter`

- updates `LargeMultinomialLogitStep.run()` to use improved simulation utilities from ChoiceModels 0.2.dev4

### 0.1.dev14 (2018-09-25)
#### 0.1.dev14 (2018-09-25)

- adds a template for segmented large MNL models: `SegmentedLargeMultinomialLogitStep`, which can automatically generate a set of large MNL models based on segmentation rules

### 0.1.dev13 (2018-09-24)
#### 0.1.dev13 (2018-09-24)

- adds a `@modelmanager.template` decorator that makes a class available to the currently running instance of ModelManager

### 0.1.dev12 (2018-09-19)
#### 0.1.dev12 (2018-09-19)

- moves the `register()` operation to `modelmanager` (previously it was a method implemented by the individual templates)

- adds general ModelManager support for supplemental objects like pickled model results
- adds general ModelManager support for supplemental objects like pickled model results
110 changes: 83 additions & 27 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,55 +1,111 @@
Thanks for using UrbanSim Templates! This is an open source project that's part of the Urban Data Science Toolkit. Development and maintenance is a collaboration between UrbanSim Inc and U.C. Berkeley's Urban Analytics Lab. You can contact Sam Maurer, the lead developer, at `maurer@urbansim.com`.
Thanks for using UrbanSim Templates!

### If you encounter an error or find a bug:
This is an open source project that's part of the Urban Data Science Toolkit. Development and maintenance is a collaboration between UrbanSim Inc and U.C. Berkeley's Urban Analytics Lab.

- Take a look at the [open issues](https://github.com/UDST/urbansim_templates/issues) and [closed issues](https://github.com/UDST/urbansim_templates/issues?q=is%3Aissue+is%3Aclosed) to see if there's already a discussion of the problem
You can contact Sam Maurer, the lead developer, at `maurer@urbansim.com`.

- Open a new issue describing the problem: circumstances, error messages, operating system you are using, version of python, and version of any libraries that may be relevant

### If you have a feature proposal:
## If you have a problem:

- Take a look at the [open issues](https://github.com/UDST/urbansim_templates/issues) and [closed issues](https://github.com/UDST/urbansim_templates/issues?q=is%3Aissue+is%3Aclosed) to see if there's already a discussion of the topic
- Take a look at the [open issues](https://github.com/UDST/urbansim_templates/issues) and [closed issues](https://github.com/UDST/urbansim_templates/issues?q=is%3Aissue+is%3Aclosed) to see if there's already a related discussion

- Open a new issue describing the problem -- if possible, include any error messages, the operating system and version of python you're using, and versions of any libraries that may be relevant


## Feature proposals:

- Take a look at the [open issues](https://github.com/UDST/urbansim_templates/issues) and [closed issues](https://github.com/UDST/urbansim_templates/issues?q=is%3Aissue+is%3Aclosed) to see if there's already a related discussion

- Post your proposal as a new issue, so we can discuss it (some proposals may not be a good fit for the project)

### Adding a feature or fixing a bug:

- Create a new branch of UDST/urbansim_templates, or fork the repository to your own account
## Contributing code:

- Create a new branch of `UDST/urbansim_templates`, or fork the repository to your own account

- Make your changes, following the existing styles for code and inline documentation

- Add [tests](https://github.com/UDST/urbansim_templates/tree/master/tests) if possible!

- Open a pull request to the `UDST/urbansim_templates` master branch, including a writeup of your changes -- take a look at some of the closed PR's for examples

- Current maintainers will review the code, suggest changes, and hopefully merge it!


## Updating the version number:

- Each pull request that changes substantive code should increment the development version number, e.g. from `0.2.dev7` to `0.2.dev8`, so that users know exactly which version they're running

- It works best to do this just before merging (in case other PR's are merged first, and so you know the release date for the changelog and documentation)

- There are three places where the version number needs to be changed:
- `setup.py`
- `urbansim_templates/__init__.py`
- `docs/source/index.rst`

- Please also add a section to `CHANGELOG.md` describing the changes!


## Updating the documentation:

- See instructions in `docs/README.md`


## Preparing a production release:

- Make a new branch for release prep

- Update the version number and `CHANGELOG.md`

- Make sure all the tests are passing, and check if updates are needed to `README.md` or to the documentation

- Open a pull request to the master branch to finalize it

- After merging, tag the release on Github and follow the distribution procedures below


## Patching an earlier release:

- We're not maintaining separate code branches for dev/ production/ major releases, but you can easily recreate them from tags if you need to patch an earlier release

- In Github, create a new branch from the tag for the version you'd like to patch, calling it something like `v1-production`

- Create a second branch from that one, called something like `v1-patch`

- Make your changes, adhering to the existing styles for coding, commenting, and especially the documentation strings at the beginning of functions
- Make your changes in the `v1-patch` branch, and open a PR to `v1-production` to finalize it

- Add [tests](https://github.com/UDST/urbansim_templates/tree/master/tests) if possible
- After merging, tag the release on Github and follow the normal distribution procedures

- When you're ready to begin code review, open a pull request to the UDST/urbansim_templates master branch
- After the new release is tagged, you can delete the extra branches -- a branch is just a pointer to the latest commit in a chain, and these commits will still be accessible via the tag

- The pull request writeup should be clear and thorough, to facilitate code review, documentation, and release notes (see [example here](https://github.com/UDST/choicemodels/pull/43)). First, briefly summarize the changes, referencing any associated issue threads. Then describe the changes in more detail: implementation, usage, performance, and anything else that's relevant

- Make note in the pull request writeup of any API changes (class/method/function names, parameters, and behavior), particularly changes that could affect users' existing code
## Distributing a release on PyPI (for pip installation):

- Each substantial pull request should increment the development version number, e.g. from 0.2.dev7 to 0.2.dev8
- Register an account at https://pypi.org, ask one of the current maintainers to add you to the project, and `pip install twine`

- If incrementing the version number: (1) update `setup.py`, (2) update `urbansim_templates/__init__.py`, (3) add a section to `CHANGELOG.md`, and (4) add the version number to the beginning of the pull request name
- Check out the copy of the code you'd like to release

### Preparing a production release:
- Run `python setup.py sdist bdist_wheel --universal`

- Create a branch for release prep
- This should create a `dist` directory containing two package files -- delete any old ones before the next step

- Make sure all the tests are passing
- Run `twine upload dist/*` -- this will prompt you for your pypi.org credentials

- Update the version number (e.g. from 0.2.dev8 to 0.2) in `setup.py` and `urbansim_templates/__init__.py`
- Check https://pypi.org/project/urbansim-templates/ for the new version

- Update `CHANGELOG.md`, collapsing development release sections into a single, reorganized list

- Check if updates are needed to `README.md` and to the documentation source files
## Distributing a release on Conda Forge (for conda installation):

- Rebuild the documentation webpages (DETAILS TK)
- Make a fork of the [conda-forge/urbansim_templates-feedstock](https://github.com/conda-forge/urbansim_templates-feedstock) repository -- there may already be a fork in udst

- Open a pull request to the master branch
- Edit `recipe/meta.yaml`:
- update the version number
- paste a new hash matching the tar.gz file that was uploaded to pypi (it's available on the pypi.org project page)

- Merge the pull request
- Check that the run requirements still match `requirements.txt`

- Tag the release on Github
- Open a pull request to the `conda-forge/urbansim_templates-feedstock` master branch

- Update the Python Package Index (DETAILS TK)
- Automated tests will run, and after they pass one of the current project maintainers will be able to merge the PR -- you can add your Github user name to the maintainers list in `meta.yaml` for the next update

- Update the UDST Conda channel (DETAILS TK)
- Check https://anaconda.org/conda-forge/urbansim-templates for the new version (may take a few minutes for it to appear)
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[![Build Status](https://travis-ci.org/UDST/urbansim_templates.svg?branch=master)](https://travis-ci.org/UDST/urbansim_templates)
[![Coverage Status](https://coveralls.io/repos/github/UDST/urbansim_templates/badge.svg?branch=master)](https://coveralls.io/github/UDST/urbansim_templates?branch=master)
[![Docs Status](https://readthedocs.org/projects/urbansim_templates/badge/?version=latest)](https://docs.udst.org/projects/urbansim-templates/en/latest)

# UrbanSim Templates

@@ -9,7 +8,7 @@ UrbanSim Templates is a Python library that provides building blocks for Orca-ba
The library contains templates for common types of model steps, plus a tool called ModelManager that runs as an extension to the [Orca](https://udst.github.io/orca) task orchestrator. ModelManager can register template-based model steps with the orchestrator, save them to disk, and automatically reload them for future sessions. The package was developed to make it easier to set up new simulation models — model step templates reduce the need for custom code and make settings more portable between models.

### Installation
UrbanSim Templates can be installed using the Pip or Conda package managers:
UrbanSim Templates can be installed using the Pip or Conda package managers.

```
pip install urbansim_templates
@@ -21,8 +20,8 @@ conda install urbansim_templates --channel conda-forge

### Documentation

See the online documentation for much more: [http://docs.udst.org/projects/urbansim-templates](https://docs.udst.org/projects/urbansim-templates/en/latest)
See the online documentation for much more: https://udst.github.io/urbansim_templates

Some additional documentation is available within the repo in `CHANGELOG.md`, `CONTRIBUTING.md`, `/docs/README.md`, and `/tests/README.md`.

There's discussion of current and planned features in the [Pull requests](https://github.com/udst/urbansim_templates/pulls?utf8=✓&q=is%3Apr) and [Issues](https://github.com/udst/urbansim_templates/issues?utf8=✓&q=is%3Aissue), both open and closed.
There's discussion of current and planned features in the [pull requests](https://github.com/udst/urbansim_templates/pulls?utf8=✓&q=is%3Apr) and [issues](https://github.com/udst/urbansim_templates/issues?utf8=✓&q=is%3Aissue), both open and closed.
Empty file removed docs/.nojekyll
Empty file.
Loading