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.

Sign up for GitHub

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

Black 2022 style #642

Merged
merged 3 commits into from
Feb 6, 2023
Merged

Black 2022 style #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ae2186
keep black 2022 style for now
jpn-- Feb 2, 2023
e484f3f
typo in link
jpn-- Feb 2, 2023
573aa05
note about pre-package installer in quick start
jpn-- Feb 3, 2023
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
2 changes: 1 addition & 1 deletion conda-environments/activitysim-dev-base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- python=3.9
- pip
- asv # for benchmarking
- black
- black >= 22.0,<23
- bump2version # for making a release
- coveralls
- cytoolz >= 0.8.1
Expand Down
2 changes: 1 addition & 1 deletion conda-environments/activitysim-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- python=3.9
- pip
- asv # for benchmarking
- black
- black >= 22.0,<23
- bump2version # for making a release
- coveralls
- cytoolz >= 0.8.1
Expand Down
2 changes: 1 addition & 1 deletion conda-environments/docbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ channels:
dependencies:
- python=3.9
- pip
- black
- black >= 22.0,<23
- bump2version
- coveralls
- cytoolz >= 0.8.1
Expand Down
2 changes: 1 addition & 1 deletion conda-environments/github-actions-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channels:
- conda-forge
dependencies:
- pip
- black
- black >= 22.0,<23
- coveralls
- cytoolz >= 0.8.1
- isort
Expand Down
12 changes: 9 additions & 3 deletions docs/gettingstarted.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ installs a variety of things on your system, and it is quite likely to be flagge
Windows, anti-virus, or institutional IT policies as "unusual" software, which
may require special treatment to actually install and use.

Download the installer from GitHub `here <https://github.com/ActivitySim/activitysim/releases/download/v1.2.0/Activitysim-1.2.0-Windows-x86_64.exe`__.
Download the installer from GitHub `here <https://github.com/ActivitySim/activitysim/releases/download/v1.2.0/Activitysim-1.2.0-Windows-x86_64.exe>`__.
It is strongly recommended to choose the option to install "for me only", as this
should not require administrator privileges on your machine. Pay attention
to the *complete path* of the installation location. You will need to know
Expand Down Expand Up @@ -190,8 +190,14 @@ ActivitySim includes a :ref:`cli` for creating examples and running the model.
To setup and run the primary example (see :ref:`examples`), do the following:

* Open a command prompt
* Activate the conda environment with ActivitySim installed (i.e. ``conda activate asim``)
* Type ``activitysim create -e prototype_mtc -d test_prototype_mtc`` to copy the very small prototype_mtc example to a new test_prototype_mtc directory
* If you installed ActivitySim using conda environments, activate the conda
environment with ActivitySim installed (i.e. ``conda activate asim``)
* Or, if you used the :ref:`pre-packaged installer<Pre-packaged Installer>`,
replace all the commands below that call ``activitysim ...`` with the complete
path to your installed location, which is probably something
like ``c:\programdata\activitysim\scripts\activitysim.exe``.
* Type ``activitysim create -e prototype_mtc -d test_prototype_mtc`` to copy
the very small prototype_mtc example to a new test_prototype_mtc directory
* Change to the test_prototype_mtc directory
* Type ``activitysim run -c configs -o output -d data`` to run the example
* Review the outputs in the output directory
Expand Down