Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-pco
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-pco
Commits
b6c2e2f0
Commit
b6c2e2f0
authored
Oct 01, 2018
by
Samuel Debionne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to SIP 4.19 and build for python 2 on Linux
parent
a297bf65
Pipeline
#5722
passed with stages
in 11 minutes and 16 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
.gitlab-ci.yml
.gitlab-ci.yml
+6
-2
conda/camera/conda_build_config.yaml
conda/camera/conda_build_config.yaml
+1
-0
conda/camera/meta.yaml
conda/camera/meta.yaml
+6
-6
No files found.
.gitlab-ci.yml
View file @
b6c2e2f0
stages
:
-
build
-
build-noarch
-
deploy
.build-conda
:
&build-conda
...
...
@@ -19,12 +20,15 @@ build-win:
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-win
tags
:
-
win
deploy
_
devel
:
deploy
-
devel
:
stage
:
deploy
environment
:
name
:
devel/$CI_COMMIT_REF_NAME
...
...
@@ -44,7 +48,7 @@ deploy_devel:
-
stable
when
:
manual
deploy
_
stable
:
deploy
-
stable
:
stage
:
deploy
environment
:
name
:
production
...
...
conda/camera/conda_build_config.yaml
View file @
b6c2e2f0
...
...
@@ -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.
...
...
conda/camera/meta.yaml
View file @
b6c2e2f0
...
...
@@ -11,19 +11,19 @@ build:
number
:
{{
environ.get('GIT_DESCRIBE_NUMBER'
,
0)
}}
requirements
:
build
:
-
git
-
cmake
-
{{
compiler('cxx')
}}
host
:
-
python {{ python }}
-
numpy
-
sip 4.1
8*
#For the SIP generator
-
sip 4.1
9.8
# For compatibility with pyqt 5.9.2
-
lima-core
-
pco-sdk
build
:
-
git
-
cmake
-
{{
compiler('cxx')
}}
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')
}}
-
pco-sdk
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment