From 04698e0beb57987f888d740b4242a1f2551d5dfa Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 15:40:15 +0000 Subject: [PATCH 01/16] Update meta.yaml --- recipe/meta.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 93d620b..bfb4fd3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,40 +1,40 @@ -{% set name = "ipython_memory_usage" %} -{% set version = "1.1" %} - package: - name: {{ name|lower }} - version: {{ version }} + name: ipython_memory_usage + version: 1.2 source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 1f4697210257f853fea74de0cf3fae60a32e550e578bac6f46de9b40c550422b + url: https://files.pythonhosted.org/packages/60/e5/6e437102cf49c3843c8f192c7c7b99184e5946930bb9ab0e23799e802586/ipython_memory_usage-1.2.tar.gz + sha256: 1704ada665410f0443052efc108f4c8819c60bb7b0d6e7b253a098f0a66284d0 build: - noarch: python number: 0 - script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv" requirements: - host: + build: - python - - pip + - setuptools + - memory_profiler + - IPython >=2.1 + run: - python - memory_profiler - - ipython + - IPython >=2.1 test: imports: - - ipython_memory_usage + - ipython_memory_usage about: home: https://github.com/ianozsvald/ipython_memory_usage - license: BSD-2-Clause + license: BSD2 license_family: BSD - license_file: {{ RECIPE_DIR }}/LICENSE - summary: 'IPython tool to report memory usage deltas for every command you type' - dev_url: https://github.com/ianozsvald/ipython_memory_usage + license_file: LICENSE + summary: + - IPython tool to report memory usage deltas for every command you type. If you are running out of RAM then use this tool to understand what’s happening. It also records the time spent running each command. + - In [3]: arr=np.random.uniform(size=int(1e7)) + - ‘arr=np.random.uniform(size=int(1e7))’ used 76.2578 MiB RAM in 0.33s, peaked 0.00 MiB above current, total RAM usage 107.37 MiB extra: recipe-maintainers: - - xhochy + - ianozsvald From 008e4d46acbe740efc8e13a7ceb21873ba7204a7 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 15:58:44 +0000 Subject: [PATCH 02/16] Add Variables --- recipe/meta.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bfb4fd3..72ba421 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,14 @@ +{% set name = "ipython_memory_usage" %} +{% set version = "1.2" %} +{% set sha256 = "1f4697210257f853fea74de0cf3fae60a32e550e578bac6f46de9b40c550422b" %} + package: - name: ipython_memory_usage - version: 1.2 + name: {{ name|lower }} + version: {{ version }} source: - url: https://files.pythonhosted.org/packages/60/e5/6e437102cf49c3843c8f192c7c7b99184e5946930bb9ab0e23799e802586/ipython_memory_usage-1.2.tar.gz - sha256: 1704ada665410f0443052efc108f4c8819c60bb7b0d6e7b253a098f0a66284d0 + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: {{ sha256 }} build: number: 0 From 3a4f9f5200620e66f818a415a76f6529f4c4fde2 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 16:09:33 +0000 Subject: [PATCH 03/16] Update meta.yaml --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 72ba421..377de0a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,11 +7,14 @@ package: version: {{ version }} source: + fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: {{ sha256 }} build: + noarch: python number: 0 + script: python setup.py install --single-version-externally-managed --record record.txt requirements: build: @@ -42,3 +45,4 @@ about: extra: recipe-maintainers: - ianozsvald + - ps-git From 4aebd3ac8512bab99e6e99f1f9a066b138f4cd88 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 16:16:15 +0000 Subject: [PATCH 04/16] Update meta.yaml Update to PIP --- recipe/meta.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 377de0a..c07c74b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,19 +14,17 @@ source: build: noarch: python number: 0 - script: python setup.py install --single-version-externally-managed --record record.txt + script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv" requirements: build: - python - - setuptools - - memory_profiler - - IPython >=2.1 + - pip run: - python - - memory_profiler - - IPython >=2.1 + - ipython + test: imports: From 7be56e27995948cc711ab48df0bf788b689f749d Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 16:18:00 +0000 Subject: [PATCH 05/16] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c07c74b..573c1d3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set name = "ipython_memory_usage" %} +{% set name = "ipython-memory-usage" %} {% set version = "1.2" %} {% set sha256 = "1f4697210257f853fea74de0cf3fae60a32e550e578bac6f46de9b40c550422b" %} From 36a7f74e19ffe918ba47c920c3b6f3e85477c4d0 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 16:18:49 +0000 Subject: [PATCH 06/16] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 573c1d3..005c339 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,7 +25,6 @@ requirements: - python - ipython - test: imports: - ipython_memory_usage From 3862f4a51d6aafd2697370d4501d38cb2da26096 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 16:21:29 +0000 Subject: [PATCH 07/16] Update meta.yaml Cleaned up summary --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 005c339..c6b1867 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,8 +36,6 @@ about: license_file: LICENSE summary: - IPython tool to report memory usage deltas for every command you type. If you are running out of RAM then use this tool to understand what’s happening. It also records the time spent running each command. - - In [3]: arr=np.random.uniform(size=int(1e7)) - - ‘arr=np.random.uniform(size=int(1e7))’ used 76.2578 MiB RAM in 0.33s, peaked 0.00 MiB above current, total RAM usage 107.37 MiB extra: recipe-maintainers: From 895e70821cc50700a06e6069eda569366eb8b816 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 16:23:31 +0000 Subject: [PATCH 08/16] Update meta.yaml Reset package name. Update License --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c6b1867..86b99ad 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set name = "ipython-memory-usage" %} +{% set name = "ipython_memory_usage" %} {% set version = "1.2" %} {% set sha256 = "1f4697210257f853fea74de0cf3fae60a32e550e578bac6f46de9b40c550422b" %} @@ -31,7 +31,7 @@ test: about: home: https://github.com/ianozsvald/ipython_memory_usage - license: BSD2 + license: BSD-2-Clause license_family: BSD license_file: LICENSE summary: From 4463b9e8fd4a0f7986f1cb46026c13b05640ffb4 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sat, 2 Nov 2019 16:59:52 +0000 Subject: [PATCH 09/16] MNT: Re-rendered with conda-build 3.18.10, conda-smithy 3.6.1, and conda-forge-pinning 2019.11.01 --- .azure-pipelines/azure-pipelines-linux.yml | 32 +++++++++++ .ci_support/linux_.yaml | 4 +- .circleci/checkout_merge_commit.sh | 27 --------- .circleci/config.yml | 26 ++++----- .circleci/fast_finish_ci_pr_build.sh | 4 -- .gitattributes | 17 ++++++ .github/CODEOWNERS | 1 + .github/CONTRIBUTING.md | 15 ----- .github/ISSUE_TEMPLATE.md | 25 -------- .github/PULL_REQUEST_TEMPLATE.md | 18 ------ {.circleci => .scripts}/build_steps.sh | 21 ++++--- {.circleci => .scripts}/run_docker_build.sh | 41 +++++++++++--- LICENSE.txt | 2 +- README.md | 22 ++++++- azure-pipelines.yml | 6 ++ build-locally.py | 63 +++++++++++++++++++++ 16 files changed, 195 insertions(+), 129 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-linux.yml delete mode 100755 .circleci/checkout_merge_commit.sh delete mode 100755 .circleci/fast_finish_ci_pr_build.sh create mode 100644 .github/CODEOWNERS delete mode 100644 .github/CONTRIBUTING.md delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md rename {.circleci => .scripts}/build_steps.sh (56%) rename {.circleci => .scripts}/run_docker_build.sh (51%) create mode 100644 azure-pipelines.yml create mode 100755 build-locally.py diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml new file mode 100755 index 0000000..9ffb709 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -0,0 +1,32 @@ +# 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: +- job: linux + pool: + vmImage: ubuntu-16.04 + timeoutInMinutes: 360 + strategy: + maxParallel: 8 + matrix: + linux_: + CONFIG: linux_ + UPLOAD_PACKAGES: True + DOCKER_IMAGE: condaforge/linux-anvil-comp7 + steps: + # configure qemu binfmt-misc running. This allows us to run docker containers + # embedded qemu-static + - script: | + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + ls /proc/sys/fs/binfmt_misc/ + condition: not(startsWith(variables['CONFIG'], 'linux_64')) + displayName: Configure binfmt_misc + + - script: | + export CI=azure + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + .scripts/run_docker_build.sh + displayName: Run docker build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml index 2ce6b6c..627331f 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_.yaml @@ -1,11 +1,9 @@ -build_number_decrement: -- '0' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main docker_image: -- condaforge/linux-anvil +- condaforge/linux-anvil-comp7 pin_run_as_build: python: min_pin: x.x diff --git a/.circleci/checkout_merge_commit.sh b/.circleci/checkout_merge_commit.sh deleted file mode 100755 index 9528e4b..0000000 --- a/.circleci/checkout_merge_commit.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - - -# Update PR refs for testing. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/head:pr/${CIRCLE_PR_NUMBER}/head" - FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/${CIRCLE_PR_NUMBER}/merge" -fi - -# Retrieve the refs. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git fetch -u origin ${FETCH_REFS} -fi - -# Checkout the PR merge ref. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge" -fi - -# Check for merge conflicts. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null -fi diff --git a/.circleci/config.yml b/.circleci/config.yml index ede1d94..6ad461b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,26 +1,24 @@ +# 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 -*- + version: 2 jobs: - build_linux_: + build: working_directory: ~/test machine: true - environment: - - CONFIG: "linux_" steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh + # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. + command: exit 0 workflows: version: 2 build_and_test: jobs: - - build_linux_ + - build: + filters: + branches: + ignore: + - /.*/ diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh deleted file mode 100755 index 8c048ac..0000000 --- a/.circleci/fast_finish_ci_pr_build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.gitattributes b/.gitattributes index 974953e..86ff937 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,20 @@ meta.yaml text eol=lf build.sh text eol=lf bld.bat text eol=crlf + +# github helper pieces to make some files not show up in diffs automatically +.azure-pipelines/* linguist-generated=true +.circleci/* linguist-generated=true +.drone/* linguist-generated=true +.drone.yml linguist-generated=true +.github/* linguist-generated=true +.travis/* linguist-generated=true +.appveyor.yml linguist-generated=true +.gitattributes linguist-generated=true +.gitignore linguist-generated=true +.travis.yml linguist-generated=true +LICENSE.txt linguist-generated=true +README.md linguist-generated=true +azure-pipelines.yml linguist-generated=true +build-locally.py linguist-generated=true +shippable.yml linguist-generated=true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..b09fdcb --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @ianozsvald @ps-git \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index d87090f..0000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,15 +0,0 @@ -Thanks for your interest in helping out conda-forge. - -Whether you are brand new or a seasoned maintainer, we always appreciate -feedback from the community about how we can improve conda-forge. If you -are submitting a PR or issue, please fill out the respective template. Should -any questions arise please feel free to ask the maintainer team of the -respective feedstock or reach out to `@conda-forge/core` for more complex -issues. - -In the case of any issues reported, please be sure to demonstrate the relevant -issue (even if it is an absence of a feature). Providing this information will -help busy maintainers understand what it is you hope to accomplish. Also this -will help provide them clues as to what might be going wrong. These examples -can also be reused as tests in the build to ensure further packages meet these -criteria. This is requested to help you get timely and relevant feedback. :) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index fc95334..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,25 +0,0 @@ - -Issue: - -
-Environment (conda list): -
- -``` -$ conda list - -``` -
- -
-Details about conda and system ( conda info ): -
- -``` -$ conda info - -``` -
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 047fdaf..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,18 +0,0 @@ - -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` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) -* [ ] Ensured the license file is being packaged. - - - - diff --git a/.circleci/build_steps.sh b/.scripts/build_steps.sh similarity index 56% rename from .circleci/build_steps.sh rename to .scripts/build_steps.sh index 258a085..8a4af44 100755 --- a/.circleci/build_steps.sh +++ b/.scripts/build_steps.sh @@ -7,34 +7,33 @@ set -xeuo pipefail export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT=/home/conda/feedstock_root -export RECIPE_ROOT=/home/conda/recipe_root -export CI_SUPPORT=/home/conda/feedstock_root/.ci_support +export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" +export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc </dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" @@ -25,26 +28,48 @@ fi ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" if [ -z "$CONFIG" ]; then - echo "Need to set CONFIG env variable" + set +x + FILES=`ls .ci_support/linux_*` + CONFIGS="" + for file in $FILES; do + CONFIGS="${CONFIGS}'${file:12:-5}' or "; + done + echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}" exit 1 fi -pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil ) +if [ -z "${DOCKER_IMAGE}" ]; then + SHYAML_INSTALLED="$(shyaml -h || echo NO)" + if [ "${SHYAML_INSTALLED}" == "NO" ]; then + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + else + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + fi +fi mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" rm -f "$DONE_CANARY" -docker run -it \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \ +if [ -z "${CI}" ]; then + DOCKER_RUN_ARGS="-it " +fi + +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ -e CONFIG \ -e BINSTAR_TOKEN \ -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ + -e GIT_BRANCH \ + -e UPLOAD_ON_BRANCH \ + -e CI \ $DOCKER_IMAGE \ bash \ - /home/conda/feedstock_root/.circleci/build_steps.sh + /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh # verify that the end of the script was reached test -f "$DONE_CANARY" \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 72dc8fd..cba42cf 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2018, conda-forge +Copyright (c) 2015-2019, conda-forge All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index bf538bb..beb200e 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,22 @@ Package license: BSD-2-Clause Feedstock license: BSD 3-Clause -Summary: IPython tool to report memory usage deltas for every command you type +Summary: ['IPython tool to report memory usage deltas for every command you type. If you are running out of RAM then use this tool to understand what’s happening. It also records the time spent running each command.'] Current build status ==================== -All platforms: -[![noarch](https://img.shields.io/circleci/project/github/conda-forge/ipython_memory_usage-feedstock/master.svg?label=noarch)](https://circleci.com/gh/conda-forge/ipython_memory_usage-feedstock) + + + + +
All platforms: + + + +
Current release info ==================== @@ -49,6 +56,8 @@ conda search ipython_memory_usage --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 +112,10 @@ 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 +===================== + +* [@ianozsvald](https://github.com/ianozsvald/) +* [@ps-git](https://github.com/ps-git/) + 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 diff --git a/build-locally.py b/build-locally.py new file mode 100755 index 0000000..8f7ecca --- /dev/null +++ b/build-locally.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python3 +# +# This file has been generated by conda-smithy in order to build the recipe +# locally. +# +import os +import glob +import subprocess +from argparse import ArgumentParser + + +def setup_environment(ns): + os.environ["CONFIG"] = ns.config + os.environ["UPLOAD_PACKAGES"] = "False" + + +def run_docker_build(ns): + script = ".scripts/run_docker_build.sh" + subprocess.check_call([script]) + + +def verify_config(ns): + valid_configs = { + os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") + } + print(f"valid configs are {valid_configs}") + if ns.config in valid_configs: + print("Using " + ns.config + " configuration") + return + elif len(valid_configs) == 1: + ns.config = valid_configs.pop() + print("Found " + ns.config + " configuration") + elif ns.config is None: + print("config not selected, please choose from the following:\n") + selections = list(enumerate(sorted(valid_configs), 1)) + for i, c in selections: + print(f"{i}. {c}") + s = input("\n> ") + idx = int(s) - 1 + ns.config = selections[idx][1] + print(f"selected {ns.config}") + else: + raise ValueError("config " + ns.config + " is not valid") + # Remove the following, as implemented + if not ns.config.startswith("linux"): + raise ValueError( + f"only Linux configs currently supported, got {ns.config}" + ) + + +def main(args=None): + p = ArgumentParser("build-locally") + p.add_argument("config", default=None, nargs="?") + + ns = p.parse_args(args=args) + verify_config(ns) + setup_environment(ns) + + run_docker_build(ns) + + +if __name__ == "__main__": + main() From 5ff0d1e203ccfca7ebd675bc021a9a710235219c Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 17:39:29 +0000 Subject: [PATCH 10/16] Update meta.yaml Updated test. No direct ipython call possible --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 86b99ad..39fa29a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: test: imports: - - ipython_memory_usage + - datetime about: home: https://github.com/ianozsvald/ipython_memory_usage @@ -39,5 +39,7 @@ about: extra: recipe-maintainers: + - xhochy - ianozsvald - ps-git + From 49c97544840bc1ae6106f59b41b7eaa9b17191d6 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 17:55:10 +0000 Subject: [PATCH 11/16] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 39fa29a..66b4215 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "ipython_memory_usage" %} {% set version = "1.2" %} -{% set sha256 = "1f4697210257f853fea74de0cf3fae60a32e550e578bac6f46de9b40c550422b" %} +{% set sha256 = "1704ada665410f0443052efc108f4c8819c60bb7b0d6e7b253a098f0a66284d0" %} package: name: {{ name|lower }} From 2ce0288f409a72da71ae26eec6117ff63dcdbb34 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 18:11:31 +0000 Subject: [PATCH 12/16] Update meta.yaml Enhanced tests to import ipython_memory_usage module --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 66b4215..d5d2f7e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,8 +26,8 @@ requirements: - ipython test: - imports: - - datetime + command: + - python -m IPython "import ipython_memory_usage" about: home: https://github.com/ianozsvald/ipython_memory_usage From 2f8fa9659b518b51b6f2123b19a5c051742cc610 Mon Sep 17 00:00:00 2001 From: Puja Date: Sat, 2 Nov 2019 18:14:00 +0000 Subject: [PATCH 13/16] Meta.yaml - Change command to commands --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d5d2f7e..f4f2abe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,7 @@ requirements: - ipython test: - command: + commands: - python -m IPython "import ipython_memory_usage" about: From ea8a7c5dfed0559dee6a4e1a2bff9d940ac44e0b Mon Sep 17 00:00:00 2001 From: Puja Date: Sun, 3 Nov 2019 06:46:34 +0000 Subject: [PATCH 14/16] Clean-up meta.yaml - Move SHA256 hash into yaml. (As suggested in PR) - Remove fn: as not required. --- recipe/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f4f2abe..217f85e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,15 +1,13 @@ {% set name = "ipython_memory_usage" %} {% set version = "1.2" %} -{% set sha256 = "1704ada665410f0443052efc108f4c8819c60bb7b0d6e7b253a098f0a66284d0" %} package: name: {{ name|lower }} version: {{ version }} source: - fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: {{ sha256 }} + sha256: 1704ada665410f0443052efc108f4c8819c60bb7b0d6e7b253a098f0a66284d0 build: noarch: python From 6afb955a68c81597e18b8256772b4561dd4030aa Mon Sep 17 00:00:00 2001 From: Puja Date: Sun, 3 Nov 2019 17:49:34 +0000 Subject: [PATCH 15/16] Update requirements (replace build with host) --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 217f85e..0f88bce 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ build: script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv" requirements: - build: + host: - python - pip From bd2857f143d5a924447110beef4efe8a3939d032 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 4 Nov 2019 19:08:29 +0100 Subject: [PATCH 16/16] Make summary a single string --- recipe/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0f88bce..bd5c8dd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,8 +32,10 @@ about: license: BSD-2-Clause license_family: BSD license_file: LICENSE - summary: - - IPython tool to report memory usage deltas for every command you type. If you are running out of RAM then use this tool to understand what’s happening. It also records the time spent running each command. + summary: | + IPython tool to report memory usage deltas for every command you type. + If you are running out of RAM then use this tool to understand what’s + happening. It also records the time spent running each command. extra: recipe-maintainers: