Skip to content

Commit

Permalink
Resolve package version conflicts (#923)
Browse files Browse the repository at this point in the history
* limit multimethod version to 2.0 and earlier

* add multimethod version to other settings

* [makedocs] update installer download link

* [makedocs] update branch docs
  • Loading branch information
yueshuaing authored Feb 25, 2025
1 parent 171f172 commit bf64b7b
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 6 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/branch-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions conda-environments/activitysim-dev-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies:
- jupyterlab
- larch = 5.7.*
- matplotlib
- multimethod <2.0
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
Expand Down
1 change: 1 addition & 0 deletions conda-environments/activitysim-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies:
- jupyterlab
- larch = 5.7.*
- matplotlib
- multimethod <2.0
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
Expand Down
1 change: 1 addition & 0 deletions conda-environments/docbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dependencies:
- jupyterlab
- larch >=5.5.3
- matplotlib
- multimethod <2.0
- myst-nb
- myst-parser
- numba >= 0.57
Expand Down
1 change: 1 addition & 0 deletions conda-environments/github-actions-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/gettingstarted.rst
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.3.1/Activitysim-1.3.1-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
2 changes: 1 addition & 1 deletion docs/users-guide/modelsetup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 </~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.3.1/Activitysim-1.3.1-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
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit bf64b7b

Please sign in to comment.