Fix conda build issues... hopefully...

revans2 · Mar 14, 2019 · 68b92c0 · 68b92c0
1 parent f3580db
commit 68b92c0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 31 deletions.
diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
@@ -62,10 +62,6 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
 # BUILD - Conda package builds (conda deps: libcudf <- libcudf_cffi <- cudf)
 ################################################################################
 
-# Temporary testing - Try to fix openssl version issues
-logger "conda install -c conda-forge openssl=1.0.2r"
-conda install -y -c conda-forge openssl=1.0.2r
-
 logger "Build conda pkg for libcudf..."
 source ci/cpu/libcudf/build_libcudf.sh
 

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
@@ -40,10 +40,6 @@ conda list
 # BUILD - Build libcudf and cuDF from source
 ################################################################################
 
-# Temporarily install feather for testing
-logger "conda install -c rapidsai-nightly nvstrings=0.3.0dev0"
-conda install -c rapidsai -c rapidsai-nightly -c conda-forge -y openssl=1.0.2r nvstrings=0.3.0dev0
-
 logger "Build libcudf..."
 mkdir -p $WORKSPACE/cpp/build
 cd $WORKSPACE/cpp/build

diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml
@@ -27,25 +27,25 @@ requirements:
   #   - defaults
   build:
     - python x.x
-    - cython>=0.29,<0.30
+    - cython >=0.29,<0.30
     - setuptools
-    - libcudf={{ version }}
-    - libcudf_cffi={{ version }}
-    - numba>=0.40
-    - nvstrings=0.3.0dev0
+    - libcudf {{ version }}
+    - libcudf_cffi {{ version }}
+    - numba >=0.40
+    - nvstrings 0.3*
   run:
     - python x.x
-    - cython>=0.29,<0.30
+    - cython >=0.29,<0.30
     - setuptools
-    - libcudf={{ version }}
-    - libcudf_cffi={{ version }}
-    - pandas>=0.23.4
-    - numba>=0.40
-    - nvstrings=0.3.0dev0
+    - libcudf {{ version }}
+    - libcudf_cffi {{ version }}
+    - pandas >=0.23.4
+    - numba >=0.40
+    - nvstrings 0.3*
 
 test:
   requires:
-    - distributed>=1.23.0
+    - distributed >=1.23.0
     - pytest
   imports:
     - cudf

diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml
@@ -31,11 +31,11 @@ requirements:
   #   - conda-forge
   #   - defaults
   build:
-    - cmake>=3.12.4
-    - nvstrings=0.3.0dev0
+    - cmake >=3.12.4
+    - nvstrings 0.3*
   run:
-    - pyarrow=0.12.1
-    - nvstrings=0.3.0dev0
+    - pyarrow 0.12.1
+    - nvstrings 0.3*
 
 test:
   commands:

diff --git a/conda/recipes/libcudf_cffi/meta.yaml b/conda/recipes/libcudf_cffi/meta.yaml
@@ -32,19 +32,19 @@ requirements:
   #   - conda-forge
   #   - defaults
   build:
-    - cmake>=3.12.4
+    - cmake >=3.12.4
     - python x.x
     - cffi
     - setuptools
-    - nvstrings=0.3.0dev0
-    - pycparser=2.19
-    - pyarrow=0.12.1
+    - nvstrings 0.3*
+    - pycparser 2.19
+    - pyarrow 0.12.1
   run:
-    - libcudf={{ version }}
+    - libcudf {{ version }}
     - python x.x
     - cffi
-    - pycparser=2.19
-    - pyarrow=0.12.1
+    - pycparser 2.19
+    - pyarrow 0.12.1
 
 test:
   commands: