diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index 7f1c9e3..9ffb709 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -13,12 +13,8 @@ jobs:
linux_:
CONFIG: linux_
UPLOAD_PACKAGES: True
+ DOCKER_IMAGE: condaforge/linux-anvil-comp7
steps:
- - script: |
- sudo pip install --upgrade pip
- sudo pip install setuptools shyaml
- displayName: Install dependencies
-
# configure qemu binfmt-misc running. This allows us to run docker containers
# embedded qemu-static
- script: |
@@ -27,7 +23,10 @@ jobs:
condition: not(startsWith(variables['CONFIG'], 'linux_64'))
displayName: Configure binfmt_misc
- - script: .azure-pipelines/run_docker_build.sh
+ - 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/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
index 15034d9..ca72508 100755
--- a/.azure-pipelines/azure-pipelines-osx.yml
+++ b/.azure-pipelines/azure-pipelines-osx.yml
@@ -35,7 +35,7 @@ jobs:
- script: |
source activate base
- conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build shyaml
+ conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
displayName: 'Add conda-forge-ci-setup=2'
- script: |
@@ -43,7 +43,7 @@ jobs:
echo "Configuring conda."
setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml
-
+ export CI=azure
source run_conda_forge_build_setup
conda update --yes --quiet --override-channels -c conda-forge -c defaults --all
env: {
@@ -68,8 +68,9 @@ jobs:
- script: |
source activate base
+ export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME
upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml
- displayName: Upload recipe
+ displayName: Upload package
env:
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
condition: not(eq(variables['UPLOAD_PACKAGES'], 'False'))
\ No newline at end of file
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
index 8f8aca7..055b40d 100755
--- a/.azure-pipelines/azure-pipelines-win.yml
+++ b/.azure-pipelines/azure-pipelines-win.yml
@@ -68,8 +68,8 @@ jobs:
# Configure the VM.
- script: |
+ set "CI=azure"
run_conda_forge_build_setup
-
displayName: conda-forge build setup
@@ -95,7 +95,9 @@ jobs:
condition: not(contains(variables['CONFIG'], 'vs2008'))
- script: |
+ set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%"
upload_package .\ .\recipe .ci_support\%CONFIG%.yaml
+ displayName: Upload package
env:
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
condition: not(eq(variables['UPLOAD_PACKAGES'], 'False'))
diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml
index 6f470ef..b5cdce1 100644
--- a/.ci_support/osx_.yaml
+++ b/.ci_support/osx_.yaml
@@ -5,7 +5,7 @@ boost_cpp:
c_compiler:
- clang
c_compiler_version:
-- '4'
+- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
@@ -13,7 +13,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '4'
+- '9'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
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..d0e81a3
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @tadeu
\ 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 ba618a2..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/maintainer/updating_pkgs.html#rerendering-feedstocks ) 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/.azure-pipelines/build_steps.sh b/.scripts/build_steps.sh
similarity index 75%
rename from .azure-pipelines/build_steps.sh
rename to .scripts/build_steps.sh
index 779d52b..8a4af44 100755
--- a/.azure-pipelines/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -7,15 +7,15 @@
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 <
-![ppc64le disabled](https://img.shields.io/badge/ppc64le-disabled-lightgrey.svg)
+
+ Linux_ppc64le |
+
+
+ |
+
Current release info
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()