From 4e19fdaa3ae380a97a2d7930d6fb4cb73ad0f76c Mon Sep 17 00:00:00 2001 From: Yue Shuai <48269801+yueshuaing@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:41:34 -0800 Subject: [PATCH 1/4] limit multimethod version to 2.0 and earlier --- conda-environments/github-actions-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-environments/github-actions-tests.yml b/conda-environments/github-actions-tests.yml index 692ee11928..4489cba886 100644 --- a/conda-environments/github-actions-tests.yml +++ b/conda-environments/github-actions-tests.yml @@ -12,6 +12,7 @@ dependencies: - cytoolz = 0.12.2 - dask = 2023.3.2 - isort = 5.12.0 +- multimethod <2.0 - nbmake = 1.4.6 - numba = 0.57.* - numpy = 1.23.5 From c4cf262e28e08859a034687443c694605e64ac77 Mon Sep 17 00:00:00 2001 From: Yue Shuai <48269801+yueshuaing@users.noreply.github.com> Date: Fri, 7 Feb 2025 15:01:12 -0800 Subject: [PATCH 2/4] add multimethod version to other settings --- conda-environments/activitysim-dev-base.yml | 1 + conda-environments/activitysim-dev.yml | 1 + conda-environments/docbuild.yml | 1 + pyproject.toml | 1 + 4 files changed, 4 insertions(+) diff --git a/conda-environments/activitysim-dev-base.yml b/conda-environments/activitysim-dev-base.yml index f7aa5c735b..489de345b3 100644 --- a/conda-environments/activitysim-dev-base.yml +++ b/conda-environments/activitysim-dev-base.yml @@ -33,6 +33,7 @@ dependencies: - jupyterlab - larch = 5.7.* - matplotlib +- multimethod <2.0 - myst-parser # allows markdown in sphinx - nbconvert - nbformat diff --git a/conda-environments/activitysim-dev.yml b/conda-environments/activitysim-dev.yml index 107b4b355e..b69a69f239 100644 --- a/conda-environments/activitysim-dev.yml +++ b/conda-environments/activitysim-dev.yml @@ -29,6 +29,7 @@ dependencies: - jupyterlab - larch = 5.7.* - matplotlib +- multimethod <2.0 - myst-parser # allows markdown in sphinx - nbconvert - nbformat diff --git a/conda-environments/docbuild.yml b/conda-environments/docbuild.yml index 2553fbb17f..06fb6e5ace 100644 --- a/conda-environments/docbuild.yml +++ b/conda-environments/docbuild.yml @@ -25,6 +25,7 @@ dependencies: - jupyterlab - larch >=5.5.3 - matplotlib +- multimethod <2.0 - myst-nb - myst-parser - numba >= 0.57 diff --git a/pyproject.toml b/pyproject.toml index b92b00856c..693a2ac03d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,6 +11,7 @@ name = "activitysim" dynamic = ["version"] dependencies = [ "cytoolz >= 0.8.1", + "multimethod <2.0", "numba >= 0.57", "numpy >= 1.16.1, <2", "openmatrix >= 0.3.4.1", From aad9a70c3b6a75d0e119f14f5c3c1553f411f3e2 Mon Sep 17 00:00:00 2001 From: Yue Shuai <48269801+yueshuaing@users.noreply.github.com> Date: Fri, 14 Feb 2025 11:45:45 -0800 Subject: [PATCH 3/4] [makedocs] update installer download link --- docs/gettingstarted.rst | 2 +- docs/users-guide/modelsetup.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst index 3dcb27bada..e318cdba58 100644 --- a/docs/gettingstarted.rst +++ b/docs/gettingstarted.rst @@ -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 `_. +Download the installer from GitHub `here `_. 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 diff --git a/docs/users-guide/modelsetup.rst b/docs/users-guide/modelsetup.rst index 3ba8c650a2..2a64830625 100644 --- a/docs/users-guide/modelsetup.rst +++ b/docs/users-guide/modelsetup.rst @@ -134,7 +134,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 `_. +Download the installer from GitHub `here `_. 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 From 911785f895a231e0eae38cbddf50cc9e7a6c8d5a Mon Sep 17 00:00:00 2001 From: Yue Shuai <48269801+yueshuaing@users.noreply.github.com> Date: Fri, 14 Feb 2025 16:13:49 -0800 Subject: [PATCH 4/4] [makedocs] update branch docs --- .github/workflows/branch-docs.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/branch-docs.yml b/.github/workflows/branch-docs.yml index 6447d047d1..4330006173 100644 --- a/.github/workflows/branch-docs.yml +++ b/.github/workflows/branch-docs.yml @@ -19,12 +19,10 @@ jobs: with: fetch-depth: 0 # get all tags, lets setuptools_scm do its thing - - name: Setup Mambaforge + - name: Setup Miniforge uses: conda-incubator/setup-miniconda@v2 with: - miniforge-variant: Mambaforge miniforge-version: latest - use-mamba: true python-version: "3.10" activate-environment: docbuild auto-activate-base: false @@ -40,7 +38,7 @@ jobs: id: cache - name: Update environment - run: mamba env update --verbose -n docbuild -f conda-environments/docbuild.yml + run: conda env update --verbose -n docbuild -f conda-environments/docbuild.yml if: steps.cache.outputs.cache-hit != 'true' - name: Install activitysim