Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
WEISS
Software Repositories
SNAPPY
scikit-surgerydavinci
Commits
f7685b7c
Commit
f7685b7c
authored
Feb 15, 2019
by
Thomas Dowrick
Browse files
Forward all env vars to tox
parent
1668f2fd
Pipeline
#1477
failed with stage
in 63 minutes and 52 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
f7685b7c
...
...
@@ -4,58 +4,7 @@ variables:
PYPI_PASS
:
SECURE
stages
:
-
build
-
installer
-
test
-
deploy
build docs
:
stage
:
build
script
:
-
tox -e docs
tags
:
-
shared-linux
artifacts
:
paths
:
-
doc/
expire_in
:
1 week
build linux installer
:
stage
:
build
script
:
-
tox -e installer
tags
:
-
shared-linux
artifacts
:
paths
:
-
dist/
expire_in
:
1 week
build mac installer
:
stage
:
build
script
:
-
tox -e installer
tags
:
-
shared-mac
artifacts
:
paths
:
-
dist/
expire_in
:
1 week
build windows installer
:
stage
:
build
script
:
-
tox -e installer
tags
:
-
shared-win, gui
artifacts
:
paths
:
-
dist/
expire_in
:
1 week
test Linux
:
stage
:
test
...
...
@@ -83,65 +32,4 @@ test Windows:
script
:
-
tox
tags
:
-
shared-win, gui
deploy docs to staging
:
stage
:
deploy
script
:
# Note: the group/username directory must already exist on the server before calling this command
-
rsync -avz -e'ssh -v' --numeric-ids --delete doc/build/html/* staging_docs_rsync:WEISS/SoftwareRepositories/SNAPPY/scikit-surgeryARDavinci 2>&1
tags
:
-
docs-staging
environment
:
name
:
staging
url
:
http://weisslab-lin.cs.ucl.ac.uk/staging/WEISS/SoftwareRepositories/SNAPPY/scikit-surgeryARDavinci
only
:
-
master
dependencies
:
-
build docs
deploy docs to production
:
stage
:
deploy
script
:
# Note: the group/username directory must already exist on the server before calling this command
-
rsync -avz -e'ssh -v' --numeric-ids --delete doc/build/html/* production_docs_rsync:WEISS/SoftwareRepositories/SNAPPY/scikit-surgeryARDavinci 2>&1
tags
:
-
docs-production
environment
:
name
:
production
only
:
-
public
dependencies
:
-
build docs
deploy pip to PyPI
:
stage
:
deploy
when
:
manual
only
:
-
tags
environment
:
name
:
PyPI
url
:
https://pypi.python.org/pypi/scikit-surgeryARDavinci
tags
:
-
pip-production
artifacts
:
paths
:
-
dist/
script
:
# Install packages required to build/publish
# remove any previous distribution files
-
pip install wheel twine setuptools
-
rm -rf dist
# bundle installer
-
python setup.py bdist_wheel
# Upload to pypi
-
twine upload --repository pypi dist/* --username $PYPI_USER --password $PYPI_PASS
-
shared-win, gui
\ No newline at end of file
tests/test_UI.py
View file @
f7685b7c
...
...
@@ -5,11 +5,11 @@ from sksurgeryardavinci.widgets import Viewers
from
sksurgeryvtk.models.vtk_surface_model_directory_loader
\
import
VTKSurfaceModelDirectoryLoader
# GUI tests causing error on Linux CI-machine.
in_gitlab_ci
=
str
(
os
.
environ
.
get
(
'GITLAB_CI'
))
print
(
"Gitlab_CI: "
+
in_gitlab_ci
)
if
sys
.
platform
==
"linux"
and
in_gitlab_ci
:
pytest
.
skip
(
"skipping GUI tests on linux CI"
,
allow_module_level
=
True
)
#
# GUI tests causing error on Linux CI-machine.
#
in_gitlab_ci = str(os.environ.get('GITLAB_CI'))
#
print("Gitlab_CI: " + in_gitlab_ci)
#
if sys.platform == "linux" and in_gitlab_ci:
#
pytest.skip("skipping GUI tests on linux CI", allow_module_level=True)
@
pytest
.
fixture
()
def
mono_viewer
(
qtbot
):
...
...
tests/test_Viewers.py
View file @
f7685b7c
...
...
@@ -6,11 +6,11 @@ from sksurgeryardavinci.widgets import Viewers
from
sksurgeryutils.common_overlay_apps
import
OverlayOnVideoFeed
# pyint:disable=line-too-long
# GUI tests causing error on Linux CI-machine.
in_gitlab_ci
=
str
(
os
.
environ
.
get
(
'GITLAB_CI'
))
print
(
"Gitlab_CI"
+
in_gitlab_ci
)
if
sys
.
platform
==
"linux"
and
in_gitlab_ci
:
pytest
.
skip
(
"skipping GUI tests on linux CI"
,
allow_module_level
=
True
)
#
# GUI tests causing error on Linux CI-machine.
#
in_gitlab_ci = str(os.environ.get('GITLAB_CI'))
#
print("Gitlab_CI" + in_gitlab_ci)
#
if sys.platform == "linux" and in_gitlab_ci:
#
pytest.skip("skipping GUI tests on linux CI", allow_module_level=True)
@
pytest
.
fixture
(
scope
=
"module"
)
def
video_file_source
():
...
...
tox.ini
View file @
f7685b7c
...
...
@@ -8,7 +8,7 @@ python =
3.6:
py36,
docs,
lint
[testenv]
passenv
=
GITLAB_CI
passenv
=
*
deps
=
-rrequirements-dev.txt
whitelist_externals
=
coverage,pip
# See .coveragerc for list of omitted files
...
...
Write
Preview
Supports
Markdown
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