From 50468610221c76f73ca235274293de78dd75e1c2 Mon Sep 17 00:00:00 2001 From: christopher Date: Mon, 23 Jul 2018 14:08:09 -0400 Subject: [PATCH 01/26] run full tests --- recipe/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ce701b5..b023a8a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,6 +42,12 @@ test: - conda_smithy.configure_feedstock commands: - conda smithy --help + - py.test + files: + - tests/* + requires: + - pytest + about: home: https://github.com/conda-forge/conda-smithy From ed68dab1eaa1c35bfdd40041423a5ad1dd227e6c Mon Sep 17 00:00:00 2001 From: christopher Date: Mon, 23 Jul 2018 14:52:01 -0400 Subject: [PATCH 02/26] WIP: use source_files, but can't find source files --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 10842c7..d090879 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -43,8 +43,8 @@ test: - conda_smithy.configure_feedstock commands: - conda smithy --help - - py.test - files: + - py.test . + source_files: - tests/* requires: - pytest From 45c84cee3f12225aa8556616768c45c6a4e19919 Mon Sep 17 00:00:00 2001 From: christopher Date: Wed, 1 Aug 2018 17:19:43 -0400 Subject: [PATCH 03/26] update version/sha --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d090879..9f91b91 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.1.6" %} +{% set version = "3.1.10" %} package: name: conda-smithy @@ -6,7 +6,7 @@ package: source: url: https://github.com/conda-forge/conda-smithy/releases/download/v{{ version }}/conda-smithy-{{ version }}.tar.gz - sha256: d648bb4a8d1a87f57c30545bd6edcce9dcebc5257fb738cc89739874ce1440d4 + sha256: 908aa8ac53afe6a951ade9f22c6d13d38ebbf4f7a8605b1f851667ea6c7c2edb build: number: 0 From fb49dcd2cc6437ce35b5dff52d5482254384393b Mon Sep 17 00:00:00 2001 From: christopher Date: Wed, 1 Aug 2018 17:14:42 -0400 Subject: [PATCH 04/26] updated v3.1.10 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d597e0e..a4b43d6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.1.9" %} +{% set version = "3.1.10" %} package: name: conda-smithy @@ -6,7 +6,7 @@ package: source: url: https://github.com/conda-forge/conda-smithy/releases/download/v{{ version }}/conda-smithy-{{ version }}.tar.gz - sha256: 54c93ed08730d10a220b4548944895f860a40e2a9489b51901aad3e3e0ed9a7a + sha256: 908aa8ac53afe6a951ade9f22c6d13d38ebbf4f7a8605b1f851667ea6c7c2edb build: number: 0 From fd4241f095aed9ae1c5314095344703896bd8a7c Mon Sep 17 00:00:00 2001 From: christopher Date: Wed, 1 Aug 2018 17:15:12 -0400 Subject: [PATCH 05/26] MNT: Re-rendered with conda-smithy 3.1.10 and pinning 2018.07.24 --- .ci_support/linux_.yaml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml index 06eed9b..dca2267 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_.yaml @@ -1,6 +1,6 @@ pin_run_as_build: python: - max_pin: x.x min_pin: x.x + max_pin: x.x python: - '2.7' diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index dcfbaec..047fdaf 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ Checklist * [ ] Used a fork of the feedstock to propose changes * [ ] Bumped the build number (if the version is unchanged) * [ ] Reset the build number to `0` (if the version changed) -* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (`@conda-forge-admin, please rerender`) +* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) * [ ] Ensured the license file is being packaged. + About conda-smithy ================== @@ -49,6 +53,8 @@ conda search conda-smithy --channel conda-forge About conda-forge ================= +[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) + conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the conda-forge GitHub organization. The conda-forge organization contains one repository @@ -103,3 +109,15 @@ In order to produce a uniquely identifiable distribution: * If the version of a package **is** being increased, please remember to return the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) back to 0. + +Feedstock Maintainers +===================== + +* [@CJ-Wright](https://github.com/CJ-Wright/) +* [@isuruf](https://github.com/isuruf/) +* [@isuruf-bot](https://github.com/isuruf-bot/) +* [@jakirkham](https://github.com/jakirkham/) +* [@ocefpaf](https://github.com/ocefpaf/) +* [@pelson](https://github.com/pelson/) +* [@scopatz](https://github.com/scopatz/) + diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..ad85a2c --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,6 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file From 0d977e6e9f22398a97a6aa55188f484142f93ac5 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Tue, 15 Jan 2019 16:01:16 -0500 Subject: [PATCH 18/26] updated v3.2.7 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0bfdad6..82f2bfc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.2.6" %} +{% set version = "3.2.7" %} package: name: conda-smithy @@ -6,7 +6,7 @@ package: source: url: https://github.com/conda-forge/conda-smithy/releases/download/v{{ version }}/conda-smithy-{{ version }}.tar.gz - sha256: fe345954495d4bbe05134f5ce44b9b3e5b1aec838d1695b97aea62751fdd59af + sha256: c97bbd6df9d124406cf6992b232d895d33d16f029eb99d8f6d82bb5bd8f9fc58 build: number: 0 From 3462d921adbc191188c1facf79b17635ca55324c Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Tue, 15 Jan 2019 18:18:29 -0500 Subject: [PATCH 19/26] updated v3.2.8 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 82f2bfc..f0b8c13 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.2.7" %} +{% set version = "3.2.8" %} package: name: conda-smithy @@ -6,7 +6,7 @@ package: source: url: https://github.com/conda-forge/conda-smithy/releases/download/v{{ version }}/conda-smithy-{{ version }}.tar.gz - sha256: c97bbd6df9d124406cf6992b232d895d33d16f029eb99d8f6d82bb5bd8f9fc58 + sha256: faec9006aeb845c02e0bbdf7037f3070f3cb2926eea6426c293dbbceeab2e973 build: number: 0 From 5544cc512a4fa8424118f0e77f3262bd4829d688 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Tue, 15 Jan 2019 18:19:50 -0500 Subject: [PATCH 20/26] MNT: Re-rendered with conda-build 3.17.5, conda-smithy 3.2.8, and conda-forge-pinning 2019.01.15 --- .azure-pipelines/build_steps.sh | 3 --- .circleci/build_steps.sh | 3 --- 2 files changed, 6 deletions(-) diff --git a/.azure-pipelines/build_steps.sh b/.azure-pipelines/build_steps.sh index ee94b3f..779d52b 100755 --- a/.azure-pipelines/build_steps.sh +++ b/.azure-pipelines/build_steps.sh @@ -24,9 +24,6 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts. -conda clean --lock - run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh index 05ed2a9..1301eb6 100755 --- a/.circleci/build_steps.sh +++ b/.circleci/build_steps.sh @@ -24,9 +24,6 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts. -conda clean --lock - source run_conda_forge_build_setup # make the build number clobber From e9379cf0bb7328011d069fc4d8d9dbb159c29fe8 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Tue, 15 Jan 2019 19:12:20 -0500 Subject: [PATCH 21/26] Add git as a runtime dep --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f0b8c13..e3c4799 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,6 +30,7 @@ requirements: - jinja2 - requests - pycrypto + - git - gitpython - pygithub <2 - ruamel.yaml From 3a25dd1dcd493e2f7fa251f9468f91f941e02ee1 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Tue, 15 Jan 2019 21:11:52 -0500 Subject: [PATCH 22/26] updated v3.2.9 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e3c4799..75fcbf5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.2.8" %} +{% set version = "3.2.9" %} package: name: conda-smithy @@ -6,7 +6,7 @@ package: source: url: https://github.com/conda-forge/conda-smithy/releases/download/v{{ version }}/conda-smithy-{{ version }}.tar.gz - sha256: faec9006aeb845c02e0bbdf7037f3070f3cb2926eea6426c293dbbceeab2e973 + sha256: e27143738c52644fc6689fa1372893179b88a7672a2fe1c1b4cfd3298fe34227 build: number: 0 From a596924d64c43220f42c02e5c4a4e64625ac52b2 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Wed, 23 Jan 2019 19:37:37 -0500 Subject: [PATCH 23/26] updated v3.1.13 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 75fcbf5..689fb70 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.2.9" %} +{% set version = "3.1.13" %} package: name: conda-smithy @@ -6,7 +6,7 @@ package: source: url: https://github.com/conda-forge/conda-smithy/releases/download/v{{ version }}/conda-smithy-{{ version }}.tar.gz - sha256: e27143738c52644fc6689fa1372893179b88a7672a2fe1c1b4cfd3298fe34227 + sha256: 5b918ec9420364fb7238392ae6ec0fbaaa542bbc4624a6e7ea0a53bae4a00a72 build: number: 0 From 70b2ae38f4d5c104611140c67e0551a54071125d Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Fri, 25 Jan 2019 21:15:09 -0500 Subject: [PATCH 24/26] updated v3.2.10 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 689fb70..47fc075 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.1.13" %} +{% set version = "3.2.10" %} package: name: conda-smithy @@ -6,7 +6,7 @@ package: source: url: https://github.com/conda-forge/conda-smithy/releases/download/v{{ version }}/conda-smithy-{{ version }}.tar.gz - sha256: 5b918ec9420364fb7238392ae6ec0fbaaa542bbc4624a6e7ea0a53bae4a00a72 + sha256: 46df0cce95eaa75cb71ff1378297556926368c19dc4d735abc9d5d8b819b0d7f build: number: 0 From 5771821767b8b36e5ebe0755dd1c76e574d37a47 Mon Sep 17 00:00:00 2001 From: soapy1 Date: Fri, 25 Jan 2019 16:37:23 -0600 Subject: [PATCH 25/26] Add git config --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 47fc075..d76acfa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -44,13 +44,14 @@ test: - conda_smithy.configure_feedstock commands: - conda smithy --help + - if ! [[ $(git config --get user.name) ]]; then git config --local user.name "Testy McTest"; fi + - if ! [[ $(git config --get user.email) ]]; then git config --local user.email "tmactest@test.org"; fi - py.test . source_files: - tests/* requires: - pytest - about: home: https://github.com/conda-forge/conda-smithy license: BSD 3-clause From 8ffa507922f2b168b8bc1acf9ddf994da5f2c705 Mon Sep 17 00:00:00 2001 From: "Christopher J. Wright" Date: Tue, 5 Feb 2019 13:24:52 -0500 Subject: [PATCH 26/26] use glbl config --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d2256fb..8457e16 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -44,8 +44,8 @@ test: - conda_smithy.configure_feedstock commands: - conda smithy --help - - if ! [[ $(git config --get user.name) ]]; then git config --local user.name "Testy McTest"; fi - - if ! [[ $(git config --get user.email) ]]; then git config --local user.email "tmactest@test.org"; fi + - if ! [[ $(git config --get user.name) ]]; then git config --global user.name "Testy McTest"; fi + - if ! [[ $(git config --get user.email) ]]; then git config --global user.email "tmactest@test.org"; fi - py.test . source_files: - tests/*