diff --git a/ci/conda/recipes/morpheus/meta.yaml b/ci/conda/recipes/morpheus/meta.yaml index 039920e272..ba9e0c6f96 100644 --- a/ci/conda/recipes/morpheus/meta.yaml +++ b/ci/conda/recipes/morpheus/meta.yaml @@ -92,6 +92,7 @@ outputs: - pandas 1.3.* - pluggy 1.0.* - pyarrow * *_cuda # Ensure we get a CUDA build. Version determined by cuDF + - pyarrow-hotfix # CVE-2023-47248 - python - python-confluent-kafka 1.9.2 - pytorch 2.0.1 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 52ad033372..9b2588f8a5 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -34,7 +34,7 @@ dependencies: - cython=0.29.24 - dask>=2023.1.1 - datacompy=0.8 -- dgl=1.1.1 +- dgl=1.0.2 - dill - dill=0.3.6 - distributed>=2023.1.1 @@ -46,6 +46,7 @@ dependencies: - flake8 - gcc_linux-64=11.2 - git-lfs +- glog=0.6 - grpcio - gxx_linux-64=11.2 - huggingface_hub=0.10.1 @@ -65,7 +66,6 @@ dependencies: - ninja=1.10 - nlohmann_json=3.9 - nodejs=18.* -- numpy>=1.21,<1.25 - numpydoc=1.4 - nvtabular=23.06 - openai=0.28 @@ -74,6 +74,7 @@ dependencies: - pluggy=1.0 - pre-commit - protobuf=4.21.* +- pyarrow-hotfix - pybind11-stubgen=0.10 - pylint>=2.17.4,<2.18 - pypdf=3.16 @@ -95,13 +96,13 @@ dependencies: - sphinx - sphinx_rtd_theme - sqlalchemy<2.0 -- sysroot_linux-64=2.17 - tqdm=4 - transformers=4.30.2 - tritonclient=2.26 - typing_utils=0.1 - ucx=1.14 - ujson=5.8 +- versioneer - watchdog=2.1 - websockets - yapf=0.40.1 @@ -111,9 +112,7 @@ dependencies: - grpcio-status==1.58 - milvus==2.3.2 - nemollm - - pyarrow_hotfix - pymilvus==2.3.2 - pytest-kafka==0.6.0 - - rapids-dependency-file-generator name: all_cuda-118_arch-x86_64_py-310 diff --git a/conda/environments/dev_cuda-118_arch-x86_64.yaml b/conda/environments/dev_cuda-118_arch-x86_64.yaml index 4d35b3507e..17b860dddd 100644 --- a/conda/environments/dev_cuda-118_arch-x86_64.yaml +++ b/conda/environments/dev_cuda-118_arch-x86_64.yaml @@ -38,6 +38,7 @@ dependencies: - flake8 - gcc_linux-64=11.2 - git-lfs +- glog=0.6 - grpcio - gxx_linux-64=11.2 - include-what-you-use=0.20 @@ -52,13 +53,13 @@ dependencies: - ninja=1.10 - nlohmann_json=3.9 - nodejs=18.* -- numpy>=1.21,<1.25 - numpydoc=1.4 - nvtabular=23.06 - pip - pluggy=1.0 - pre-commit - protobuf=4.21.* +- pyarrow-hotfix - pybind11-stubgen=0.10 - pylint>=2.17.4,<2.18 - pytest @@ -76,20 +77,18 @@ dependencies: - sphinx - sphinx_rtd_theme - sqlalchemy<2.0 -- sysroot_linux-64=2.17 - tqdm=4 - tritonclient=2.26 - typing_utils=0.1 - ucx=1.14 +- versioneer - watchdog=2.1 - websockets - yapf=0.40.1 - pip: - databricks-connect - milvus==2.3.2 - - pyarrow_hotfix - pymilvus==2.3.2 - pytest-kafka==0.6.0 - - rapids-dependency-file-generator name: dev_cuda-118_arch-x86_64_py-310 diff --git a/dependencies.yaml b/dependencies.yaml index 7f8b16b514..4c790e4080 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -246,6 +246,7 @@ dependencies: - numpy>=1.21,<1.25 - numpydoc=1.4 - nvtabular=23.06 + - pyarrow-hotfix - python-confluent-kafka=1.9.2 - python-graphviz - pytorch-cuda @@ -261,7 +262,6 @@ dependencies: - pip: - databricks-connect - milvus==2.3.2 - - pyarrow_hotfix - pymilvus==2.3.2 test_python_morpheus: diff --git a/docker/conda/environments/cuda11.8_dev.yml b/docker/conda/environments/cuda11.8_dev.yml index 2fc7576cde..3d6b029bbd 100644 --- a/docker/conda/environments/cuda11.8_dev.yml +++ b/docker/conda/environments/cuda11.8_dev.yml @@ -84,6 +84,7 @@ dependencies: - pluggy=1.0 - protobuf=4.21.* - pyarrow * *_cuda # Ensure we get a CUDA build. Version determined by cuDF + - pyarrow-hotfix # CVE-2023-47248. See morpheus/__init__.py for more details - pybind11-stubgen=0.10.5 - pydot - pylint>=2.17.4,<2.18 # 2.17.4 contains a fix for toml support @@ -125,6 +126,5 @@ dependencies: # Add additional dev dependencies here - databricks-connect - milvus==2.3.2 - - pyarrow_hotfix # CVE-2023-47248. See morpheus/__init__.py for more details - pymilvus==2.3.2 - pytest-kafka==0.6.0