Skip to content

Commit

Permalink
Merge branch 'cfg-documentation-vy' of https://github.com/camsys/acti…
Browse files Browse the repository at this point in the history
…vitysim into cfg-documentation-vy
  • Loading branch information
vivekyadav26 committed Nov 7, 2023
2 parents b40dffc + 73fc620 commit 34adea1
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/branch-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
id: cache

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

- name: Install activitysim
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ sandbox/
.pytest_cache
.vagrant


# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
4 changes: 2 additions & 2 deletions conda-environments/activitysim-dev-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies:
- pydata-sphinx-theme
- pyinstrument = 4.4
- pypyr = 5.8.*
- pytables >=3.5.1,<3.7
- pytables >=3.9
- pytest = 7.2.*
- pytest-cov
- pytest-regressions
Expand All @@ -74,4 +74,4 @@ dependencies:
- zstandard

- pip:
- autodoc_pydantic
- autodoc_pydantic >=1.9,<2.0
4 changes: 2 additions & 2 deletions conda-environments/activitysim-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies:
- pydata-sphinx-theme
- pyinstrument = 4.4
- pypyr = 5.8.*
- pytables >=3.5.1,<3.7
- pytables >=3.9
- pytest = 7.2.*
- pytest-cov
- pytest-regressions
Expand All @@ -70,5 +70,5 @@ dependencies:
- zstandard

- pip:
- autodoc_pydantic
- autodoc_pydantic >=1.9,<2.0
- -e ..
4 changes: 2 additions & 2 deletions conda-environments/docbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies:
- pyarrow >= 2.0
- pydantic = 1.10.*
- pypyr >= 5.3
- pytables >=3.5.1,<3.7
- pytables >=3.9
- pytest
- pytest-cov
- pytest-regressions
Expand All @@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
- autodoc_pydantic
- autodoc_pydantic >=1.9,<2.0
- -e ..
2 changes: 1 addition & 1 deletion conda-environments/github-actions-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
- pyarrow = 11.*
- pydantic = 1.10.*
- pypyr = 5.8.*
- pytables >= 3.5.1,<3.7 # orca's constraint
- pytables >= 3.9
- pytest = 7.2.*
- pytest-cov
- pytest-regressions
Expand Down

0 comments on commit 34adea1

Please sign in to comment.