Commit 6aaa3bb2 authored by Samuel Debionne's avatar Samuel Debionne

Update to SIP 4.19 and build for python 2 on Linux

parent d0ee7d69
Pipeline #5729 passed with stages
in 7 minutes and 26 seconds
stages: stages:
- build - build
- build-noarch
- deploy - deploy
.build-conda: &build-conda .build-conda: &build-conda
...@@ -19,8 +20,11 @@ build-linux: ...@@ -19,8 +20,11 @@ build-linux:
build-noarch: build-noarch:
<<: *build-conda <<: *build-conda
stage: build-noarch
script: script:
- conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable - conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
dependencies:
- build-linux
deploy-devel: deploy-devel:
stage: deploy stage: deploy
......
...@@ -5,6 +5,7 @@ c_compiler: ...@@ -5,6 +5,7 @@ c_compiler:
cxx_compiler: cxx_compiler:
- vs2017 # [win] - vs2017 # [win]
python: python:
- 2.7 # [linux]
- 3.6 - 3.6
# This differs from target_platform in that it determines what subdir the compiler # This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself. # will target, not what subdir the compiler package will be itself.
......
...@@ -11,20 +11,20 @@ build: ...@@ -11,20 +11,20 @@ build:
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }} number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
requirements: requirements:
build:
- git
- cmake
- {{ compiler('cxx') }}
- lima-core
host: host:
- python {{ python }} - python {{ python }}
- numpy - numpy
- sip 4.18* #For the SIP generator - sip 4.19.8 # For compatibility with pyqt 5.9.2
- lima-core
- lima-common-espia - lima-common-espia
build:
- git
- cmake
- {{ compiler('cxx') }}
run: run:
- python {{ python }} - python {{ python }}
- sip 4.18* #For the SIP module - sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- lima-core - {{ pin_compatible('lima-core', max_pin='x.x') }}
- lima-common-espia - lima-common-espia
test: test:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment