Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tomotools
tomoscan
Commits
d0965139
Commit
d0965139
authored
Nov 05, 2020
by
payno
Browse files
install silx from master
parent
8a78d324
Pipeline
#36655
passed with stages
in 11 minutes and 13 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
d0965139
...
@@ -19,7 +19,6 @@ check_style:
...
@@ -19,7 +19,6 @@ check_style:
before_script
:
before_script
:
-
pip install black
-
pip install black
script
:
script
:
-
pip install -r requirements.txt
# run black
# run black
-
LC_ALL=C.UTF-8 black --check --safe .
-
LC_ALL=C.UTF-8 black --check --safe .
...
@@ -34,12 +33,14 @@ doc:
...
@@ -34,12 +33,14 @@ doc:
-
arch
-
arch
-
which python
-
which python
-
python --version
-
python --version
-
source ./ci/install_scripts.sh
-
python -m pip install pip --upgrade
-
python -m pip install pip --upgrade
-
python -m pip install setuptools --upgrade
-
python -m pip install setuptools --upgrade
-
python -m pip install sphinx
-
python -m pip install sphinx
-
python -m pip install nbsphinx
-
python -m pip install nbsphinx
-
python -m pip install nbconvert
-
python -m pip install nbconvert
-
python -m pip install pandoc
-
python -m pip install pandoc
-
install_silx
-
python -m pip install -r requirements.txt
-
python -m pip install -r requirements.txt
-
rm -rf artifacts
-
rm -rf artifacts
-
mkdir artifacts
-
mkdir artifacts
...
@@ -66,8 +67,10 @@ doc:
...
@@ -66,8 +67,10 @@ doc:
-
export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}
-
export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}
-
export ORANGE_WEB_LOG='False'
-
export ORANGE_WEB_LOG='False'
-
python --version
-
python --version
-
source ./ci/install_scripts.sh
-
python -m pip install pip --upgrade
-
python -m pip install pip --upgrade
-
python -m pip install setuptools --upgrade
-
python -m pip install setuptools --upgrade
-
install_silx
-
python -m pip install -r requirements.txt
-
python -m pip install -r requirements.txt
-
python -m pip install .
-
python -m pip install .
script
:
script
:
...
@@ -95,6 +98,7 @@ test:test-tomoscan-tutorials:
...
@@ -95,6 +98,7 @@ test:test-tomoscan-tutorials:
-
export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}
-
export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}
-
export ORANGE_WEB_LOG='False'
-
export ORANGE_WEB_LOG='False'
-
python --version
-
python --version
-
source ./ci/install_scripts.sh
-
python -m pip install pip --upgrade
-
python -m pip install pip --upgrade
-
python -m pip install setuptools --upgrade
-
python -m pip install setuptools --upgrade
-
python -m pip install numpy --upgrade
-
python -m pip install numpy --upgrade
...
@@ -103,6 +107,7 @@ test:test-tomoscan-tutorials:
...
@@ -103,6 +107,7 @@ test:test-tomoscan-tutorials:
-
python -m pip install nbconvert
-
python -m pip install nbconvert
-
python -m pip install pandoc
-
python -m pip install pandoc
-
python -m pip install ipykernel
-
python -m pip install ipykernel
-
install_silx
-
python -m pip install -r requirements.txt
-
python -m pip install -r requirements.txt
-
python -m pip install fabio --upgrade --pre
-
python -m pip install fabio --upgrade --pre
-
python -m pip install silx --upgrade --pre
-
python -m pip install silx --upgrade --pre
...
...
ci/install_scripts.sh
0 → 100644
View file @
d0965139
#!/bin/bash
function
install_silx
(){
if
[
"
$2
"
=
'latest'
]
;
then
python
-m
install
silx
else
python
-m
pip
install
git+https://github.com/silx-kit/silx.git
fi
}
function
silx_version
(){
python
-c
'import silx; print(silx.version)'
}
requirements.txt
View file @
d0965139
silx
>=0.14
#
silx>=0.14
lxml
lxml
numpy
numpy
\ No newline at end of file
setup.py
View file @
d0965139
...
@@ -321,7 +321,7 @@ def get_project_configuration(dry_run):
...
@@ -321,7 +321,7 @@ def get_project_configuration(dry_run):
install_requires
=
[
install_requires
=
[
# for the script launcher and pkg_resources
# for the script launcher and pkg_resources
"setuptools"
,
"setuptools"
,
"silx>=0.14"
,
"silx>=0.14
a
"
,
"lxml"
,
"lxml"
,
]
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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