Skip to content

Commit bf64b7b

Browse files
authored
Resolve package version conflicts (#923)
* limit multimethod version to 2.0 and earlier * add multimethod version to other settings * [makedocs] update installer download link * [makedocs] update branch docs
1 parent 171f172 commit bf64b7b

File tree

8 files changed

+9
-6
lines changed

8 files changed

+9
-6
lines changed

.github/workflows/branch-docs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ jobs:
1919
with:
2020
fetch-depth: 0 # get all tags, lets setuptools_scm do its thing
2121

22-
- name: Setup Mambaforge
22+
- name: Setup Miniforge
2323
uses: conda-incubator/setup-miniconda@v2
2424
with:
25-
miniforge-variant: Mambaforge
2625
miniforge-version: latest
27-
use-mamba: true
2826
python-version: "3.10"
2927
activate-environment: docbuild
3028
auto-activate-base: false
@@ -40,7 +38,7 @@ jobs:
4038
id: cache
4139

4240
- name: Update environment
43-
run: mamba env update --verbose -n docbuild -f conda-environments/docbuild.yml
41+
run: conda env update --verbose -n docbuild -f conda-environments/docbuild.yml
4442
if: steps.cache.outputs.cache-hit != 'true'
4543

4644
- name: Install activitysim

conda-environments/activitysim-dev-base.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies:
3333
- jupyterlab
3434
- larch = 5.7.*
3535
- matplotlib
36+
- multimethod <2.0
3637
- myst-parser # allows markdown in sphinx
3738
- nbconvert
3839
- nbformat

conda-environments/activitysim-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies:
2929
- jupyterlab
3030
- larch = 5.7.*
3131
- matplotlib
32+
- multimethod <2.0
3233
- myst-parser # allows markdown in sphinx
3334
- nbconvert
3435
- nbformat

conda-environments/docbuild.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies:
2525
- jupyterlab
2626
- larch >=5.5.3
2727
- matplotlib
28+
- multimethod <2.0
2829
- myst-nb
2930
- myst-parser
3031
- numba >= 0.57

conda-environments/github-actions-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies:
1212
- cytoolz = 0.12.2
1313
- dask = 2023.3.2
1414
- isort = 5.12.0
15+
- multimethod <2.0
1516
- nbmake = 1.4.6
1617
- numba = 0.57.*
1718
- numpy = 1.23.5

docs/gettingstarted.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ installs a variety of things on your system, and it is quite likely to be flagge
2424
Windows, anti-virus, or institutional IT policies as "unusual" software, which
2525
may require special treatment to actually install and use.
2626

27-
Download the installer from GitHub `here <https://github.com/ActivitySim/activitysim/releases/download/v1.2.0/Activitysim-1.2.0-Windows-x86_64.exe>`_.
27+
Download the installer from GitHub `here <https://github.com/ActivitySim/activitysim/releases/download/v1.3.1/Activitysim-1.3.1-Windows-x86_64.exe>`_.
2828
It is strongly recommended to choose the option to install "for me only", as this
2929
should not require administrator privileges on your machine. Pay attention
3030
to the *complete path* of the installation location. You will need to know

docs/users-guide/modelsetup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ installs a variety of things on your system, and it is quite likely to be flagge
134134
Windows, anti-virus, or institutional IT policies as "unusual" software, which
135135
may require special treatment to actually install and use.
136136

137-
Download the installer from GitHub `here <https://github.com/ActivitySim/activitysim/releases/download/v1.2.0/Activitysim-1.2.0-Windows-x86_64.exe>`_.
137+
Download the installer from GitHub `here <https://github.com/ActivitySim/activitysim/releases/download/v1.3.1/Activitysim-1.3.1-Windows-x86_64.exe>`_.
138138
It is strongly recommended to choose the option to install "for me only", as this
139139
should not require administrator privileges on your machine. Pay attention
140140
to the *complete path* of the installation location. You will need to know

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ name = "activitysim"
1111
dynamic = ["version"]
1212
dependencies = [
1313
"cytoolz >= 0.8.1",
14+
"multimethod <2.0",
1415
"numba >= 0.57",
1516
"numpy >= 1.16.1, <2",
1617
"openmatrix >= 0.3.4.1",

0 commit comments

Comments
 (0)