Skip to content

Commit e5786c9

Browse files
committed
add build without conda-forge
1 parent 0d6120f commit e5786c9

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

.travis.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: generic
22
env:
33
global:
44
- COMMIT_AUTHOR_EMAIL="psyplot@hzg.de"
5+
- BUILD_STR_END=cf
56
# github token
67
- secure: "avtfM/IM75N6kADzVximO5F4vxpIt2YKw0v/ESyQme7b0h2SMOR5Ql6HvXXWqFRQj1Kr7pGrvnPRlCBvQViTOFTsRHSyGsTrBAvdThYiJiWe2VFC7HWvtkmyn7GWO0XNMVS06B/FZgJyj811txvP2wOTeMxe0i9KCI9ao4w07sc5ZXrG+KX8oyOvxqEeGrNStvoH/HAHnLWBjccQ7skwYIavP2WmtzdY1JrKLnSOJEcBuW1LTcGY4f5FPjxAh+jhOYrFVJNajwX37l3BfPvdVEkDdh+MP41z1MNHyhiwVsBGiPoyonnlsoC9zCwTXYlqrTgQc4Ud67kvFYBulLTbU69Uv2+Q8AOMlV+JOrs1aPtAgHpqXkkT208uTCUUTN8vWlRenLvvE06txgzu0v+hb4PjBQcRGZ5XEPOOzArtvDR8deJwqbXya0bwBbny40v706gBQ8VFBF0znKZBN69f/QsRgf7AARMizajHhWoFwiYTf6/vB7iZhXwQaPxl9eePoFdTd/oQ07oouqn/evdNj1312SgE52+RpqiouoGv8IGKQcuOOt/v2jEyeUZM6vpCcfOD32E3VaoqKfqlfyF8VtSTxF5RG+ZpqvRYYAiIpk66ZTwhJwnra+hHH0D7OXD4h4qaM941O58tMVtyFlG0LmgWnm8lG8Sd9HYi3G+zYZ8="
78
# anaconda token
@@ -19,6 +20,11 @@ matrix:
1920
- MPL_VERSION=3.1
2021
- DEPLOY_CONDA=true
2122
os: linux
23+
- env:
24+
- PYTHON_VERSION=3.7
25+
- BUILD_STR_END=
26+
- DEPLOY_CONDA=true
27+
os: linux
2228
- env:
2329
- PYTHON_VERSION=3.7
2430
- MPL_VERSION=3.0
@@ -29,6 +35,11 @@ matrix:
2935
- MPL_VERSION=3.1
3036
- DEPLOY_CONDA=true
3137
os: osx
38+
- env:
39+
- PYTHON_VERSION=3.7
40+
- BUILD_STR_END=
41+
- DEPLOY_CONDA=true
42+
os: osx
3243
- env:
3344
- PYTHON_VERSION=3.7
3445
- MPL_VERSION=3.1
@@ -98,7 +109,11 @@ install:
98109
echo ""
99110
echo "Configuring conda."
100111
conda config --set always_yes yes --set changeps1 no
101-
conda config --add channels conda-forge
112+
if [[ ${BUILD_STR_END} == "cf" ]]; then
113+
conda config --add channels conda-forge
114+
else
115+
conda config --add channels chilipp
116+
fi
102117
conda config --add channels psyplot
103118
conda update -q conda
104119
conda install conda-build anaconda-client conda-verify

appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ environment:
77
matrix:
88
- PYTHON_VERSION: "3.8"
99
MPL_VERSION: "3.1"
10+
BUILD_STR_END: cf
11+
- PYTHON_VERSION: "3.7"
1012
- PYTHON_VERSION: "3.7"
1113
MPL_VERSION: "3.1"
14+
BUILD_STR_END: cf
1215
- PYTHON_VERSION: "3.7"
1316
MPL_VERSION: "3.0"
17+
BUILD_STR_END: cf
1418
install:
1519
# windows config (for installation)
1620
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
1721
- setlocal
1822
- set CONDA_REPO_TOKEN=
1923
# conda config
2024
- conda config --set always_yes yes --set changeps1 no
21-
- conda config --add channels conda-forge
25+
- IF NOT DEFINED BUILD_STR_END (conda config --add channels chilipp) ELSE (conda config --add channels conda-forge)
2226
- conda config --add channels psyplot
2327
- conda update -q conda
2428
- conda install conda-build anaconda-client

ci/conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ source:
1010

1111
build:
1212
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
13-
string: py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '') }}{% endif %}
13+
string: py{{ environ.get('CONDA_PY') }}_{{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '') }}{% endif %}{% if environ.get("BUILD_STR_END") %}_{{ environ.get("BUILD_STR_END") }}{% endif %}
1414
script: python -m pip install . --no-deps --ignore-installed -vvv
1515

1616
requirements:

0 commit comments

Comments
 (0)