diff --git a/conda-environments/activitysim-dev-base.yml b/conda-environments/activitysim-dev-base.yml index 166503e34b..ac061b6eaa 100644 --- a/conda-environments/activitysim-dev-base.yml +++ b/conda-environments/activitysim-dev-base.yml @@ -59,6 +59,7 @@ dependencies: - rich - ruby # required for benchmarking pre-commit hooks - setuptools_scm +- scikit-learn >= 1.1 - simwrapper > 1.7 - snakeviz # for profiling - sphinx diff --git a/conda-environments/activitysim-dev.yml b/conda-environments/activitysim-dev.yml index a788b9e74c..40e03ec108 100644 --- a/conda-environments/activitysim-dev.yml +++ b/conda-environments/activitysim-dev.yml @@ -55,6 +55,7 @@ dependencies: - rich - ruby # required for benchmarking pre-commit hooks - setuptools_scm +- scikit-learn >= 1.1 - sharrow >= 2.5.2 - simwrapper > 1.7 - snakeviz # for profiling diff --git a/conda-environments/docbuild.yml b/conda-environments/docbuild.yml index b6d1ebf5c1..782eff73db 100644 --- a/conda-environments/docbuild.yml +++ b/conda-environments/docbuild.yml @@ -41,6 +41,7 @@ dependencies: - pytest-regressions - pyyaml >= 5.1 - requests >= 2.7 +- scikit-learn >= 1.1 - sharrow >= 2.5.2 - simwrapper > 1.7 - sphinx-argparse diff --git a/conda-environments/github-actions-tests.yml b/conda-environments/github-actions-tests.yml index 4e5dce4076..f94ca7130a 100644 --- a/conda-environments/github-actions-tests.yml +++ b/conda-environments/github-actions-tests.yml @@ -26,6 +26,7 @@ dependencies: - pytest-regressions - pyyaml >= 5.1 - requests >= 2.7 +- scikit-learn >= 1.1 - sharrow >= 2.5.2 - simwrapper > 1.7 - scikit-learn >= 1.1.1 diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst index 8f75c21e62..e3eee6088b 100644 --- a/docs/gettingstarted.rst +++ b/docs/gettingstarted.rst @@ -11,6 +11,31 @@ This page describes how to get started with ActivitySim. .. index:: installation +Pre-packaged Installer +---------------------- + +Begining with version 1.2, ActivitySim is now available for Windows via a +pre-packaged installer. This installer provides everything you need to run +ActivitySim, including Python, all the necessary supporting packages, and +ActivitySim itself. You should only choose this installation process if you +plan to use ActivitySim but you don't need or want to do other Python +development. Note this installer is provided as an "executable" which (of course) +installs a variety of things on your system, and it is quite likely to be flagged by +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 /Scripts/ActivitySim.exe`. + + Installation ------------ diff --git a/setup.cfg b/setup.cfg index 6eaa64d182..cb3b413880 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,6 +35,7 @@ install_requires = pypyr >= 5.3 pyyaml >= 5.1 requests >= 2.7 + scikit-learn >= 1.1 sharrow >= 2.5 simwrapper > 1.7 tables >= 3.5.1