Skip to content

Commit

Permalink
Merge branch 'branch-23.12' into stream-strings-filter
Browse files Browse the repository at this point in the history
  • Loading branch information
davidwendt committed Oct 26, 2023
2 parents cf35ff3 + 203f1df commit baa2038
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ dependencies:
- protobuf>=4.21,<5
- ptxcompiler
- pyarrow==12.0.1.*
- pydata-sphinx-theme
- pydata-sphinx-theme!=0.14.2
- pytest
- pytest-benchmark
- pytest-cases
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ dependencies:
- pre-commit
- protobuf>=4.21,<5
- pyarrow==12.0.1.*
- pydata-sphinx-theme
- pydata-sphinx-theme!=0.14.2
- pytest
- pytest-benchmark
- pytest-cases
Expand Down
3 changes: 2 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,8 @@ dependencies:
- nbsphinx
- numpydoc
- pandoc
- pydata-sphinx-theme
# https://github.com/pydata/pydata-sphinx-theme/issues/1539
- pydata-sphinx-theme!=0.14.2
- scipy
- sphinx
- sphinx-autobuild
Expand Down

0 comments on commit baa2038

Please sign in to comment.