From 1a5cd184c33dd5073ddf8f0d5a21b041efba5dad Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Sat, 7 Sep 2024 10:36:52 -0500 Subject: [PATCH] Pin more instances of proj. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/libcuspatial/meta.yaml | 4 ++-- dependencies.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 000e38a93..013199e88 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -36,7 +36,7 @@ dependencies: - nvcc_linux-64=11.8 - osmnx>=1.9.3 - pre-commit -- proj +- proj >=9.3.0,<9.3.1.0a0 - pydata-sphinx-theme!=0.14.2 - pydeck - pylibcudf==24.10.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index eeafde212..b6d0c688f 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -38,7 +38,7 @@ dependencies: - numpydoc - osmnx>=1.9.3 - pre-commit -- proj +- proj >=9.3.0,<9.3.1.0a0 - pydata-sphinx-theme!=0.14.2 - pydeck - pylibcudf==24.10.*,>=0.0.0a0 diff --git a/conda/recipes/libcuspatial/meta.yaml b/conda/recipes/libcuspatial/meta.yaml index 3e212690c..177037568 100644 --- a/conda/recipes/libcuspatial/meta.yaml +++ b/conda/recipes/libcuspatial/meta.yaml @@ -49,7 +49,7 @@ requirements: - libcudf ={{ minor_version }} - librmm ={{ minor_version }} - sqlite - - proj + - proj >=9.3.0,<9.3.1.0a0 # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb outputs: - name: libcuspatial @@ -85,7 +85,7 @@ outputs: - libcudf ={{ minor_version }} - librmm ={{ minor_version }} - sqlite - - proj + - proj >=9.3.0,<9.3.1.0a0 # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb test: commands: - test -f $PREFIX/lib/libcuspatial.so diff --git a/dependencies.yaml b/dependencies.yaml index 57d122642..1f9856f4e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -183,7 +183,7 @@ dependencies: packages: - c-compiler - cxx-compiler - - proj + - proj >=9.3.0,<9.3.1.0a0 # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb - sqlite specific: - output_types: conda