From 08d1e4d7f7f761212b3720713342896f0426e15f Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 19 Dec 2019 15:48:51 +0100
Subject: [PATCH] [many] Bump minor versions to build some packages as .conda
(c.f. bob/bob.devtools#46)
---
conda/beat-devel/meta.yaml | 14 ++--
conda/bob-devel/meta.yaml | 2 +-
conda/cyvlfeat/meta.yaml | 2 +-
conda/ffmpeg/meta.yaml | 2 +-
conda/ipdb/meta.yaml | 4 +-
conda/libmatio/build.sh | 3 +-
conda/libmatio/meta.yaml | 7 +-
conda/libogg/meta.yaml | 2 +-
conda/libsvm/meta.yaml | 5 +-
conda/menpo/meta.yaml | 6 +-
conda/menpofit/meta.yaml | 2 +-
conda/nasm/meta.yaml | 2 +-
conda/openh264/meta.yaml | 2 +-
conda/ratelimiter/meta.yaml | 43 -----------
conda/schema/meta.yaml | 8 +--
conda/snakemake/meta.yaml | 79 ---------------------
conda/sox/meta.yaml | 2 +-
conda/sphinxcontrib-httpdomain/meta.yaml | 2 +-
conda/sphinxcontrib-programoutput/meta.yaml | 4 +-
conda/zc.buildout/meta.yaml | 2 +-
python.txt | 2 -
21 files changed, 36 insertions(+), 159 deletions(-)
delete mode 100644 conda/ratelimiter/meta.yaml
delete mode 100644 conda/snakemake/meta.yaml
diff --git a/conda/beat-devel/meta.yaml b/conda/beat-devel/meta.yaml
index 0cbf2a67..9f903ce5 100644
--- a/conda/beat-devel/meta.yaml
+++ b/conda/beat-devel/meta.yaml
@@ -2,7 +2,7 @@
{% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
package:
name: beat-devel
- version: 2019.10.17
+ version: 2019.12.19
build:
# the build number must be zero all the time.
@@ -15,17 +15,17 @@ build:
requirements:
host:
- python {{ python }}
- - bob-devel 2019.10.17
+ - bob-devel 2019.12.19
- docker-py 4.0.2
- - flask 1.0.2
- - flask-cors 3.0.7
+ - flask 1.0.3
+ - flask-cors 3.0.8
- flask-restful 0.3.6
- - jsonschema 3.0.1
+ - jsonschema 3.0.2
- nodejs 8.9.3
- python-graphviz 0.8.4
- pyzmq 17.1.2
- - simplejson 3.16.0
- - sphinxcontrib-programoutput 0.14
+ - simplejson 3.17.0
+ - sphinxcontrib-programoutput 0.15
- sphinxcontrib-httpdomain 1.7.0
- psycopg2 2.7.6.1
- ncurses 6.1
diff --git a/conda/bob-devel/meta.yaml b/conda/bob-devel/meta.yaml
index 4e3b967c..63ef10a1 100644
--- a/conda/bob-devel/meta.yaml
+++ b/conda/bob-devel/meta.yaml
@@ -4,7 +4,7 @@ package:
name: bob-devel
# please update the version of beat-devel and update bob-devel's version
# there as well in the same merge request.
- version: 2019.10.17
+ version: 2019.12.19
build:
# the build number must be zero all the time.
diff --git a/conda/cyvlfeat/meta.yaml b/conda/cyvlfeat/meta.yaml
index e65c0f30..0f1d19fe 100644
--- a/conda/cyvlfeat/meta.yaml
+++ b/conda/cyvlfeat/meta.yaml
@@ -12,7 +12,7 @@ source:
sha256: {{ sha256 }}
build:
- number: 0
+ number: 1
requirements:
build:
diff --git a/conda/ffmpeg/meta.yaml b/conda/ffmpeg/meta.yaml
index f4413fe2..91649708 100644
--- a/conda/ffmpeg/meta.yaml
+++ b/conda/ffmpeg/meta.yaml
@@ -22,7 +22,7 @@ source:
sha256: 8fe2d344463dbefc2db4239a4203a55ed0324faceaae57276a40c4fabda84c37 # [win64]
build:
- number: 1
+ number: 2
# The windows build is repacking binaries rather than building from source
skip: True # [win]
run_exports:
diff --git a/conda/ipdb/meta.yaml b/conda/ipdb/meta.yaml
index 11972874..a551d3a1 100644
--- a/conda/ipdb/meta.yaml
+++ b/conda/ipdb/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "0.12.2" %}
+{% set version = "0.12.3" %}
package:
name: ipdb
@@ -6,7 +6,7 @@ package:
source:
url: https://pypi.io/packages/source/i/ipdb/ipdb-{{ version }}.tar.gz
- sha256: 473fdd798a099765f093231a8b1fabfa95b0b682fce12de0c74b61a4b4d8ee57
+ sha256: 5d9a4a0e3b7027a158fc6f2929934341045b9c3b0b86ed5d7e84e409653f72fd
build:
number: 0
diff --git a/conda/libmatio/build.sh b/conda/libmatio/build.sh
index 3af3ce49..05f2b397 100644
--- a/conda/libmatio/build.sh
+++ b/conda/libmatio/build.sh
@@ -5,7 +5,8 @@
--enable-extended-sparse \
--prefix="${PREFIX}" \
--with-zlib="${PREFIX}" \
- --with-hdf5="${PREFIX}"
+ --with-hdf5="${PREFIX}" \
+ --with-default-api-version=v110
make
if [[ `uname` == 'Darwin' ]];
diff --git a/conda/libmatio/meta.yaml b/conda/libmatio/meta.yaml
index a81de75c..eed45e56 100644
--- a/conda/libmatio/meta.yaml
+++ b/conda/libmatio/meta.yaml
@@ -1,12 +1,11 @@
-{% set version = "1.5.15" %}
+{% set version = "1.5.17" %}
package:
name: libmatio
version: {{ version }}
source:
- fn: matio-{{ version }}.tar.gz
- url: https://github.com/tbeu/matio/releases/download/v{{ version }}/matio-{{ version }}.tar.gz
- md5: b1436ac47cf66d53ed9f892d0ae027ca
+ git_url: https://github.com/tbeu/matio.git
+ git_rev: {{ version }}
build:
number: 0
diff --git a/conda/libogg/meta.yaml b/conda/libogg/meta.yaml
index 4f3ade9e..5c2c8c29 100755
--- a/conda/libogg/meta.yaml
+++ b/conda/libogg/meta.yaml
@@ -12,7 +12,7 @@ source:
sha256: {{ sha256 }}
build:
- number: 1
+ number: 2
features:
- vc9 # [win and py27]
- vc10 # [win and py34]
diff --git a/conda/libsvm/meta.yaml b/conda/libsvm/meta.yaml
index 119ea523..62d44de5 100644
--- a/conda/libsvm/meta.yaml
+++ b/conda/libsvm/meta.yaml
@@ -1,5 +1,6 @@
-{% set version = "3.22" %}
+{% set version = "3.24" %}
{% set flatversion = version.replace(".", "") %}
+{% set sha256 = "3ba1ac74ee08c4dd57d3a9e4a861ffb57dab88c6a33fd53eac472fc84fbb2a8f" %}
package:
name: libsvm
@@ -8,7 +9,7 @@ package:
source:
fn: libsvm-{{ flatversion }}.tar.gz
url: https://github.com/cjlin1/libsvm/archive/v{{ flatversion }}.tar.gz
- md5: d9617d29efad013573f63ca9a517f490
+ sha256: {{ sha256 }}
patches:
- win32.patch # [win32]
diff --git a/conda/menpo/meta.yaml b/conda/menpo/meta.yaml
index 37c3498a..17cb5c53 100644
--- a/conda/menpo/meta.yaml
+++ b/conda/menpo/meta.yaml
@@ -1,6 +1,6 @@
{% set name = "menpo" %}
-{% set version = "0.9.1" %}
-{% set sha256 = "691f74ec6544bc56753b17a9f72d368f2928eaab5c2bf19673482552631683e9" %}
+{% set version = "0.9.2" %}
+{% set sha256 = "6d3de6e57886179053caecd7244dbf956d41c1290a7dd9728d1237af0d1dab02" %}
package:
name: {{ name }}
@@ -12,7 +12,7 @@ source:
sha256: {{ sha256 }}
build:
- number: 1
+ number: 0
script: python setup.py install --single-version-externally-managed --record=record.txt
run_exports:
- {{ pin_subpackage(name, max_pin='x.x') }}
diff --git a/conda/menpofit/meta.yaml b/conda/menpofit/meta.yaml
index f58b1067..aa690ef4 100644
--- a/conda/menpofit/meta.yaml
+++ b/conda/menpofit/meta.yaml
@@ -9,7 +9,7 @@ source:
git_url: https://github.com/menpo/menpofit.git
build:
- number: 1
+ number: 2
script: python setup.py install --single-version-externally-managed --record=record.txt
requirements:
diff --git a/conda/nasm/meta.yaml b/conda/nasm/meta.yaml
index b8046bcd..9bc664fb 100644
--- a/conda/nasm/meta.yaml
+++ b/conda/nasm/meta.yaml
@@ -11,7 +11,7 @@ source:
sha256: 4749fd76a8a26dc7d8871bc97cc2c16cfa0c933f984a13128e94f464f417531a
build:
- number: 0
+ number: 1
requirements:
build:
diff --git a/conda/openh264/meta.yaml b/conda/openh264/meta.yaml
index cbadca42..c4364bdc 100644
--- a/conda/openh264/meta.yaml
+++ b/conda/openh264/meta.yaml
@@ -13,7 +13,7 @@ source:
'{{ hash_type }}': '{{ hash_value }}'
build:
- number: 1
+ number: 2
run_exports:
# https://abi-laboratory.pro/tracker/timeline/openh264
- {{ pin_subpackage(name, max_pin='x.x') }}
diff --git a/conda/ratelimiter/meta.yaml b/conda/ratelimiter/meta.yaml
deleted file mode 100644
index 7bb26bf6..00000000
--- a/conda/ratelimiter/meta.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-{% set version = "1.2.0.post0" %}
-
-package:
- name: ratelimiter
- version: {{ version }}
-
-source:
- fn: ratelimiter-{{ version }}.tar.gz
- url: https://pypi.io/packages/source/r/ratelimiter/ratelimiter-{{ version }}.tar.gz
- sha256: 5c395dcabdbbde2e5178ef3f89b568a3066454a6ddc223b76473dac22f89b4f7
-
-build:
- number: 0
- noarch: python
- script: python -m pip install --no-deps --ignore-installed .
-
-requirements:
- build:
- - pip
- - python
- - setuptools
- run:
- - python
-
-test:
- imports:
- - ratelimiter
-
-about:
- home: https://github.com/RazerM/ratelimiter
- license: Apache-2.0
- license_family: APACHE
- license_file: LICENSE
- summary: Simple Python module providing rate limiting.
- description: |
- This package provides the ratelimiter module, which ensures that an operation
- will not be executed more than a given number of times on a given period.
- This can prove useful when working with third parties APIs which require
- for example a maximum of 10 requests per second.
-
-extra:
- recipe-maintainers:
- - anjos
diff --git a/conda/schema/meta.yaml b/conda/schema/meta.yaml
index 351b53bd..febefb5e 100644
--- a/conda/schema/meta.yaml
+++ b/conda/schema/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "0.7.0" %}
+{% set version = "0.7.1" %}
package:
name: schema
@@ -6,10 +6,10 @@ package:
source:
url: https://pypi.io/packages/source/s/schema/schema-{{ version }}.tar.gz
- sha256: 44add3ef9016c85ac4b0291b45286a657d0df309b31528ca8d0a9c6d0aa68186
+ sha256: c9dc8f4624e287c7d1435f8fd758f6a0aabbb7eff442db9192cd46f0e2b6d959
build:
- number: 1
+ number: 0
script: python -m pip install --no-deps --ignore-installed .
requirements:
@@ -20,7 +20,7 @@ requirements:
run:
- python
- - contextlib2 0.5.5
+ - contextlib2 >=0.5.5
test:
requires:
diff --git a/conda/snakemake/meta.yaml b/conda/snakemake/meta.yaml
deleted file mode 100644
index e10040ec..00000000
--- a/conda/snakemake/meta.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-{% set version = "5.5.4" %}
-
-package:
- name: snakemake
- version: {{ version }}
-
-source:
- url: https://pypi.io/packages/source/s/snakemake/snakemake-{{ version }}.tar.gz
- sha256: 44ef8e4d9850b2480f29ddbcc6d57540be9440d1422366bb3bb68e285377a959
-
-build:
- noarch: python
- script: python -m pip install --no-deps --ignore-installed .
- entry_points:
- - snakemake = snakemake:main
- - snakemake-bash-completion = snakemake:bash_completion
-
-requirements:
- host:
- - python >=3.5
- - pip
- - setuptools
- run:
- - python >=3.5
- - setuptools
- - wrapt
- - requests
- - docutils
- - pyyaml
- - datrie
- - requests >=2.8.1
- - psutil
- - ratelimiter
- - configargparse
- - appdirs
- - jsonschema
- - gitpython
- - jinja2
- - pygraphviz
- - networkx >=2.0
- - dropbox >=7.2.1
- - pygments
- # nice optionals not included with the default package
- #- ftputil >=3.2
- #- filechunkio >=1.6
- #- pysftp >=0.2.8
- #- aioeasywebdav
- #- pandas #not required "required"
- #- python-irodsclient
- #- google-cloud-storage
- #- boto3
-
-test:
- imports:
- - snakemake
- commands:
- - export GIT\_PYTHON_REFRESH=warn
- - snakemake --version
- - snakemake --version | grep "{{ version }}"
-
-about:
- home: https://snakemake.readthedocs.io
- license: MIT
- summary: A popular workflow management system aiming at full in-silico reproducibility.
- description: |
- Snakemake is a workflow management system that aims to reduce the
- complexity of creating workflows by providing a fast and comfortable
- execution environment, together with a clean and modern specification
- language in python style. Snakemake workflows are essentially Python
- scripts extended by declarative code to define rules. Rules describe how to
- create output files from input files. This installation is copied from
- bioconda and contains a more or less "packed" setup, with most used
- functionality.
-
-extra:
- skip-lints:
- - uses_setuptools # uses pkg_resoures during run time
- recipe-maintainers:
- - anjos
diff --git a/conda/sox/meta.yaml b/conda/sox/meta.yaml
index 0ecc1073..a4c4b50c 100644
--- a/conda/sox/meta.yaml
+++ b/conda/sox/meta.yaml
@@ -11,7 +11,7 @@ source:
md5: d04fba2d9245e661f245de0577f48a33
build:
- number: 7
+ number: 8
detect_binary_files_with_prefix: true
skip: true # [win]
run_exports:
diff --git a/conda/sphinxcontrib-httpdomain/meta.yaml b/conda/sphinxcontrib-httpdomain/meta.yaml
index 47494df0..f283b89f 100644
--- a/conda/sphinxcontrib-httpdomain/meta.yaml
+++ b/conda/sphinxcontrib-httpdomain/meta.yaml
@@ -10,7 +10,7 @@ source:
sha256: ac40b4fba58c76b073b03931c7b8ead611066a6aebccafb34dc19694f4eb6335
build:
- number: 0
+ number: 1
script: "{{ PYTHON }} -m pip install --no-deps --ignore-installed --no-cache-dir ."
requirements:
diff --git a/conda/sphinxcontrib-programoutput/meta.yaml b/conda/sphinxcontrib-programoutput/meta.yaml
index abb1662b..94d3110b 100644
--- a/conda/sphinxcontrib-programoutput/meta.yaml
+++ b/conda/sphinxcontrib-programoutput/meta.yaml
@@ -1,6 +1,6 @@
{% set name = "sphinxcontrib-programoutput" %}
-{% set version = "0.14" %}
-{% set sha256 = "75b182e9e8cf7efe828cac2c351bb737b00a76bc3aa60fd1a9b2b7096e99c383" %}
+{% set version = "0.15" %}
+{% set sha256 = "80dd5b4eab780a13ff2c23500cac3dbf0e04ef9976b409ef25a47c263ef8ab94" %}
package:
name: {{ name|lower }}
diff --git a/conda/zc.buildout/meta.yaml b/conda/zc.buildout/meta.yaml
index c0c1e09d..28237016 100644
--- a/conda/zc.buildout/meta.yaml
+++ b/conda/zc.buildout/meta.yaml
@@ -9,7 +9,7 @@ source:
git_url: https://github.com/buildout/buildout.git
build:
- number: 0
+ number: 1
script: python setup.py install --single-version-externally-managed --record=record.txt
entry_points:
diff --git a/python.txt b/python.txt
index 2d8dba0e..3d4cb285 100644
--- a/python.txt
+++ b/python.txt
@@ -21,7 +21,5 @@ conda/nodeenv
conda/pre-commit
conda/pytest-qt
conda/ddt
-conda/ratelimiter
-conda/snakemake
conda/bob-devel
conda/beat-devel
--
GitLab