bump zlib requirement to be in sync with conda-forge (#7385)

* bump versoin number for new zlib version, add zlib ENV var * increase zlib dependency * pin zlib in ucsc template * add missing htslib pinning * incease htslib version * increase build number * fix review comments * a few more review comment fixes * next round of fixes * last lint fixes * wub: no need for rebuild
bioconda · Feb 3, 2018 · 048986e · 048986e
1 parent ffb7dbd
commit 048986e
Show file tree

Hide file tree

Showing 606 changed files with 2,044 additions and 1,988 deletions.
diff --git a/recipes/abricate/0.4/meta.yaml b/recipes/abricate/0.4/meta.yaml
@@ -3,7 +3,7 @@ package:
   version: "0.4"
 
 build:
-  number: 0
+  number: 1
 
 source:
   fn: abricate_v0.4.tar.gz
@@ -12,18 +12,18 @@ source:
 
 requirements:
   build: 
-  - gcc # [linux]
-  - llvm # [osx]
-  - zlib
+    - gcc # [linux]
+    - llvm # [osx]
+    - zlib {{CONDA_ZLIB}}*
   run:
-  - libgcc # [linux]
-  - perl
-  - perl-bioperl >=1.6.924
-  - perl-file-slurp
-  - perl-text-csv
-  - perl-list-moreutils
-  - blast >=2.2.30
-  - zlib
+    - libgcc # [linux]
+    - perl
+    - perl-bioperl >=1.6.924
+    - perl-file-slurp
+    - perl-text-csv
+    - perl-list-moreutils
+    - blast >=2.2.30
+    - zlib {{CONDA_ZLIB}}*
 
 test:
   commands:

diff --git a/recipes/abricate/0.5/meta.yaml b/recipes/abricate/0.5/meta.yaml
@@ -1,35 +1,35 @@
 package:
   name: abricate
   version: "0.5"
-  
+
 build:
-  number: 0
+  number: 1
 
 source:
   fn: abricate_v0.5.tar.gz
   url: https://github.com/tseemann/abricate/archive/v0.5.tar.gz
   md5: 9d2b54511190c3beb6e018675c4d4d0e
 
 requirements:
-  build: 
-  - gcc # [linux]
-  - llvm # [osx]
-  - zlib
+  build:
+    - gcc # [linux]
+    - llvm # [osx]
+    - zlib {{CONDA_ZLIB}}*
   run:
-  - libgcc # [linux]
-  - perl
-  - perl-bioperl >=1.6.924
-  - perl-file-slurp
-  - perl-text-csv
-  - perl-list-moreutils
-  - perl-file-spec
-  - perl-json
-  - perl-lwp-simple
-  - perl-findbin
-  - blast >=2.2.30
-  - zlib
-  - unzip
-  - emboss
+    - libgcc # [linux]
+    - perl
+    - perl-bioperl >=1.6.924
+    - perl-file-slurp
+    - perl-text-csv
+    - perl-list-moreutils
+    - perl-file-spec
+    - perl-json
+    - perl-lwp-simple
+    - perl-findbin
+    - blast >=2.2.30
+    - zlib {{CONDA_ZLIB}}*
+    - unzip
+    - emboss
 
 test:
   commands:
@@ -42,4 +42,3 @@ about:
   license: GPL2
   license_file: LICENSE
   summary: Mass screening of contigs for antibiotic resistance genes
-
diff --git a/recipes/abricate/meta.yaml b/recipes/abricate/meta.yaml
@@ -3,7 +3,7 @@ package:
   version: "0.7"
 
 build:
-  number: 0
+  number: 1
 
 source:
   fn: abricate_v0.7.tar.gz
@@ -12,35 +12,35 @@ source:
 
 requirements:
   build: 
-  - gcc # [linux]
-  - llvm # [osx]
-  - zlib
-  - perl
-  - perl-bioperl >=1.6.924
-  - perl-file-slurp
-  - perl-text-csv
-  - perl-list-moreutils
-  - perl-file-spec
-  - perl-json
-  - perl-lwp-simple
-  - perl-findbin
-  - blast >=2.6
+    - gcc # [linux]
+    - llvm # [osx]
+    - zlib {{CONDA_ZLIB}}*
+    - perl
+    - perl-bioperl >=1.6.924
+    - perl-file-slurp
+    - perl-text-csv
+    - perl-list-moreutils
+    - perl-file-spec
+    - perl-json
+    - perl-lwp-simple
+    - perl-findbin
+    - blast >=2.6
   run:
-  - libgcc # [linux]
-  - perl
-  - perl-bioperl >=1.6.924
-  - perl-file-slurp
-  - perl-text-csv
-  - perl-list-moreutils
-  - perl-file-spec
-  - perl-json
-  - perl-lwp-simple
-  - perl-findbin
-  - blast >=2.6
-  - zlib
-  - unzip
-  - emboss
-  - entrez-direct
+    - libgcc # [linux]
+    - perl
+    - perl-bioperl >=1.6.924
+    - perl-file-slurp
+    - perl-text-csv
+    - perl-list-moreutils
+    - perl-file-spec
+    - perl-json
+    - perl-lwp-simple
+    - perl-findbin
+    - blast >=2.6
+    - zlib {{CONDA_ZLIB}}*
+    - unzip
+    - emboss
+    - entrez-direct
 
 test:
   commands:

diff --git a/recipes/addrg/meta.yaml b/recipes/addrg/meta.yaml
@@ -5,7 +5,7 @@ package:
   version: {{ version }}
 
 build:
-  number: 0
+  number: 1
   skip: False
 
 source:
@@ -17,10 +17,10 @@ requirements:
   build:
   - gcc  # [not osx]
   - llvm # [osx]
-  - htslib >=1.0.0
+  - htslib {{ CONDA_HTSLIB }}*
   run:
   - libgcc # [not osx]
-  - htslib >=1.0.0
+  - htslib {{ CONDA_HTSLIB }}*
 
 about:
   home: https://github.com/holtgrewe/addrg

diff --git a/recipes/agg/meta.yaml b/recipes/agg/meta.yaml
@@ -6,7 +6,7 @@ package:
   version: {{ version }}
 
 build:
-  number: 0
+  number: 1
 
 source:
   fn: {{ name|lower }}_{{ version }}.tar.gz
@@ -15,12 +15,12 @@ source:
 
 requirements:
   build:
-  - gcc  
-  - zlib
+    - gcc  
+    - zlib {{CONDA_ZLIB}}*
 
   run:
-  - libgcc
-  - zlib
+    - libgcc
+    - zlib {{CONDA_ZLIB}}*
 
 test:
   commands:

diff --git a/recipes/alfred/0.1.2/meta.yaml b/recipes/alfred/0.1.2/meta.yaml
@@ -11,7 +11,7 @@ source:
     - Makefile.patch
 
 build:
-  number: 1
+  number: 2
   string: boost{{CONDA_BOOST}}_{{PKG_BUILDNUM}}
   skip: True # [osx]
 

diff --git a/recipes/alfred/0.1.3/meta.yaml b/recipes/alfred/0.1.3/meta.yaml
@@ -11,7 +11,7 @@ source:
     - Makefile.patch
 
 build:
-  number: 1
+  number: 2
   string: boost{{CONDA_BOOST}}_{{PKG_BUILDNUM}}
   skip: True # [osx]
 

diff --git a/recipes/alfred/meta.yaml b/recipes/alfred/meta.yaml
@@ -11,7 +11,7 @@ source:
     - Makefile.patch
 
 build:
-  number: 1
+  number: 2
   string: boost{{CONDA_BOOST}}_{{PKG_BUILDNUM}}
   skip: True # [osx]
 

diff --git a/recipes/align-it/1.0.3/meta.yaml b/recipes/align-it/1.0.3/meta.yaml
@@ -4,7 +4,7 @@ about:
   summary: "Align-it is a tool to align molecules according to their pharmacophores. A pharmacophore is an abstract concept based on the specific interactions observed in drug-receptor interactions: hydrogen bonding, charge transfer, electrostatic and hydrophobic interactions."
 
 build:
-  number: 3
+  number: 4
   skip: True # [osx]
 
 package:
@@ -16,12 +16,12 @@ requirements:
     - gcc # [linux]
     - llvm # [osx]
     - openbabel ==2.4.1
-    - zlib
+    - zlib {{CONDA_ZLIB}}*
     - cmake
   run:
     - openbabel ==2.4.1
     - libgcc # [linux]
-    - zlib
+    - zlib {{CONDA_ZLIB}}*
 
 source:
   fn: align-it-1.0.3.tar.gz

diff --git a/recipes/allegro/meta.yaml b/recipes/allegro/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: allegro
-  version: 2
+  version: 3
 
 source:
   fn: allegro2-2017-10-11.tar.gz
@@ -17,8 +17,7 @@ source:
 
 
 build:
-  number: 0
-  #skip: True # [osx]
+  number: 1
 
 requirements:
   build:

diff --git a/recipes/angsd/meta.yaml b/recipes/angsd/meta.yaml
@@ -1,7 +1,7 @@
 {% set version = "0.910" %}
 
 build:
-  number: 0
+  number: 1
   skip: True # [osx]
 
 about:
@@ -15,12 +15,12 @@ package:
 
 requirements:
   build:
-    - htslib
+    - htslib {{ CONDA_HTSLIB }}*
     - gcc # [not osx]
     - llvm # [osx]
   run:
     - libgcc # [not osx]
-    - htslib
+    - htslib {{ CONDA_HTSLIB }}*
 
 test:
   commands:

diff --git a/recipes/aria2/meta.yaml b/recipes/aria2/meta.yaml
@@ -8,14 +8,14 @@ source:
   md5: 0a28844c8db660d6a20d8a34ae4b0f37
 
 build:
-  number: 0
+  number: 1
 
 requirements:
     build:
       - gcc # [linux]
       - llvm # [osx]
       - pkg-config # [osx]
-      - zlib
+      - zlib {{CONDA_ZLIB}}*
       - openssl # [linux]
       - sqlite
       - libssh2
@@ -24,7 +24,7 @@ requirements:
 
     run:
       - libgcc # [linux]
-      - zlib
+      - zlib {{CONDA_ZLIB}}*
       - openssl # [linux]
       - sqlite
       - libssh2

diff --git a/recipes/ariba/meta.yaml b/recipes/ariba/meta.yaml
@@ -11,7 +11,7 @@ source:
 
 build:
   skip: True # [py27]
-  number: 0
+  number: 1
 
 requirements:
   build:
@@ -24,7 +24,7 @@ requirements:
     - pysam >=0.9.1
     - pymummer >=0.10.2
     - gcc
-    - zlib
+    - zlib {{CONDA_ZLIB}}*
 
   run:
     - python
@@ -41,7 +41,7 @@ requirements:
     - mummer >=3.23
     - spades >=3.5.0
     - libgcc
-    - zlib
+    - zlib {{CONDA_ZLIB}}*
 
 test:
   imports:

diff --git a/recipes/asn2gb/meta.yaml b/recipes/asn2gb/meta.yaml
@@ -16,7 +16,7 @@ source:
     sha256: 4b6ac3831061bc8f8c8adb011fe58c8741402a9c21c95af395aa98154c9ab775 # [linux]
 
 build:
-    number: 0
+    number: 1
 
 requirements:
     run:

diff --git a/recipes/assemblyutility/meta.yaml b/recipes/assemblyutility/meta.yaml
@@ -6,7 +6,7 @@ package:
   version: {{ version }}
 
 build:
-  number: 0
+  number: 1
 
 source:
   fn: {{ name|lower }}_{{ version }}.tar.gz  
@@ -17,11 +17,11 @@ requirements:
   build:
   - gcc # [not osx]
   - llvm  # [osx]
-  - zlib
+  - zlib {{CONDA_ZLIB}}*
 
   run:
   - libgcc # [not osx]
-  - zlib
+  - zlib {{CONDA_ZLIB}}*
 
 test:
   commands: