bundle zeromq on Windows + py35

win+py35 isn't importing in downstream packages, so try building it the same as everything else.
conda-forge · Jul 15, 2016 · 846b610 · 846b610
1 parent 78f0850
commit 846b610
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -7,9 +7,7 @@ set DISTUTILS_USE_SDK=1
 :: https://github.com/conda-forge/staged-recipes/pull/292 has some more detail.
 
 set ZMQ=%LIBRARY_PREFIX%
-IF %CONDA_PY% LSS 35 (
-    SET ZMQ=bundled
-)
+set ZMQ=bundled
 
 "%PYTHON%" setup.py configure --zmq "%ZMQ%"
 if errorlevel 1 exit 1

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -10,7 +10,7 @@ source:
   md5: 87e3abb33af5794db5ae85c667bbf324
 
 build:
-  number: 1
+  number: 2
 
 # On Windows ZeroMQ is bundled with pyzmq.
 # On Windows pyzmq includes tweetnacl so libsodium is not used.
@@ -21,11 +21,11 @@ requirements:
   build:
     - pkg-config  # [not win]
     - python
-    - zeromq      # [not win or (win and py35)]
+    - zeromq      # [not win]
     - libsodium   # [not win]
   run:
     - python
-    - zeromq      # [not win or (win and py35)]
+    - zeromq      # [not win]
     - libsodium   # [not win]
 
 test: