From 30fd3abb51528357ec33889da9224f7a55ea6d09 Mon Sep 17 00:00:00 2001 From: santi Date: Mon, 29 May 2017 17:27:54 +0200 Subject: [PATCH 01/16] update ffmpeg dependency to sync with opencv & friends --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3744d4f..a8b3493 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,10 +22,10 @@ requirements: - cython - pkg-config # [not win] - msinttypes # [win and py27] - - ffmpeg 2.8.6 + - ffmpeg 3.2.* run: - python - - ffmpeg 2.8.6 + - ffmpeg 3.2.* - pillow - numpy From deeb07e777e982326a1b84eb5998d31088fe784a Mon Sep 17 00:00:00 2001 From: santi Date: Mon, 29 May 2017 17:29:57 +0200 Subject: [PATCH 02/16] MNT: Re-rendered with conda-smithy 2.3.1 --- appveyor.yml | 14 ++++---------- ci_support/run_docker_build.sh | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 99faacd..e1ed599 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,11 +4,6 @@ environment: - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd" - BINSTAR_TOKEN: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC @@ -32,11 +27,11 @@ environment: - TARGET_ARCH: x86 CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda35 + CONDA_INSTALL_LOCN: C:\\Miniconda36 - TARGET_ARCH: x64 CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 + CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 # We always use a 64-bit machine, but can build x86 distributions @@ -47,7 +42,7 @@ platform: install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | - curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py > ff_ci_pr_build.py + powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py @@ -67,7 +62,6 @@ install: - cmd: conda config --add channels conda-forge # Configure the VM. - - cmd: conda install -n root --quiet --yes obvious-ci - cmd: conda install -n root --quiet --yes conda-forge-build-setup - cmd: run_conda_forge_build_setup @@ -75,6 +69,6 @@ install: build: off test_script: - - "%CMD_IN_ENV% conda build recipe --quiet" + - conda build recipe --quiet deploy_script: - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index a0968a9..ef556d8 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -24,16 +24,30 @@ show_channel_urls: true CONDARC ) +# In order for the conda-build process in the container to write to the mounted +# volumes, we need to run with the same id as the host machine, which is +# normally the owner of the mounted volumes, or at least has write permission +HOST_USER_ID=$(id -u) +# Check if docker-machine is being used (normally on OSX) and get the uid from +# the VM +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" cat << EOF | docker run -i \ -v "${RECIPE_ROOT}":/recipe_root \ -v "${FEEDSTOCK_ROOT}":/feedstock_root \ + -e HOST_USER_ID="${HOST_USER_ID}" \ -a stdin -a stdout -a stderr \ condaforge/linux-anvil \ bash || exit 1 +set -e +set +x export BINSTAR_TOKEN=${BINSTAR_TOKEN} +set -x export PYTHONUNBUFFERED=1 echo "$config" > ~/.condarc From dd7e18bebc4df90ec75f4da8558577d43e2d08fd Mon Sep 17 00:00:00 2001 From: santi Date: Tue, 30 May 2017 04:28:41 +0200 Subject: [PATCH 03/16] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a8b3493..f493786 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 script: python setup.py install --single-version-externally-managed --record record.txt requirements: From c1bc16e324e4be29d47eb0faadd5b82b48c203a1 Mon Sep 17 00:00:00 2001 From: santi Date: Thu, 8 Jun 2017 04:33:57 +0200 Subject: [PATCH 04/16] conda-forge.yaml to point to loopbio, rerender exploration adventures for #4 --- .travis.yml | 5 +-- README.md | 57 +++++++--------------------------- appveyor.yml | 5 +-- ci_support/run_docker_build.sh | 7 +++-- conda-forge.yml | 15 +++++++-- 5 files changed, 35 insertions(+), 54 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07dacf8..50f522f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - CONDA_PY=36 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - - secure: "EYZm1qDcu/lrIo692jrUiSAo3Ssj1VY7/en9VSNFVUK6oE5/8ZZNPE05gRpfCpgwsfrgGPo4YCmQRwwoOQgLc4nMVuK/Y0v4+Om8owItTs9rXymYM9CU0dvoolH8N75p+9diQnL3sMuqrt8VD4DMsfE+ff3XDlfheP9qQwXOVq8A7w0gtZ7PyELKCCQtqqrNdJp7XxbXGc0iHxmwI6riz5J3tZr1XFKX/nxXeZnkIYOL4HaMjDeWFsBRtT99UupTVOCfOox7x9OTTWmXRaI3qFqg44VDZhi1n66M9CZ6I/9cgKiq3KEdKulOQp7/xjDGxgKJaJPlHfDtlM1n2LU50McYGBelwNzMwrGYX7q6mSRS9BiXO57qheo9vXYxQTU2uP8jexPkSWdRVwBI4XLBONqTpwgMp2TpCz0NlT1vuAggoME2kJjDDYQSiN94JbqLCS7FNzFwX+Kvyo4WUIudnmlPzNLy7xI3C3QOnL4NCsu2SGltqmA3IBgZ00C0xYVjknPH0QqdWBIICzgLfxdBe4bZG5Eg7iqZ/jFYQ0xg3pRn9K8V21wQl9K7j4zTHWSIjH1gk/ea5RKTIn15ofVc2wILJYLaTl4tXkfnlU+BIQ57ZCOuqFKpln0iies9aI1dgXxAw2Kg2vZ92m5fDxe1sAM+kG6wxtZG9VfjWCFmHks=" + - secure: "None" before_install: @@ -51,6 +51,7 @@ install: conda config --remove channels defaults conda config --add channels defaults conda config --add channels conda-forge + conda config --add channels loopbio conda config --set show_channel_urls true conda install --yes --quiet conda-forge-build-setup source run_conda_forge_build_setup @@ -58,4 +59,4 @@ install: script: - conda build ./recipe - - upload_or_check_non_existence ./recipe conda-forge --channel=main + - upload_or_check_non_existence ./recipe loopbio --channel=main diff --git a/README.md b/README.md index 7fbc763..f59f261 100644 --- a/README.md +++ b/README.md @@ -17,25 +17,25 @@ details as much as possible. Current build status ==================== -Linux: [![Circle CI](https://circleci.com/gh/conda-forge/av-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/av-feedstock) -OSX: [![TravisCI](https://travis-ci.org/conda-forge/av-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/av-feedstock) -Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/av-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/av-feedstock/branch/master) +Linux: [![Circle CI](https://circleci.com/gh/loopbio/av-feedstock.svg?style=shield)](https://circleci.com/gh/loopbio/av-feedstock) +OSX: [![TravisCI](https://travis-ci.org/loopbio/av-feedstock.svg?branch=master)](https://travis-ci.org/loopbio/av-feedstock) +Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/loopbio/av-feedstock?svg=True)](https://ci.appveyor.com/project/loopbio/av-feedstock/branch/master) Current release info ==================== -Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/av/badges/version.svg)](https://anaconda.org/conda-forge/av) -Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/av/badges/downloads.svg)](https://anaconda.org/conda-forge/av) +Version: [![Anaconda-Server Badge](https://anaconda.org/loopbio/av/badges/version.svg)](https://anaconda.org/loopbio/av) +Downloads: [![Anaconda-Server Badge](https://anaconda.org/loopbio/av/badges/downloads.svg)](https://anaconda.org/loopbio/av) Installing av ============= -Installing `av` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `av` from the `loopbio` channel can be achieved by adding `loopbio` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels loopbio ``` -Once the `conda-forge` channel has been enabled, `av` can be installed with: +Once the `loopbio` channel has been enabled, `av` can be installed with: ``` conda install av @@ -44,43 +44,10 @@ conda install av It is possible to list all of the versions of `av` available on your platform with: ``` -conda search av --channel conda-forge +conda search av --channel loopbio ``` -About conda-forge -================= - -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 -for each of the installable packages. Such a repository is known as a *feedstock*. - -A feedstock is made up of a conda recipe (the instructions on what and how to build -the package) and the necessary configurations for automatic building using freely -available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](http://www.appveyor.com/) -and [TravisCI](https://travis-ci.org/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](http://docs.anaconda.org/) channel for Linux, Windows and OSX respectively. - -To manage the continuous integration and simplify feedstock maintenance -[conda-smithy](http://github.com/conda-forge/conda-smithy) has been developed. -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``. - - -Terminology -=========== - -**feedstock** - the conda recipe (raw material), supporting scripts and CI configuration. - -**conda-smithy** - the tool which helps orchestrate the feedstock. - Its primary use is in the construction of the CI ``.yml`` files - and simplify the management of *many* feedstocks. - -**conda-forge** - the place where the feedstock and smithy live and work to - produce the finished article (built conda distributions) Updating av-feedstock @@ -91,9 +58,9 @@ package version, please fork this repository and submit a PR. Upon submission, your changes will be run on the appropriate platforms to give the reviewer an opportunity to confirm that the changes result in a successful build. Once merged, the recipe will be re-built and uploaded automatically to the -`conda-forge` channel, whereupon the built conda packages will be available for -everybody to install and use from the `conda-forge` channel. -Note that all branches in the conda-forge/av-feedstock are +`loopbio` channel, whereupon the built conda packages will be available for +everybody to install and use from the `loopbio` channel. +Note that all branches in the loopbio/av-feedstock are immediately built and any created packages are uploaded, so PRs should be based on branches in forks and branches in the main repository should only be used to build distinct package versions. diff --git a/appveyor.yml b/appveyor.yml index e1ed599..0663b0d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ environment: BINSTAR_TOKEN: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC + secure: None matrix: - TARGET_ARCH: x86 @@ -60,6 +60,7 @@ install: - cmd: conda config --remove channels defaults - cmd: conda config --add channels defaults - cmd: conda config --add channels conda-forge + - cmd: conda config --add channels loopbio # Configure the VM. - cmd: conda install -n root --quiet --yes conda-forge-build-setup @@ -71,4 +72,4 @@ build: off test_script: - conda build recipe --quiet deploy_script: - - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main + - cmd: upload_or_check_non_existence .\recipe loopbio --channel=main diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index ef556d8..d8ab9c1 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -13,6 +13,7 @@ docker info config=$(cat < Date: Thu, 8 Jun 2017 05:43:58 +0200 Subject: [PATCH 05/16] enables anaconda.org upload in travis --- conda-forge.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 125e5cb..5c2e62a 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,17 +1,17 @@ travis: secure: - BINSTAR_TOKEN: + BINSTAR_TOKEN: dxeSdY2tdQTT0q6Nvs/MqB64gY8FxD25uhNyQZ7JRm4E7i/dj9Qs4UcwIUdIiv0IVlDVv//RXj6tU9ZiD984Xeww8KDHhGzrO+0xGAkj/EEUAg1D9ihi48uPYcDY1RhNwbFqZMeq7Y9PT5v8ix6AsiSwDIkCu3SLDYUDv3cai4tZ8WypNVT8K1rwGOcb6tXga3iNKLIbBhgiMEmMU2iSpCLxPp/HcnBKsxCD5bSmJK451nZ1x2gTzde+1PLYdIAgNhUKC397F2PSNbrcHvNN+p4DJf586wSxn8rO6a4ddEt9kD8xBgrSg5qP/qV9Ov37c9XaIcnGJ4dGnfYc9a8l+Hr3XYi32aDpMtV4M67/BFkHSHRiIxL1CThTNT8brJbY9J1kQE9Grvrm3e3BtYm0NgS4ZqXieR70Jb/UqmRnh6qL0GZ/THNBJ46qQ7hh3ZAgjjX6aclEdfhSpkP8lEZ5Yowo+TCWzLnJqN1P3yG0/DGF+luktORAIG0wiPvuagAnyTNar9S9bVIWOgwnRMR4r4vDyiXq/CoHfMcdT5rJsO4rppYp0xpOWYD9FuMPMz3vclj0zEC3bl+YLjPv1OH9G7dS6veQokNa7vT2fj/wo9hAIrBCLO2VDHPeQeRtT9Uojv/A+XEIxqaXdjTJbqSOk4ap7D4E1p9l6Ude5sq4yN8= appveyor: secure: BINSTAR_TOKEN: channels: sources: - - loopbio - - conda-forge - - defaults + - loopbio + - conda-forge + - defaults targets: - - [loopbio, main] + - [loopbio, main] github: - user_or_org: 'loopbio' + user_or_org: loopbio From f49ba419d97441dfc7745b7e867300798a580409 Mon Sep 17 00:00:00 2001 From: santi Date: Thu, 8 Jun 2017 05:48:51 +0200 Subject: [PATCH 06/16] rerender --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 50f522f..7cdc475 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - CONDA_PY=36 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - - secure: "None" + - secure: "dxeSdY2tdQTT0q6Nvs/MqB64gY8FxD25uhNyQZ7JRm4E7i/dj9Qs4UcwIUdIiv0IVlDVv//RXj6tU9ZiD984Xeww8KDHhGzrO+0xGAkj/EEUAg1D9ihi48uPYcDY1RhNwbFqZMeq7Y9PT5v8ix6AsiSwDIkCu3SLDYUDv3cai4tZ8WypNVT8K1rwGOcb6tXga3iNKLIbBhgiMEmMU2iSpCLxPp/HcnBKsxCD5bSmJK451nZ1x2gTzde+1PLYdIAgNhUKC397F2PSNbrcHvNN+p4DJf586wSxn8rO6a4ddEt9kD8xBgrSg5qP/qV9Ov37c9XaIcnGJ4dGnfYc9a8l+Hr3XYi32aDpMtV4M67/BFkHSHRiIxL1CThTNT8brJbY9J1kQE9Grvrm3e3BtYm0NgS4ZqXieR70Jb/UqmRnh6qL0GZ/THNBJ46qQ7hh3ZAgjjX6aclEdfhSpkP8lEZ5Yowo+TCWzLnJqN1P3yG0/DGF+luktORAIG0wiPvuagAnyTNar9S9bVIWOgwnRMR4r4vDyiXq/CoHfMcdT5rJsO4rppYp0xpOWYD9FuMPMz3vclj0zEC3bl+YLjPv1OH9G7dS6veQokNa7vT2fj/wo9hAIrBCLO2VDHPeQeRtT9Uojv/A+XEIxqaXdjTJbqSOk4ap7D4E1p9l6Ude5sq4yN8=" before_install: From 1b0cd856a7aa8659b08f2292478267b4a3373259 Mon Sep 17 00:00:00 2001 From: santi Date: Wed, 16 Aug 2017 16:40:34 +0200 Subject: [PATCH 07/16] remove tokens --- conda-forge.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 5c2e62a..da29e46 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,10 +1,3 @@ -travis: - secure: - BINSTAR_TOKEN: dxeSdY2tdQTT0q6Nvs/MqB64gY8FxD25uhNyQZ7JRm4E7i/dj9Qs4UcwIUdIiv0IVlDVv//RXj6tU9ZiD984Xeww8KDHhGzrO+0xGAkj/EEUAg1D9ihi48uPYcDY1RhNwbFqZMeq7Y9PT5v8ix6AsiSwDIkCu3SLDYUDv3cai4tZ8WypNVT8K1rwGOcb6tXga3iNKLIbBhgiMEmMU2iSpCLxPp/HcnBKsxCD5bSmJK451nZ1x2gTzde+1PLYdIAgNhUKC397F2PSNbrcHvNN+p4DJf586wSxn8rO6a4ddEt9kD8xBgrSg5qP/qV9Ov37c9XaIcnGJ4dGnfYc9a8l+Hr3XYi32aDpMtV4M67/BFkHSHRiIxL1CThTNT8brJbY9J1kQE9Grvrm3e3BtYm0NgS4ZqXieR70Jb/UqmRnh6qL0GZ/THNBJ46qQ7hh3ZAgjjX6aclEdfhSpkP8lEZ5Yowo+TCWzLnJqN1P3yG0/DGF+luktORAIG0wiPvuagAnyTNar9S9bVIWOgwnRMR4r4vDyiXq/CoHfMcdT5rJsO4rppYp0xpOWYD9FuMPMz3vclj0zEC3bl+YLjPv1OH9G7dS6veQokNa7vT2fj/wo9hAIrBCLO2VDHPeQeRtT9Uojv/A+XEIxqaXdjTJbqSOk4ap7D4E1p9l6Ude5sq4yN8= -appveyor: - secure: - BINSTAR_TOKEN: - channels: sources: - loopbio From 1bd6647b8c4da69d8416ba33297dd05e1ac01a9b Mon Sep 17 00:00:00 2001 From: santi Date: Wed, 16 Aug 2017 16:43:08 +0200 Subject: [PATCH 08/16] update meta.yaml keeps v0.3.3 until some small issues with master get solved (but keep commented modifications in case it takes long to see a new release) pin ffmpeg dep to 3.3.* --- recipe/meta.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f493786..3ba309c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,12 @@ {% set name = "av" %} + {% set version = "0.3.3" %} {% set sha256 = "bb6a6abcae38087efe6eb4f8b29dcfbbb7b161b3177babb89fa754d9053e901c" %} +# {% set version = "0.4.0dev0" %} +# {% set commit = "770ded84147217d749c6aa8f6c0747b29fcfdcd4" %} +# {% set sha256 = "545be4caa3665aaf963afdc2b52292fed292172c0ebb49fba4f2f30349137e6e" %} + package: name: {{ name|lower }} version: {{ version }} @@ -9,10 +14,11 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + # url: https://github.com/mikeboers/PyAV/archive/{{ commit }}.tar.gz sha256: {{ sha256 }} build: - number: 1 + number: 2 script: python setup.py install --single-version-externally-managed --record record.txt requirements: @@ -22,10 +28,10 @@ requirements: - cython - pkg-config # [not win] - msinttypes # [win and py27] - - ffmpeg 3.2.* + - ffmpeg 3.3.* run: - python - - ffmpeg 3.2.* + - ffmpeg 3.3.* - pillow - numpy @@ -47,7 +53,9 @@ about: dev_url: https://github.com/mikeboers/PyAV/ extra: - recipe-maintainers: + upstream-recipe-maintainers: - danielballan - caspervdw - mikeboers + recipe-maintainers: + - sdvillal From 6fee8c233f89859b0826739c50f11d7d3fc71653 Mon Sep 17 00:00:00 2001 From: santi Date: Wed, 16 Aug 2017 16:45:34 +0200 Subject: [PATCH 09/16] add build logs to ignores --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3dc1e2f..665dfbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.pyc build_artefacts +build_logs + From 9c1fd99999820e1d09a36e70d2a3894f105f395d Mon Sep 17 00:00:00 2001 From: santi Date: Wed, 16 Aug 2017 19:11:57 +0200 Subject: [PATCH 10/16] rerender --- .circleci/config.yml | 74 ++++++++++++++++++++++++++++++++++ .gitattributes | 2 + .gitignore | 1 - .travis.yml | 10 +---- appveyor.yml | 20 +-------- ci_support/run_docker_build.sh | 22 ++-------- circle.yml | 19 --------- recipe/meta.yaml | 5 ++- 8 files changed, 85 insertions(+), 68 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..129213c --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,74 @@ +version: 2 + +jobs: + build__CONDA_PY_27: + working_directory: ~/test + machine: true + environment: + - CONDA_PY: "27" + steps: + - checkout + - run: + name: Fast finish outdated PRs and merge PRs + command: | + ./ci_support/fast_finish_ci_pr_build.sh + ./ci_support/checkout_merge_commit.sh + - run: + command: docker pull condaforge/linux-anvil + - run: + name: Print conda-build environment variables + command: | + echo "CONDA_PY=${CONDA_PY}" + - run: + # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. + command: ./ci_support/run_docker_build.sh + build__CONDA_PY_35: + working_directory: ~/test + machine: true + environment: + - CONDA_PY: "35" + steps: + - checkout + - run: + name: Fast finish outdated PRs and merge PRs + command: | + ./ci_support/fast_finish_ci_pr_build.sh + ./ci_support/checkout_merge_commit.sh + - run: + command: docker pull condaforge/linux-anvil + - run: + name: Print conda-build environment variables + command: | + echo "CONDA_PY=${CONDA_PY}" + - run: + # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. + command: ./ci_support/run_docker_build.sh + build__CONDA_PY_36: + working_directory: ~/test + machine: true + environment: + - CONDA_PY: "36" + steps: + - checkout + - run: + name: Fast finish outdated PRs and merge PRs + command: | + ./ci_support/fast_finish_ci_pr_build.sh + ./ci_support/checkout_merge_commit.sh + - run: + command: docker pull condaforge/linux-anvil + - run: + name: Print conda-build environment variables + command: | + echo "CONDA_PY=${CONDA_PY}" + - run: + # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. + command: ./ci_support/run_docker_build.sh + +workflows: + version: 2 + build_and_test: + jobs: + - build__CONDA_PY_27 + - build__CONDA_PY_35 + - build__CONDA_PY_36 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/.gitignore b/.gitignore index 665dfbd..b1cddfb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ build_artefacts build_logs - diff --git a/.travis.yml b/.travis.yml index 7cdc475..13a4c26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,15 +6,7 @@ language: generic os: osx osx_image: xcode6.4 -env: - matrix: - - - CONDA_PY=27 - - CONDA_PY=35 - - CONDA_PY=36 - global: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - - secure: "dxeSdY2tdQTT0q6Nvs/MqB64gY8FxD25uhNyQZ7JRm4E7i/dj9Qs4UcwIUdIiv0IVlDVv//RXj6tU9ZiD984Xeww8KDHhGzrO+0xGAkj/EEUAg1D9ihi48uPYcDY1RhNwbFqZMeq7Y9PT5v8ix6AsiSwDIkCu3SLDYUDv3cai4tZ8WypNVT8K1rwGOcb6tXga3iNKLIbBhgiMEmMU2iSpCLxPp/HcnBKsxCD5bSmJK451nZ1x2gTzde+1PLYdIAgNhUKC397F2PSNbrcHvNN+p4DJf586wSxn8rO6a4ddEt9kD8xBgrSg5qP/qV9Ov37c9XaIcnGJ4dGnfYc9a8l+Hr3XYi32aDpMtV4M67/BFkHSHRiIxL1CThTNT8brJbY9J1kQE9Grvrm3e3BtYm0NgS4ZqXieR70Jb/UqmRnh6qL0GZ/THNBJ46qQ7hh3ZAgjjX6aclEdfhSpkP8lEZ5Yowo+TCWzLnJqN1P3yG0/DGF+luktORAIG0wiPvuagAnyTNar9S9bVIWOgwnRMR4r4vDyiXq/CoHfMcdT5rJsO4rppYp0xpOWYD9FuMPMz3vclj0zEC3bl+YLjPv1OH9G7dS6veQokNa7vT2fj/wo9hAIrBCLO2VDHPeQeRtT9Uojv/A+XEIxqaXdjTJbqSOk4ap7D4E1p9l6Ude5sq4yN8=" + before_install: diff --git a/appveyor.yml b/appveyor.yml index 0663b0d..222acef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,7 @@ environment: - BINSTAR_TOKEN: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: None + matrix: - TARGET_ARCH: x86 @@ -17,22 +15,6 @@ environment: CONDA_PY: 27 CONDA_INSTALL_LOCN: C:\\Miniconda-x64 - - TARGET_ARCH: x86 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35 - - - TARGET_ARCH: x64 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - - - TARGET_ARCH: x86 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda36 - - - TARGET_ARCH: x64 - CONDA_PY: 36 - CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 - # We always use a 64-bit machine, but can build x86 distributions # with the TARGET_ARCH variable. diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh index d8ab9c1..4d716e5 100755 --- a/ci_support/run_docker_build.sh +++ b/ci_support/run_docker_build.sh @@ -41,6 +41,7 @@ cat << EOF | docker run -i \ -v "${RECIPE_ROOT}":/recipe_root \ -v "${FEEDSTOCK_ROOT}":/feedstock_root \ -e HOST_USER_ID="${HOST_USER_ID}" \ + -e CONDA_PY="${CONDA_PY}" \ -a stdin -a stdout -a stderr \ condaforge/linux-anvil \ bash || exit 1 @@ -58,24 +59,9 @@ conda clean --lock conda install --yes --quiet conda-forge-build-setup source run_conda_forge_build_setup -# Embarking on 3 case(s). - set -x - export CONDA_PY=27 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root loopbio --channel=main || exit 1 - - set -x - export CONDA_PY=35 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root loopbio --channel=main || exit 1 - - set -x - export CONDA_PY=36 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root loopbio --channel=main || exit 1 +conda build /recipe_root --quiet || exit 1 +upload_or_check_non_existence /recipe_root loopbio --channel=main || exit 1 + touch /feedstock_root/build_artefacts/conda-forge-build-done EOF 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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3ba309c..3d55153 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,12 +28,13 @@ requirements: - cython - pkg-config # [not win] - msinttypes # [win and py27] - - ffmpeg 3.3.* + - ffmpeg 3.3.3 run: - python - - ffmpeg 3.3.* + - ffmpeg - pillow - numpy + - ffmpeg 3.3.3 test: imports: From b5f514e55a242cbfd962ac4d318b126abd084831 Mon Sep 17 00:00:00 2001 From: santi Date: Sun, 3 Sep 2017 09:53:07 +0200 Subject: [PATCH 11/16] build number 3 to force upgrade everywhere --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3d55153..0ed4bae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,5 @@ {% set name = "av" %} +{% set build_number = "3" %} {% set version = "0.3.3" %} {% set sha256 = "bb6a6abcae38087efe6eb4f8b29dcfbbb7b161b3177babb89fa754d9053e901c" %} @@ -18,7 +19,7 @@ source: sha256: {{ sha256 }} build: - number: 2 + number: {{ build_number }} script: python setup.py install --single-version-externally-managed --record record.txt requirements: From a020f8a182bbf5857511c6a765884aa9d874dee1 Mon Sep 17 00:00:00 2001 From: santi Date: Sun, 3 Sep 2017 09:53:32 +0200 Subject: [PATCH 12/16] rerender --- .circleci/config.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 129213c..c8ec97f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,8 @@ jobs: ./ci_support/fast_finish_ci_pr_build.sh ./ci_support/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + name: Pull the docker image + command: bash pull condaforge/linux-anvil - run: name: Print conda-build environment variables command: | @@ -35,7 +36,8 @@ jobs: ./ci_support/fast_finish_ci_pr_build.sh ./ci_support/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + name: Pull the docker image + command: bash pull condaforge/linux-anvil - run: name: Print conda-build environment variables command: | @@ -56,7 +58,8 @@ jobs: ./ci_support/fast_finish_ci_pr_build.sh ./ci_support/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + name: Pull the docker image + command: bash pull condaforge/linux-anvil - run: name: Print conda-build environment variables command: | From beb0240576fc3332c65ea8c1b32fd59caef98dbc Mon Sep 17 00:00:00 2001 From: santi Date: Sat, 9 Dec 2017 12:39:47 +0100 Subject: [PATCH 13/16] update ffmpeg pin to 3.4 --- recipe/meta.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0ed4bae..6314242 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "av" %} -{% set build_number = "3" %} +{% set build_number = "4" %} {% set version = "0.3.3" %} {% set sha256 = "bb6a6abcae38087efe6eb4f8b29dcfbbb7b161b3177babb89fa754d9053e901c" %} @@ -29,13 +29,12 @@ requirements: - cython - pkg-config # [not win] - msinttypes # [win and py27] - - ffmpeg 3.3.3 + - ffmpeg 3.4 run: - python - - ffmpeg - pillow - numpy - - ffmpeg 3.3.3 + - ffmpeg 3.4 test: imports: @@ -55,9 +54,9 @@ about: dev_url: https://github.com/mikeboers/PyAV/ extra: - upstream-recipe-maintainers: + recipe-maintainers: + - sdvillal + conda-forge-recipe-maintainers: - danielballan - caspervdw - mikeboers - recipe-maintainers: - - sdvillal From 20ff81bf9ba363b6c77c301b587de7cc4a453ef9 Mon Sep 17 00:00:00 2001 From: santi Date: Sat, 9 Dec 2017 12:40:35 +0100 Subject: [PATCH 14/16] MNT: Re-rendered with conda-smithy 2.4.4 --- .circleci/config.yml | 9 +++------ .gitignore | 1 - .travis.yml | 7 ++++++- README.md | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c8ec97f..129213c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,8 +14,7 @@ jobs: ./ci_support/fast_finish_ci_pr_build.sh ./ci_support/checkout_merge_commit.sh - run: - name: Pull the docker image - command: bash pull condaforge/linux-anvil + command: docker pull condaforge/linux-anvil - run: name: Print conda-build environment variables command: | @@ -36,8 +35,7 @@ jobs: ./ci_support/fast_finish_ci_pr_build.sh ./ci_support/checkout_merge_commit.sh - run: - name: Pull the docker image - command: bash pull condaforge/linux-anvil + command: docker pull condaforge/linux-anvil - run: name: Print conda-build environment variables command: | @@ -58,8 +56,7 @@ jobs: ./ci_support/fast_finish_ci_pr_build.sh ./ci_support/checkout_merge_commit.sh - run: - name: Pull the docker image - command: bash pull condaforge/linux-anvil + command: docker pull condaforge/linux-anvil - run: name: Print conda-build environment variables command: | diff --git a/.gitignore b/.gitignore index b1cddfb..3dc1e2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ *.pyc build_artefacts -build_logs diff --git a/.travis.yml b/.travis.yml index 13a4c26..bf7c69d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,12 @@ language: generic os: osx osx_image: xcode6.4 - +env: + matrix: + + - CONDA_PY=27 + - CONDA_PY=35 + - CONDA_PY=36 before_install: diff --git a/README.md b/README.md index f59f261..097d351 100644 --- a/README.md +++ b/README.md @@ -70,4 +70,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 From c3f505c6b29b65928b34432bc8cc641ce8c176e2 Mon Sep 17 00:00:00 2001 From: santi Date: Thu, 16 Aug 2018 18:23:58 +0200 Subject: [PATCH 15/16] bump, adapt recipe to new syntax --- local-build.sh | 4 ++++ recipe/meta.yaml | 37 +++++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100755 local-build.sh diff --git a/local-build.sh b/local-build.sh new file mode 100755 index 0000000..e934965 --- /dev/null +++ b/local-build.sh @@ -0,0 +1,4 @@ +#!/bin/bash +CONFIG="linux_python2.7" .circleci/run_docker_build.sh +CONFIG="linux_python3.5" .circleci/run_docker_build.sh +CONFIG="linux_python3.6" .circleci/run_docker_build.sh diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6314242..42a2cc5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,12 +1,12 @@ {% set name = "av" %} -{% set build_number = "4" %} +{% set build_number = "0" %} -{% set version = "0.3.3" %} -{% set sha256 = "bb6a6abcae38087efe6eb4f8b29dcfbbb7b161b3177babb89fa754d9053e901c" %} +#{% set version = "0.4.0" %} +#{% set sha256 = "" %} -# {% set version = "0.4.0dev0" %} -# {% set commit = "770ded84147217d749c6aa8f6c0747b29fcfdcd4" %} -# {% set sha256 = "545be4caa3665aaf963afdc2b52292fed292172c0ebb49fba4f2f30349137e6e" %} +{% set version = "0.4.1dev0" %} +{% set commit = "78152dc06ce02e2b1fb7354ade115b4a62cc2577" %} +{% set sha256 = "8e346a625cf29432f6e64c0c99ca523909f6594b9baca4013e0938ea53873353" %} package: name: {{ name|lower }} @@ -14,27 +14,32 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - # url: https://github.com/mikeboers/PyAV/archive/{{ commit }}.tar.gz + # url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + url: https://github.com/mikeboers/PyAV/archive/{{ commit }}.tar.gz sha256: {{ sha256 }} build: number: {{ build_number }} - script: python setup.py install --single-version-externally-managed --record record.txt + skip: True # [not linux] + script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv" requirements: build: - - python - - setuptools - - cython + - {{ compiler('c') }} - pkg-config # [not win] - msinttypes # [win and py27] - - ffmpeg 3.4 - run: + host: - python - - pillow + - pip + - cython - numpy - - ffmpeg 3.4 + - ffmpeg + - pillow 5 + run: + - python + - {{ pin_compatible('numpy') }} + - ffmpeg + - pillow 5 test: imports: From 8c080103c3c97fec4f968a912db6912dd5daf87c Mon Sep 17 00:00:00 2001 From: santi Date: Thu, 16 Aug 2018 18:24:40 +0200 Subject: [PATCH 16/16] MNT: Re-rendered with conda-smithy 3.1.11 and pinning 2018.08.14 --- .ci_support/README | 1 + .ci_support/linux_python2.7.yaml | 14 ++++ .ci_support/linux_python3.5.yaml | 14 ++++ .ci_support/linux_python3.6.yaml | 14 ++++ .circleci/build_steps.sh | 34 +++++++++ .../checkout_merge_commit.sh | 0 .circleci/config.yml | 48 +++++-------- .../fast_finish_ci_pr_build.sh | 2 +- .circleci/run_docker_build.sh | 47 ++++++++++++ .github/CONTRIBUTING.md | 15 ++++ .github/ISSUE_TEMPLATE.md | 25 +++++++ .github/PULL_REQUEST_TEMPLATE.md | 18 +++++ .gitignore | 2 +- .travis.yml | 59 --------------- LICENSE => LICENSE.txt | 2 +- README.md | 18 ++--- appveyor.yml | 57 --------------- ci_support/run_docker_build.sh | 72 ------------------- 18 files changed, 213 insertions(+), 229 deletions(-) create mode 100644 .ci_support/README create mode 100644 .ci_support/linux_python2.7.yaml create mode 100644 .ci_support/linux_python3.5.yaml create mode 100644 .ci_support/linux_python3.6.yaml create mode 100755 .circleci/build_steps.sh rename {ci_support => .circleci}/checkout_merge_commit.sh (100%) rename {ci_support => .circleci}/fast_finish_ci_pr_build.sh (54%) create mode 100755 .circleci/run_docker_build.sh create mode 100644 .github/CONTRIBUTING.md create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 .travis.yml rename LICENSE => LICENSE.txt (97%) delete mode 100644 appveyor.yml delete mode 100755 ci_support/run_docker_build.sh 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_python2.7.yaml b/.ci_support/linux_python2.7.yaml new file mode 100644 index 0000000..2a99de2 --- /dev/null +++ b/.ci_support/linux_python2.7.yaml @@ -0,0 +1,14 @@ +c_compiler: +- toolchain_c +ffmpeg: +- '4.0' +numpy: +- '1.9' +pin_run_as_build: + ffmpeg: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' diff --git a/.ci_support/linux_python3.5.yaml b/.ci_support/linux_python3.5.yaml new file mode 100644 index 0000000..4114e47 --- /dev/null +++ b/.ci_support/linux_python3.5.yaml @@ -0,0 +1,14 @@ +c_compiler: +- toolchain_c +ffmpeg: +- '4.0' +numpy: +- '1.9' +pin_run_as_build: + ffmpeg: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '3.5' diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml new file mode 100644 index 0000000..68c8035 --- /dev/null +++ b/.ci_support/linux_python3.6.yaml @@ -0,0 +1,14 @@ +c_compiler: +- toolchain_c +ffmpeg: +- '4.0' +numpy: +- '1.9' +pin_run_as_build: + ffmpeg: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh new file mode 100755 index 0000000..ac29892 --- /dev/null +++ b/.circleci/build_steps.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +set -xeuo pipefail +export PYTHONUNBUFFERED=1 + +cat >~/.condarc < /dev/null && docker-machine active > /dev/null; then + export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + +ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" + +if [ -z "$CONFIG" ]; then + echo "Need to set CONFIG env variable" + exit 1 +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 \ + -e CONFIG \ + -e BINSTAR_TOKEN \ + -e HOST_USER_ID \ + condaforge/linux-anvil \ + bash \ + /home/conda/feedstock_root/.circleci/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/.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..047fdaf --- /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` (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/.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 deleted file mode 100644 index bf7c69d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,59 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - -os: osx -osx_image: xcode6.4 - -env: - matrix: - - - CONDA_PY=27 - - CONDA_PY=35 - - CONDA_PY=36 - - -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 | \ - python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 - - # Remove homebrew. - - | - echo "" - echo "Removing homebrew from Travis CI to avoid conflicts." - curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew - chmod +x ~/uninstall_homebrew - ~/uninstall_homebrew -fq - rm ~/uninstall_homebrew - - -install: - # Install Miniconda. - - | - echo "" - echo "Installing a fresh version of Miniconda." - MINICONDA_URL="https://repo.continuum.io/miniconda" - MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" - curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}" - bash $MINICONDA_FILE -b - - # Configure conda. - - | - echo "" - echo "Configuring conda." - source /Users/travis/miniconda3/bin/activate root - conda config --remove channels defaults - conda config --add channels defaults - conda config --add channels conda-forge - conda config --add channels loopbio - conda config --set show_channel_urls true - conda install --yes --quiet conda-forge-build-setup - source run_conda_forge_build_setup - -script: - - conda build ./recipe - - - upload_or_check_non_existence ./recipe loopbio --channel=main 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 097d351..462feb6 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,16 @@ details as much as possible. Current build status ==================== -Linux: [![Circle CI](https://circleci.com/gh/loopbio/av-feedstock.svg?style=shield)](https://circleci.com/gh/loopbio/av-feedstock) -OSX: [![TravisCI](https://travis-ci.org/loopbio/av-feedstock.svg?branch=master)](https://travis-ci.org/loopbio/av-feedstock) -Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/loopbio/av-feedstock?svg=True)](https://ci.appveyor.com/project/loopbio/av-feedstock/branch/master) +[![Linux](https://img.shields.io/circleci/project/github/loopbio/av-feedstock/master.svg?label=Linux)](https://circleci.com/gh/loopbio/av-feedstock) +![OSX disabled](https://img.shields.io/badge/OSX-disabled-lightgrey.svg) +![Windows disabled](https://img.shields.io/badge/Windows-disabled-lightgrey.svg) Current release info ==================== -Version: [![Anaconda-Server Badge](https://anaconda.org/loopbio/av/badges/version.svg)](https://anaconda.org/loopbio/av) -Downloads: [![Anaconda-Server Badge](https://anaconda.org/loopbio/av/badges/downloads.svg)](https://anaconda.org/loopbio/av) + +| Name | Downloads | Version | Platforms | +| --- | --- | --- | --- | +| [![Conda Recipe](https://img.shields.io/badge/recipe-av-green.svg)](https://anaconda.org/loopbio/av) | [![Conda Downloads](https://img.shields.io/conda/dn/loopbio/av.svg)](https://anaconda.org/loopbio/av) | [![Conda Version](https://img.shields.io/conda/vn/loopbio/av.svg)](https://anaconda.org/loopbio/av) | [![Conda Platforms](https://img.shields.io/conda/pn/loopbio/av.svg)](https://anaconda.org/loopbio/av) | Installing av ============= @@ -67,7 +69,7 @@ build distinct package versions. In order to produce a uniquely identifiable distribution: * If the version of a package **is not** being increased, please add or increase - the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string). + the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.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. \ No newline at end of file + the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) + back to 0. diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 222acef..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,57 +0,0 @@ -# This file was automatically generated by conda-smithy. To update a component of this -# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run -# "conda smithy rerender". - -environment: - - - - matrix: - - TARGET_ARCH: x86 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda - - - TARGET_ARCH: x64 - CONDA_PY: 27 - CONDA_INSTALL_LOCN: C:\\Miniconda-x64 - - -# We always use a 64-bit machine, but can build x86 distributions -# with the TARGET_ARCH variable. -platform: - - x64 - -install: - # If there is a newer build queued for the same PR, cancel this one. - - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" - ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" - del ff_ci_pr_build.py - - # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - - cmd: rmdir C:\cygwin /s /q - - # Add path, activate `conda` and update conda. - - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - - cmd: conda update --yes --quiet conda - - - cmd: set PYTHONUNBUFFERED=1 - - # Add our channels. - - cmd: conda config --set show_channel_urls true - - cmd: conda config --remove channels defaults - - cmd: conda config --add channels defaults - - cmd: conda config --add channels conda-forge - - cmd: conda config --add channels loopbio - - # Configure the VM. - - cmd: conda install -n root --quiet --yes conda-forge-build-setup - - cmd: run_conda_forge_build_setup - -# Skip .NET project specific build phase. -build: off - -test_script: - - conda build recipe --quiet -deploy_script: - - cmd: upload_or_check_non_existence .\recipe loopbio --channel=main diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh deleted file mode 100755 index 4d716e5..0000000 --- a/ci_support/run_docker_build.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe - -docker info - -config=$(cat < /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" - -cat << EOF | docker run -i \ - -v "${RECIPE_ROOT}":/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/feedstock_root \ - -e HOST_USER_ID="${HOST_USER_ID}" \ - -e CONDA_PY="${CONDA_PY}" \ - -a stdin -a stdout -a stderr \ - condaforge/linux-anvil \ - bash || exit 1 - -set -e -set +x -export BINSTAR_TOKEN=${BINSTAR_TOKEN} -set -x -export PYTHONUNBUFFERED=1 - -echo "$config" > ~/.condarc -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts. -conda clean --lock - -conda install --yes --quiet conda-forge-build-setup -source run_conda_forge_build_setup - -conda build /recipe_root --quiet || exit 1 -upload_or_check_non_existence /recipe_root loopbio --channel=main || exit 1 - -touch /feedstock_root/build_artefacts/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