Commit afa852fa authored by Laurent Claustre's avatar Laurent Claustre
Browse files

Merge branch '65-port-to-sip-4-19' into 'master'

Update to SIP 4.19 and build for python 2 on Linux

See merge request !6
parents afb5d19e dbf65be5
Pipeline #5737 passed with stages
in 6 minutes and 34 seconds
stages:
- build
- build-noarch
- deploy
.build-conda: &build-conda
......@@ -19,8 +20,11 @@ build-linux:
build-noarch:
<<: *build-conda
stage: build-noarch
script:
- conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
dependencies:
- build-linux
deploy-devel:
stage: deploy
......
......@@ -5,6 +5,7 @@ c_compiler:
cxx_compiler:
- vs2017 # [win]
python:
- 2.7 # [linux]
- 3.6
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
......
......@@ -11,21 +11,21 @@ build:
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
requirements:
host:
- python {{ python }}
- numpy
- sip 4.19.8 # For compatibility with pyqt 5.9.2
- lima-core
- cbflib
build:
- git
- cmake
- {{ compiler('cxx') }}
- cbflib
- lima-core
host:
- python {{ python }}
- numpy
- sip 4.18* #For the SIP generator
run:
- python {{ python }}
- sip 4.18* #For the SIP module
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- {{ pin_compatible('lima-core', max_pin='x.x') }}
- cbflib
- lima-core
test:
requires:
......
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