Skip to content

Commit ec01666

Browse files
committed
make branch-specific build names
1 parent b0114f4 commit ec01666

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ install:
8282
# add conda-forge channel for build
8383
- conda config --add channels chilipp/label/$TRAVIS_BRANCH
8484
- conda config --add channels conda-forge
85+
- if [[ $TRAVIS_TAG == "" ]]; then export GIT_BRANCH=$TRAVIS_BRANCH; fi
8586

8687
before_script:
8788
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ install:
4949
# print versions of all the important requirements
5050
- psyplot -aV
5151
- endlocal
52+
- "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (SET GIT_BRANCH=%APPVEYOR_REPO_BRANCH%)"
5253

5354
build: false
5455

ci/conda-recipe/meta.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
1+
{% set data = load_setup_py_data() %}
12
{% set name = "psyplot-gui" %}
2-
{% set version = "1.2.3" %}
33

44
package:
55
name: {{ name|lower }}
6-
version: {{ version }}
6+
version: {{ data.get('version') }}
77

88
source:
99
path: ../..
1010

1111
build:
12-
number: 0
12+
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
13+
string: {{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '') }}{% endif %}
14+
script: python -m pip install . --no-deps --ignore-installed -vvv
15+
skip: true # [py == 27]
1316

1417
requirements:
1518
build:
1619
- python
1720
- pip
1821
run:
19-
- python
20-
- psyplot
22+
- python >=3.6
23+
- psyplot >=1.2.0
24+
- pyqt >=5
2125
- qtconsole
2226
- fasteners
2327
- sphinx
@@ -29,6 +33,7 @@ test:
2933
imports:
3034
- psyplot_gui
3135
- psyplot_gui.compat
36+
- psyplot_gui.compat.qtcompat
3237
- psyplot_gui.config
3338
- psyplot_gui.sphinx_supp
3439

0 commit comments

Comments
 (0)