Skip to content

Commit 73fc620

Browse files
authored
Merge pull request #13 from camsys/cfg-docs-jn-2
documentation builds better
2 parents a24d8e4 + ff87616 commit 73fc620

6 files changed

Lines changed: 8 additions & 9 deletions

File tree

.github/workflows/branch-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
id: cache
4141

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

4646
- name: Install activitysim

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ sandbox/
55
.pytest_cache
66
.vagrant
77

8-
98
# Byte-compiled / optimized / DLL files
109
__pycache__/
1110
*.py[cod]

conda-environments/activitysim-dev-base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- pydata-sphinx-theme
5353
- pyinstrument = 4.4
5454
- pypyr = 5.8.*
55-
- pytables >=3.5.1,<3.7
55+
- pytables >=3.9
5656
- pytest = 7.2.*
5757
- pytest-cov
5858
- pytest-regressions
@@ -74,4 +74,4 @@ dependencies:
7474
- zstandard
7575

7676
- pip:
77-
- autodoc_pydantic
77+
- autodoc_pydantic >=1.9,<2.0

conda-environments/activitysim-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies:
4747
- pydata-sphinx-theme
4848
- pyinstrument = 4.4
4949
- pypyr = 5.8.*
50-
- pytables >=3.5.1,<3.7
50+
- pytables >=3.9
5151
- pytest = 7.2.*
5252
- pytest-cov
5353
- pytest-regressions
@@ -70,5 +70,5 @@ dependencies:
7070
- zstandard
7171

7272
- pip:
73-
- autodoc_pydantic
73+
- autodoc_pydantic >=1.9,<2.0
7474
- -e ..

conda-environments/docbuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies:
3838
- pyarrow >= 2.0
3939
- pydantic = 1.10.*
4040
- pypyr >= 5.3
41-
- pytables >=3.5.1,<3.7
41+
- pytables >=3.9
4242
- pytest
4343
- pytest-cov
4444
- pytest-regressions
@@ -56,5 +56,5 @@ dependencies:
5656
- zarr
5757

5858
- pip:
59-
- autodoc_pydantic
59+
- autodoc_pydantic >=1.9,<2.0
6060
- -e ..

conda-environments/github-actions-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies:
2323
- pyarrow = 11.*
2424
- pydantic = 1.10.*
2525
- pypyr = 5.8.*
26-
- pytables >= 3.5.1,<3.7 # orca's constraint
26+
- pytables >= 3.9
2727
- pytest = 7.2.*
2828
- pytest-cov
2929
- pytest-regressions

0 commit comments

Comments
 (0)