Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: glass-bead-labs/conda-recipes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: davclark
Choose a base ref
...
head repository: conda-archive/conda-recipes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing 4,574 changed files with 229,614 additions and 11,199 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
67 changes: 67 additions & 0 deletions .binstar.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@

# Notes:
# This .binstar.yml file controls CI testing of this repo
# Adaptations for other uses may change the package name
# or user.

after_failure:
- echo "After failure message!"
after_script:
- echo "ProtoCI build was a:$BINSTAR_BUILD_RESULT"
after_success:
- echo "ProtoCI BUILD SUCCESS"
before_script:
- echo "Prepare to clone conda and conda-build for metadata reading..."
- mkdir conda_tmp
# avoid conflict with conda or conda-build dirs if already there
- git clone https://github.com/conda/conda-build conda_tmp/conda-build
- git clone https://github.com/conda/conda conda_tmp/conda
- pip install ruamel.yaml
- conda install -c psteinberg protoci
- conda config --add channels r
engine:
- python=2.7
- python=3.4
- python=3.5
script:
- export PYTHONPATH=$PYTHONPATH:./conda_tmp/conda-build:./conda_tmp/conda
- echo "PYTHONPATH below should include ./conda_tmp"
- echo $PYTHONPATH
- protoci-difference-build .
install_channels:
- defaults
- python
- r
package: conda-recipes
platform:
- linux-64
- linux-32
- osx-64
- win-64
- win-32
# anaconda.org username or org name:
user: conda-team
# suppress print of messages ending in \r (interactive ones)
iotimeout: 200
---
platform: win-32
script:
- set PYTHONPATH=%PYTHONPATH%:.\conda_tmp\conda-build:.\conda_tmp\conda
- echo "PYTHONPATH below should include ./conda_tmp"
- echo %PYTHONPATH%
- protoci-difference-build .
engine:
- python=2.7
- python=3.4
- python=3.5
---
platform: win-64
script:
- set PYTHONPATH=%PYTHONPATH%:.\conda_tmp\conda-build:.\conda_tmp\conda
- echo "PYTHONPATH below should include ./conda_tmp"
- echo %PYTHONPATH%
- protoci-difference-build .
engine:
- python=2.7
- python=3.4
- python=3.5
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
*~
*.swp
.binstar.yaml
.binstar.yml
Loading