diff --git a/.ci_support/README b/.ci_support/README new file mode 100644 index 0000000..e4e2dce --- /dev/null +++ b/.ci_support/README @@ -0,0 +1 @@ +This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml new file mode 100644 index 0000000..1e2395b --- /dev/null +++ b/.ci_support/linux_.yaml @@ -0,0 +1,14 @@ +cairo: +- '1.14' +freetype: +- 2.8.1 +glib: +- '2.55' +ncurses: +- '5.9' +pango: +- '1.40' +qt: +- '5.6' +readline: +- '7.0' diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml new file mode 100644 index 0000000..37e78bc --- /dev/null +++ b/.ci_support/osx_.yaml @@ -0,0 +1,20 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +cairo: +- '1.14' +freetype: +- 2.8.1 +glib: +- '2.55' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +ncurses: +- '5.9' +pango: +- '1.40' +qt: +- '5.6' +readline: +- '7.0' diff --git a/ci_support/checkout_merge_commit.sh b/.circleci/checkout_merge_commit.sh similarity index 100% rename from ci_support/checkout_merge_commit.sh rename to .circleci/checkout_merge_commit.sh diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..ede1d94 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,26 @@ +version: 2 + +jobs: + build_linux_: + 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 + +workflows: + version: 2 + build_and_test: + jobs: + - build_linux_ diff --git a/ci_support/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh similarity index 54% rename from ci_support/fast_finish_ci_pr_build.sh rename to .circleci/fast_finish_ci_pr_build.sh index 463c27f..3db687a 100755 --- a/ci_support/fast_finish_ci_pr_build.sh +++ b/.circleci/fast_finish_ci_pr_build.sh @@ -1,4 +1,4 @@ #!/bin/bash -curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ +curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/ci_support/run_docker_build.sh b/.circleci/run_docker_build.sh similarity index 71% rename from ci_support/run_docker_build.sh rename to .circleci/run_docker_build.sh index 4ba3409..21ceae6 100755 --- a/ci_support/run_docker_build.sh +++ b/.circleci/run_docker_build.sh @@ -17,7 +17,7 @@ channels: - defaults conda-build: - root-dir: /feedstock_root/build_artefacts + root-dir: /home/conda/feedstock_root/build_artifacts show_channel_urls: true @@ -34,11 +34,12 @@ if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) fi -rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" +rm -f "$FEEDSTOCK_ROOT/build_artifacts/conda-forge-build-done" cat << EOF | docker run -i \ - -v "${RECIPE_ROOT}":/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/feedstock_root \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \ + -e CONFIG="$CONFIG" \ -e HOST_USER_ID="${HOST_USER_ID}" \ -a stdin -a stdout -a stderr \ condaforge/linux-anvil \ @@ -51,10 +52,10 @@ set -x export PYTHONUNBUFFERED=1 echo "$config" > ~/.condarc -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts. +# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts. conda clean --lock -conda install --yes --quiet conda-forge-build-setup +conda install --yes --quiet conda-forge-ci-setup=1 source run_conda_forge_build_setup @@ -65,14 +66,14 @@ source run_conda_forge_build_setup /usr/bin/sudo -n yum install -y libX11-devel libXt-devel libXext-devel chrpath libXrender-devel gtk2-devel dbus-devel -# Embarking on 1 case(s). - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 -touch /feedstock_root/build_artefacts/conda-forge-build-done +conda build /home/conda/recipe_root -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml --quiet || exit 1 +upload_or_check_non_existence /home/conda/recipe_root conda-forge --channel=main -m /home/conda/feedstock_root/.ci_support/${CONFIG}.yaml || exit 1 + +touch /home/conda/feedstock_root/build_artifacts/conda-forge-build-done EOF # double-check that the build got to the end # see https://github.com/conda-forge/conda-smithy/pull/337 # for a possible fix set -x -test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1 +test -f "$FEEDSTOCK_ROOT/build_artifacts/conda-forge-build-done" || exit 1 diff --git a/.gitattributes b/.gitattributes index 288029d..974953e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,7 @@ * text=auto +*.patch binary +*.diff binary meta.yaml text eol=lf build.sh text eol=lf bld.bat text eol=crlf diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..d87090f --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000..fc95334 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,25 @@ + +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 new file mode 100644 index 0000000..d60a25d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,18 @@ + +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` +* [ ] Ensured the license file is being packaged. + + + + diff --git a/.gitignore b/.gitignore index 3dc1e2f..c89ecb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ *.pyc -build_artefacts +build_artifacts diff --git a/.travis.yml b/.travis.yml index 4b70c3c..ebb506c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ os: osx osx_image: xcode6.4 env: + matrix: + - CONFIG=osx_ + global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: "F4zX5IKdy4ztfBcx+XQd6nQEKt7uqHiXzrrJi7F0zSe0IPg4uHuUYRydO6R7c9+F8X+lMu4d3zvLbrREnj3+IiVR4Sbj9Rc0ZxxDCag0//irV1ITN+2jzEdPWIFudHloslbcU+3tOruKRoIqgX9QnuYxYoZob8m3Ozy/Zat51UKP6hW4ZMhEunY4ZL09atYhDforqS2ZSHwIOEoCmIRc0JPASwCSqWz2iLJtHomhaDrYfKZMI+HEh3BtHGFL0vNJ6lyEJFpSd9Is09jf0nGlPOQ46HWcmhaZkqMMNHvsMw88kDovWjul4gBkany7tCPFiJg7+6WOx8RNtMj8C1Of65R3rmW+iPSEg7eSrTXYfqF3shxOjkc2fR5ra8TjrLZrxTArQjTYhNvDpAU7zdp/308SHHO3gKDhbxZnvyMICMHVmaI2hLI1n9Nb5pRDmyl2nEdyozIjjO2UUQfytmk5vhZxr2Re7rgyawTvw/fM159A8rtYkOh1Y9g0g8lOu3R6/Vc6nJtY8rbExga6+YOY8hH8o6DHM6HUCLVbb+Dwsd3TZjTC2SqWjgT90GsGmeSeUabjgQKWWlY4K0atW3XaI/5nFTW1qxqvRWzmGlaNJdq3hifiG50S3PUeDqR2DVf6+lLplMiIL/Xl8GDveHWbzyTML3WnVT/Sv/5YPVgQQwY=" @@ -15,7 +18,7 @@ env: before_install: # Fast finish the PR. - | - (curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ + (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 # Remove homebrew. @@ -47,10 +50,10 @@ install: conda config --add channels defaults conda config --add channels conda-forge conda config --set show_channel_urls true - conda install --yes --quiet conda-forge-build-setup + conda install --yes --quiet conda-forge-ci-setup=1 source run_conda_forge_build_setup script: - - conda build ./recipe + - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml - - upload_or_check_non_existence ./recipe conda-forge --channel=main + - upload_or_check_non_existence ./recipe conda-forge --channel=main -m ./.ci_support/${CONFIG}.yaml diff --git a/LICENSE b/LICENSE.txt similarity index 97% rename from LICENSE rename to LICENSE.txt index 7f5c363..72dc8fd 100644 --- a/LICENSE +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2017, conda-forge +Copyright (c) 2015-2018, 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 1a2fcee..c46ae44 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,16 @@ Summary: Gnuplot, plotting from command line Current build status ==================== -Linux: [![Circle CI](https://circleci.com/gh/conda-forge/gnuplot-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/gnuplot-feedstock) -OSX: [![TravisCI](https://travis-ci.org/conda-forge/gnuplot-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/gnuplot-feedstock) -Windows: ![](https://cdn.rawgit.com/conda-forge/conda-smithy/90845bba35bec53edac7a16638aa4d77217a3713/conda_smithy/static/disabled.svg) +[![Linux](https://img.shields.io/circleci/project/github/conda-forge/gnuplot-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/gnuplot-feedstock) +[![OSX](https://img.shields.io/travis/conda-forge/gnuplot-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/gnuplot-feedstock) +![Windows disabled](https://img.shields.io/badge/Windows-disabled-lightgrey.svg) Current release info ==================== -Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/gnuplot/badges/version.svg)](https://anaconda.org/conda-forge/gnuplot) -Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/gnuplot/badges/downloads.svg)](https://anaconda.org/conda-forge/gnuplot) +[![Conda Recipe](https://img.shields.io/badge/recipe-gnuplot-green.svg)](https://anaconda.org/conda-forge/gnuplot) +[![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gnuplot.svg)](https://anaconda.org/conda-forge/gnuplot) +[![Conda Version](https://img.shields.io/conda/vn/conda-forge/gnuplot.svg)](https://anaconda.org/conda-forge/gnuplot) +[![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gnuplot.svg)](https://anaconda.org/conda-forge/gnuplot) Installing gnuplot ================== @@ -66,6 +68,7 @@ To manage the continuous integration and simplify feedstock maintenance Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. +For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). Terminology =========== @@ -100,4 +103,4 @@ In order to produce a uniquely identifiable distribution: the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string) - back to 0. + back to 0. \ No newline at end of file diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 421809c..0000000 --- a/circle.yml +++ /dev/null @@ -1,19 +0,0 @@ -checkout: - post: - - ./ci_support/fast_finish_ci_pr_build.sh - - ./ci_support/checkout_merge_commit.sh - -machine: - services: - - docker - -dependencies: - # Note, we used to use the naive caching of docker images, but found that it was quicker - # just to pull each time. #rollondockercaching - override: - - docker pull condaforge/linux-anvil - -test: - override: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - - ./ci_support/run_docker_build.sh