From da9a7366738bd6a4927ecfd0efe8d3a2bfbaf515 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 13:39:40 +0200 Subject: [PATCH 01/34] Added recipe for kwant --- recipes/kwant/build.sh | 10 +++++ recipes/kwant/build_linux.conf | 9 +++++ recipes/kwant/build_mac.conf | 7 ++++ recipes/kwant/meta.yaml | 72 ++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100755 recipes/kwant/build.sh create mode 100755 recipes/kwant/build_linux.conf create mode 100755 recipes/kwant/build_mac.conf create mode 100755 recipes/kwant/meta.yaml diff --git a/recipes/kwant/build.sh b/recipes/kwant/build.sh new file mode 100755 index 0000000000000..aa92939e458a1 --- /dev/null +++ b/recipes/kwant/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash +platform='unknown' +unamestr=`uname` +if [[ "$unamestr" == 'Darwin' ]]; then + cp $RECIPE_DIR/build_mac.conf build.conf +else + cp $RECIPE_DIR/build_linux.conf build.conf +fi +$PYTHON setup.py build +$PYTHON setup.py install diff --git a/recipes/kwant/build_linux.conf b/recipes/kwant/build_linux.conf new file mode 100755 index 0000000000000..b7b412d13725a --- /dev/null +++ b/recipes/kwant/build_linux.conf @@ -0,0 +1,9 @@ +[lapack] +library_dirs = $(PREFIX)/lib +libraries = openblas gfortran +extra_link_args = -Wl,-rpath=$(PREFIX)/lib +[mumps] +include_dirs = $(PREFIX)/include +library_dirs = $(PREFIX)/lib +libraries = zmumps mumps_common pord metis esmumps scotch scotcherr mpiseq gfortran +extra_link_args = -Wl,-rpath=$(PREFIX)/lib diff --git a/recipes/kwant/build_mac.conf b/recipes/kwant/build_mac.conf new file mode 100755 index 0000000000000..f907a3674b0a4 --- /dev/null +++ b/recipes/kwant/build_mac.conf @@ -0,0 +1,7 @@ +[lapack] +libraries = +extra_link_args = -Wl,-framework -Wl,Accelerate +[mumps] +include_dirs = $(PREFIX)/include +library_dirs = $(PREFIX)/lib +libraries = zmumps mumps_common pord metis esmumps scotch scotcherr mpiseq gfortran diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml new file mode 100755 index 0000000000000..f64ede69ffa36 --- /dev/null +++ b/recipes/kwant/meta.yaml @@ -0,0 +1,72 @@ +{% set name = "kwant" %} + +package: + name: {{ name }} + version: "1.2.2" [py3k] + version: "1.1.2" [py27] + +source: + git_url: https://gitlab.kwant-project.org/kwant/kwant.git + git_tag: v1.2.2 [py3k] + git_tag: v1.1.2 [py27] + +build: + skip: true # [win] + number: 0 + binary_relocation: true + +requirements: + build: + - python + - gcc + - openblas # [linux] + - mumps_seq + - numpy + - matplotlib + - scipy + - cython + - nose + - tinyarray + + run: + - python + - openblas # [linux] + - mumps_seq + - numpy + - matplotlib + - scipy + - cython + - nose + - tinyarray + - libgcc + - libgfortran # [linux] + +test: + imports: + - kwant + - kwant.graph + - kwant.graph.tests + - kwant.linalg + - kwant.linalg.tests + - kwant.physics + - kwant.physics.tests + - kwant.solvers + - kwant.solvers.tests + - kwant.tests + +about: + home: http://kwant-project.org/ + license: BSD + license_file: LICENSE.rst + summary: 'Package for numerical quantum transport calculations.' + description: | + Kwant is a free (open source) Python package for numerical calculations on + tight-binding models with a strong focus on quantum transport. It is designed to + be flexible and easy to use. Thanks to the use of innovative algorithms, Kwant + is often faster than other available codes, even those entirely written in the + low level FORTRAN and C/C++ languages. + doc_url: https://kwant-project.org/doc/1/ + +extra: + recipe-maintainers: + - basnijholt From 4892d0bad65974635ffaf1d875a7a2575d4785a8 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 13:53:34 +0200 Subject: [PATCH 02/34] Add newline to meta.yaml --- recipes/kwant/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index f64ede69ffa36..fbdff957602fb 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -70,3 +70,4 @@ about: extra: recipe-maintainers: - basnijholt + From 88c4872a7d0c23d1ece73e4a624a04aa09a9ee37 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 14:22:58 +0200 Subject: [PATCH 03/34] Change in meta.yaml, fix linter issue, thanks to @ocefpaf --- recipes/kwant/meta.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index fbdff957602fb..98cd2270e7bc7 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -1,14 +1,17 @@ {% set name = "kwant" %} +{% set py3k_ver = "1.2.2" %} +{% set py2k_ver = "1.1.2" %} package: name: {{ name }} - version: "1.2.2" [py3k] - version: "1.1.2" [py27] + version: {{ py3k_ver }} # [py3k] + version: {{ py2k_ver }} # [py2k] source: - git_url: https://gitlab.kwant-project.org/kwant/kwant.git - git_tag: v1.2.2 [py3k] - git_tag: v1.1.2 [py27] + fn: v{{ version }}.tar.gz + url: https://gitlab.kwant-project.org/kwant/kwant/archive/v{{ version }}.tar.gz + sha256: 8c20230f266622e5fa4c75fd3b1e8018d9a99643e71b86a7e91cb7b6902d8620 # [py3k] + sha256: 3229009580e33e58f5cfb8405c44f8146b89b621b6ebe599166ef9add8ec9755 # [py2k] build: skip: true # [win] From 923fa2ad64c168f54ee7a78ecf638c04bcf6cae2 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 14:40:17 +0200 Subject: [PATCH 04/34] Change BSD to BSD 2-Clause --- recipes/kwant/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 98cd2270e7bc7..712886ce1e37e 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -59,7 +59,7 @@ test: about: home: http://kwant-project.org/ - license: BSD + license: BSD 2-Clause license_file: LICENSE.rst summary: 'Package for numerical quantum transport calculations.' description: | From 9d76e77936514d9b6cb54cef1366a3ba16262e70 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 14:46:31 +0200 Subject: [PATCH 05/34] Correct urls --- recipes/kwant/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 712886ce1e37e..061213c4d2eaa 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -9,9 +9,11 @@ package: source: fn: v{{ version }}.tar.gz - url: https://gitlab.kwant-project.org/kwant/kwant/archive/v{{ version }}.tar.gz + url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py2k_ver }} # [py2k] + url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py3k_ver }} # [py3k] sha256: 8c20230f266622e5fa4c75fd3b1e8018d9a99643e71b86a7e91cb7b6902d8620 # [py3k] sha256: 3229009580e33e58f5cfb8405c44f8146b89b621b6ebe599166ef9add8ec9755 # [py2k] + build: skip: true # [win] From 52272b3c9d6ccde261798084e74590540b1b332f Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 14:50:19 +0200 Subject: [PATCH 06/34] Specify version for Python 2 and 3 --- recipes/kwant/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 061213c4d2eaa..cf1da119523d6 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -8,7 +8,8 @@ package: version: {{ py2k_ver }} # [py2k] source: - fn: v{{ version }}.tar.gz + fn: v{{ py2k_ver }}.tar.gz # [py2k] + fn: v{{ py3k_ver }}.tar.gz # [py3k] url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py2k_ver }} # [py2k] url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py3k_ver }} # [py3k] sha256: 8c20230f266622e5fa4c75fd3b1e8018d9a99643e71b86a7e91cb7b6902d8620 # [py3k] From 5f9b71ffe05c85b236be03ebbaa42c71ef4b423d Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 15:28:09 +0200 Subject: [PATCH 07/34] gcc -> toolchain and drop libgcc --- recipes/kwant/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index cf1da119523d6..9d601b2485b46 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -24,7 +24,7 @@ build: requirements: build: - python - - gcc + - toolchain - openblas # [linux] - mumps_seq - numpy @@ -44,7 +44,6 @@ requirements: - cython - nose - tinyarray - - libgcc - libgfortran # [linux] test: From 812837ad668f4cf47ce55ab8172af288d7c11677 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 16:48:54 +0200 Subject: [PATCH 08/34] Add `features: - blas_openblas` --- recipes/kwant/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 9d601b2485b46..4b7127922e8bd 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -20,6 +20,8 @@ build: skip: true # [win] number: 0 binary_relocation: true + features: + - blas_openblas # [linux] requirements: build: From 03ff686284b9694738f038c55b45d9dd5075b10b Mon Sep 17 00:00:00 2001 From: bnijholt Date: Mon, 3 Oct 2016 11:43:47 +0200 Subject: [PATCH 09/34] Fix sha256 --- recipes/kwant/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 4b7127922e8bd..92a64a74fbded 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -12,7 +12,7 @@ source: fn: v{{ py3k_ver }}.tar.gz # [py3k] url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py2k_ver }} # [py2k] url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py3k_ver }} # [py3k] - sha256: 8c20230f266622e5fa4c75fd3b1e8018d9a99643e71b86a7e91cb7b6902d8620 # [py3k] + sha256: d298791b920aa5a8191a83178e85472310db678b8237eaa928a8b2a347e825d8 # [py3k] sha256: 3229009580e33e58f5cfb8405c44f8146b89b621b6ebe599166ef9add8ec9755 # [py2k] From 4b25da3c059839550415679bc169b871cad9280c Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 3 Oct 2016 13:15:26 +0200 Subject: [PATCH 10/34] sed the prefix --- recipes/kwant/build.sh | 1 + recipes/kwant/build_linux.conf | 10 +++++----- recipes/kwant/build_mac.conf | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/recipes/kwant/build.sh b/recipes/kwant/build.sh index aa92939e458a1..c9bfe010e85ad 100755 --- a/recipes/kwant/build.sh +++ b/recipes/kwant/build.sh @@ -6,5 +6,6 @@ if [[ "$unamestr" == 'Darwin' ]]; then else cp $RECIPE_DIR/build_linux.conf build.conf fi +sed -i -e "s:PREFIX:$PREFIX:g" build.conf $PYTHON setup.py build $PYTHON setup.py install diff --git a/recipes/kwant/build_linux.conf b/recipes/kwant/build_linux.conf index b7b412d13725a..072762bfa3679 100755 --- a/recipes/kwant/build_linux.conf +++ b/recipes/kwant/build_linux.conf @@ -1,9 +1,9 @@ [lapack] -library_dirs = $(PREFIX)/lib +library_dirs = PREFIX/lib libraries = openblas gfortran -extra_link_args = -Wl,-rpath=$(PREFIX)/lib +extra_link_args = -Wl,-rpath=PREFIX/lib [mumps] -include_dirs = $(PREFIX)/include -library_dirs = $(PREFIX)/lib +include_dirs = PREFIX/include +library_dirs = PREFIX/lib libraries = zmumps mumps_common pord metis esmumps scotch scotcherr mpiseq gfortran -extra_link_args = -Wl,-rpath=$(PREFIX)/lib +extra_link_args = -Wl,-rpath=PREFIX/lib diff --git a/recipes/kwant/build_mac.conf b/recipes/kwant/build_mac.conf index f907a3674b0a4..17200e9378dfe 100755 --- a/recipes/kwant/build_mac.conf +++ b/recipes/kwant/build_mac.conf @@ -2,6 +2,6 @@ libraries = extra_link_args = -Wl,-framework -Wl,Accelerate [mumps] -include_dirs = $(PREFIX)/include -library_dirs = $(PREFIX)/lib +include_dirs = PREFIX/include +library_dirs = PREFIX/lib libraries = zmumps mumps_common pord metis esmumps scotch scotcherr mpiseq gfortran From aeb7251e9d8e8d67c30bb951dce4126b2d4667ac Mon Sep 17 00:00:00 2001 From: bnijholt Date: Mon, 3 Oct 2016 14:25:49 +0200 Subject: [PATCH 11/34] Add openblas for OSX --- recipes/kwant/build_mac.conf | 4 ++-- recipes/kwant/meta.yaml | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/recipes/kwant/build_mac.conf b/recipes/kwant/build_mac.conf index 17200e9378dfe..8dc29f2abb7df 100755 --- a/recipes/kwant/build_mac.conf +++ b/recipes/kwant/build_mac.conf @@ -1,6 +1,6 @@ [lapack] -libraries = -extra_link_args = -Wl,-framework -Wl,Accelerate +library_dirs = PREFIX/lib +libraries = openblas gfortran [mumps] include_dirs = PREFIX/include library_dirs = PREFIX/lib diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 92a64a74fbded..ba35a3cb3e020 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -18,16 +18,16 @@ source: build: skip: true # [win] - number: 0 + number: 2 binary_relocation: true features: - - blas_openblas # [linux] + - blas_openblas requirements: build: - python - toolchain - - openblas # [linux] + - openblas - mumps_seq - numpy - matplotlib @@ -38,7 +38,7 @@ requirements: run: - python - - openblas # [linux] + - openblas - mumps_seq - numpy - matplotlib @@ -46,7 +46,6 @@ requirements: - cython - nose - tinyarray - - libgfortran # [linux] test: imports: From 150755030263bb5b0690effb75f2eed74998a18c Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 17 Oct 2016 09:38:17 +0200 Subject: [PATCH 12/34] change to mumps and fix openblas pinning --- recipes/kwant/meta.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index ba35a3cb3e020..7e316d0419a08 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -18,8 +18,7 @@ source: build: skip: true # [win] - number: 2 - binary_relocation: true + number: 0 features: - blas_openblas @@ -27,8 +26,8 @@ requirements: build: - python - toolchain - - openblas - - mumps_seq + - openblas 0.2.18|0.2.18.*. + - mumps - numpy - matplotlib - scipy @@ -38,8 +37,8 @@ requirements: run: - python - - openblas - - mumps_seq + - openblas 0.2.18|0.2.18.*. + - mumps - numpy - matplotlib - scipy From 25887d2f9dad8780d01064fc4e3bb1dced40ad95 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Fri, 21 Oct 2016 10:33:57 +0200 Subject: [PATCH 13/34] remove accidental dot after openblas pinning --- recipes/kwant/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 7e316d0419a08..db78ee3d7c904 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -26,7 +26,7 @@ requirements: build: - python - toolchain - - openblas 0.2.18|0.2.18.*. + - openblas 0.2.18|0.2.18.* - mumps - numpy - matplotlib @@ -37,7 +37,7 @@ requirements: run: - python - - openblas 0.2.18|0.2.18.*. + - openblas 0.2.18|0.2.18.* - mumps - numpy - matplotlib From 93ade510e937ee54b82d56b046c5b0580a1fdcf3 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Fri, 21 Oct 2016 10:35:10 +0200 Subject: [PATCH 14/34] Add `extra_link_args = -Wl,-rpath,PREFIX/lib` to OSX conf --- recipes/kwant/build_mac.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/kwant/build_mac.conf b/recipes/kwant/build_mac.conf index 8dc29f2abb7df..b586359d48b22 100755 --- a/recipes/kwant/build_mac.conf +++ b/recipes/kwant/build_mac.conf @@ -1,7 +1,9 @@ [lapack] library_dirs = PREFIX/lib libraries = openblas gfortran +extra_link_args = -Wl,-rpath,PREFIX/lib [mumps] include_dirs = PREFIX/include library_dirs = PREFIX/lib libraries = zmumps mumps_common pord metis esmumps scotch scotcherr mpiseq gfortran +extra_link_args = -Wl,-rpath,PREFIX/lib From a898711d114f9bc3a4deee83fb318109383dfe7a Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 26 Oct 2016 09:14:10 +0200 Subject: [PATCH 15/34] Support BLAS --- recipes/kwant/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index db78ee3d7c904..ec04a5decc927 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -1,6 +1,7 @@ {% set name = "kwant" %} {% set py3k_ver = "1.2.2" %} {% set py2k_ver = "1.1.2" %} +{% set variant = "openblas" %} package: name: {{ name }} @@ -20,12 +21,13 @@ build: skip: true # [win] number: 0 features: - - blas_openblas + - blas_{{ variant }} requirements: build: - python - toolchain + - blas 1.1 {{ variant }} - openblas 0.2.18|0.2.18.* - mumps - numpy @@ -37,6 +39,7 @@ requirements: run: - python + - blas 1.1 {{ variant }} - openblas 0.2.18|0.2.18.* - mumps - numpy From 456e59304aed3b414ebd7757848494538421f82e Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 26 Oct 2016 09:16:15 +0200 Subject: [PATCH 16/34] Add dev-url --- recipes/kwant/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index ec04a5decc927..5c1b9dfbc0f86 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -74,6 +74,7 @@ about: is often faster than other available codes, even those entirely written in the low level FORTRAN and C/C++ languages. doc_url: https://kwant-project.org/doc/1/ + dev_url: gitlab.kwant-project.org/kwant/kwant/ extra: recipe-maintainers: From 6036a83852c9b6c948f3880c74f9c1e9e8f9e8f0 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 26 Oct 2016 09:16:43 +0200 Subject: [PATCH 17/34] Remove empty line --- recipes/kwant/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 5c1b9dfbc0f86..31544b8ee8de2 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -15,7 +15,6 @@ source: url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py3k_ver }} # [py3k] sha256: d298791b920aa5a8191a83178e85472310db678b8237eaa928a8b2a347e825d8 # [py3k] sha256: 3229009580e33e58f5cfb8405c44f8146b89b621b6ebe599166ef9add8ec9755 # [py2k] - build: skip: true # [win] From d003d3198480b49110adc4bcddbdd182af763506 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 26 Oct 2016 15:06:07 +0200 Subject: [PATCH 18/34] remove extra newline and add https:// to url --- recipes/kwant/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 31544b8ee8de2..4ec04a66f94ec 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -73,9 +73,8 @@ about: is often faster than other available codes, even those entirely written in the low level FORTRAN and C/C++ languages. doc_url: https://kwant-project.org/doc/1/ - dev_url: gitlab.kwant-project.org/kwant/kwant/ + dev_url: https://gitlab.kwant-project.org/kwant/kwant/ extra: recipe-maintainers: - basnijholt - From 52f4754dbb64266c5fbf8901c2e4230cd4b72975 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Fri, 28 Oct 2016 09:26:34 +0200 Subject: [PATCH 19/34] Build number to 200 --- recipes/kwant/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 4ec04a66f94ec..8ba17b922b08b 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -18,7 +18,7 @@ source: build: skip: true # [win] - number: 0 + number: 200 features: - blas_{{ variant }} From 8ddf9e85d4683d0de6aca31841031c6e51aad28e Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Fri, 28 Oct 2016 09:38:40 +0200 Subject: [PATCH 20/34] Correct sha256 for py2k --- recipes/kwant/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 8ba17b922b08b..c5dec0ba52801 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -14,7 +14,7 @@ source: url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py2k_ver }} # [py2k] url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py3k_ver }} # [py3k] sha256: d298791b920aa5a8191a83178e85472310db678b8237eaa928a8b2a347e825d8 # [py3k] - sha256: 3229009580e33e58f5cfb8405c44f8146b89b621b6ebe599166ef9add8ec9755 # [py2k] + sha256: a47544a8416b19a56da3d511610c9e09ed3bf84f66461d9f95f0f6fefebd0179 # [py2k] build: skip: true # [win] From 471c711d789e7b6980249cb9fd016c7cbd5aab3e Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Fri, 28 Oct 2016 09:48:29 +0200 Subject: [PATCH 21/34] add gcc and libgfortran --- recipes/kwant/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index c5dec0ba52801..ecb799f2de87e 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -35,6 +35,7 @@ requirements: - cython - nose - tinyarray + - gcc run: - python @@ -47,6 +48,7 @@ requirements: - cython - nose - tinyarray + - libgfortran test: imports: From b4cd57c3eb3911bc953fbdce4b1c608b1b8dcfd8 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Fri, 28 Oct 2016 09:55:37 +0200 Subject: [PATCH 22/34] Add libgcc --- recipes/kwant/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index ecb799f2de87e..b9717c88970df 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -49,6 +49,7 @@ requirements: - nose - tinyarray - libgfortran + - libgcc test: imports: From ffdb79cc6a020fa4379a9d49658b0d46c7478013 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Fri, 28 Oct 2016 10:05:31 +0200 Subject: [PATCH 23/34] Retrigger build because of issues with CircleCI --- recipes/kwant/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index b9717c88970df..e67f5ad0b456f 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -26,6 +26,7 @@ requirements: build: - python - toolchain + - gcc - blas 1.1 {{ variant }} - openblas 0.2.18|0.2.18.* - mumps @@ -35,7 +36,6 @@ requirements: - cython - nose - tinyarray - - gcc run: - python From 0e427a9d45156b61e561ea68c3342d700deefea8 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 1 Nov 2016 13:22:29 +0100 Subject: [PATCH 24/34] Add license_family: BSD and remove matplotlib from build req --- recipes/kwant/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index e67f5ad0b456f..8f7738d09535b 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -31,7 +31,6 @@ requirements: - openblas 0.2.18|0.2.18.* - mumps - numpy - - matplotlib - scipy - cython - nose @@ -68,6 +67,7 @@ about: home: http://kwant-project.org/ license: BSD 2-Clause license_file: LICENSE.rst + license_family: BSD summary: 'Package for numerical quantum transport calculations.' description: | Kwant is a free (open source) Python package for numerical calculations on From 5d07dc210e8a6fe0d3b5fdae8b5fdef8f93eae0d Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:24:15 +0100 Subject: [PATCH 25/34] add yum_requirements.txt --- recipes/kwant/yum_requirements.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 recipes/kwant/yum_requirements.txt diff --git a/recipes/kwant/yum_requirements.txt b/recipes/kwant/yum_requirements.txt new file mode 100644 index 0000000000000..68f074844ad9d --- /dev/null +++ b/recipes/kwant/yum_requirements.txt @@ -0,0 +1 @@ +devtoolset-2-gcc-gfortran \ No newline at end of file From 1fa284c365eebfd8f19808be9d718af58dae7f09 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:24:33 +0100 Subject: [PATCH 26/34] drop libgcc --- recipes/kwant/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 8f7738d09535b..cf84a97efeff2 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -48,7 +48,6 @@ requirements: - nose - tinyarray - libgfortran - - libgcc test: imports: From c1d6b891920e19bd6ad52ed9b8dfbf5353d6c091 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:25:18 +0100 Subject: [PATCH 27/34] export LIBRARY_PATH in build.sh --- recipes/kwant/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/kwant/build.sh b/recipes/kwant/build.sh index c9bfe010e85ad..85e574e0cb57e 100755 --- a/recipes/kwant/build.sh +++ b/recipes/kwant/build.sh @@ -7,5 +7,8 @@ else cp $RECIPE_DIR/build_linux.conf build.conf fi sed -i -e "s:PREFIX:$PREFIX:g" build.conf + +export LIBRARY_PATH="${PREFIX}/lib" + $PYTHON setup.py build $PYTHON setup.py install From 1ba470d70e5de4aebcc2b7811a4170b5eea66294 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:27:28 +0100 Subject: [PATCH 28/34] add libgfortran in build requirements --- recipes/kwant/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index cf84a97efeff2..1d2e2ac5250a1 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -35,6 +35,7 @@ requirements: - cython - nose - tinyarray + - libgfortran run: - python From f32eb41bd19d70c8512ebd16c4d8a8a97c3cd41c Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:36:01 +0100 Subject: [PATCH 29/34] Only Python 2.7 --- recipes/kwant/meta.yaml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 1d2e2ac5250a1..3c0bb9a07e1c4 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -1,23 +1,19 @@ {% set name = "kwant" %} -{% set py3k_ver = "1.2.2" %} -{% set py2k_ver = "1.1.2" %} +{% set version = "1.1.2" %} {% set variant = "openblas" %} package: name: {{ name }} - version: {{ py3k_ver }} # [py3k] - version: {{ py2k_ver }} # [py2k] + version: {{ version }} source: - fn: v{{ py2k_ver }}.tar.gz # [py2k] - fn: v{{ py3k_ver }}.tar.gz # [py3k] - url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py2k_ver }} # [py2k] - url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ py3k_ver }} # [py3k] - sha256: d298791b920aa5a8191a83178e85472310db678b8237eaa928a8b2a347e825d8 # [py3k] - sha256: a47544a8416b19a56da3d511610c9e09ed3bf84f66461d9f95f0f6fefebd0179 # [py2k] + fn: v{{ version }}.tar.gz + url: https://gitlab.kwant-project.org/kwant/kwant/repository/archive.tar.gz?ref=v{{ version }} + sha256: a47544a8416b19a56da3d511610c9e09ed3bf84f66461d9f95f0f6fefebd0179 build: skip: true # [win] + skip: true # [py3k] number: 200 features: - blas_{{ variant }} @@ -28,7 +24,7 @@ requirements: - toolchain - gcc - blas 1.1 {{ variant }} - - openblas 0.2.18|0.2.18.* + - openblas 0.2.18|0.2.18.* - mumps - numpy - scipy From d66bf7ae365c2939912140778f105e34a2cb3dd0 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:38:43 +0100 Subject: [PATCH 30/34] add export LD_LIBRARY_PATH to build.sh --- recipes/kwant/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/kwant/build.sh b/recipes/kwant/build.sh index 85e574e0cb57e..3ff43277b7fe8 100755 --- a/recipes/kwant/build.sh +++ b/recipes/kwant/build.sh @@ -9,6 +9,7 @@ fi sed -i -e "s:PREFIX:$PREFIX:g" build.conf export LIBRARY_PATH="${PREFIX}/lib" +export LD_LIBRARY_PATH="${PREFIX}/lib" $PYTHON setup.py build $PYTHON setup.py install From a1fa071026f9ead348c0349e68d79985499b999c Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:44:54 +0100 Subject: [PATCH 31/34] build req: gcc only for osx and libgfortran only linux --- recipes/kwant/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 3c0bb9a07e1c4..0443ca47bac35 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -22,7 +22,7 @@ requirements: build: - python - toolchain - - gcc + - gcc # [osx] - blas 1.1 {{ variant }} - openblas 0.2.18|0.2.18.* - mumps @@ -31,7 +31,7 @@ requirements: - cython - nose - tinyarray - - libgfortran + - libgfortran # [linux] run: - python From 82ea10cfd04e0355b19f591efa1106c2c19492b2 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:49:32 +0100 Subject: [PATCH 32/34] combine skip: true # [win or py3k] --- recipes/kwant/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index 0443ca47bac35..f3808664a8cbe 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -12,8 +12,7 @@ source: sha256: a47544a8416b19a56da3d511610c9e09ed3bf84f66461d9f95f0f6fefebd0179 build: - skip: true # [win] - skip: true # [py3k] + skip: true # [win or py3k] number: 200 features: - blas_{{ variant }} From e2bb0c27d5455f8479789de043ff30676db47a96 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:51:07 +0100 Subject: [PATCH 33/34] change numpy -> numpy x.x --- recipes/kwant/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index f3808664a8cbe..f0fa3247c883b 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -25,7 +25,7 @@ requirements: - blas 1.1 {{ variant }} - openblas 0.2.18|0.2.18.* - mumps - - numpy + - numpy x.x - scipy - cython - nose @@ -37,7 +37,7 @@ requirements: - blas 1.1 {{ variant }} - openblas 0.2.18|0.2.18.* - mumps - - numpy + - numpy x.x - matplotlib - scipy - cython From 237610b465fd6091c6c180ee749ca3bbd8309f13 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 2 Nov 2016 18:52:44 +0100 Subject: [PATCH 34/34] fix style error [skip appveyor] --- recipes/kwant/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kwant/meta.yaml b/recipes/kwant/meta.yaml index f0fa3247c883b..777243a84166e 100755 --- a/recipes/kwant/meta.yaml +++ b/recipes/kwant/meta.yaml @@ -12,7 +12,7 @@ source: sha256: a47544a8416b19a56da3d511610c9e09ed3bf84f66461d9f95f0f6fefebd0179 build: - skip: true # [win or py3k] + skip: true # [win or py3k] number: 200 features: - blas_{{ variant }}