Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FSL
fslpy
Commits
685b68d3
Commit
685b68d3
authored
5 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Plain Diff
Merge branch 'ci/37' into 'master'
Ci/37 See merge request fsl/fslpy!223
parents
ee0a37b7
0ddcb21a
No related branches found
No related tags found
No related merge requests found
Pipeline
#5179
passed
5 years ago
Stage: test
Stage: style
Stage: doc
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+5
-5
5 additions, 5 deletions
.gitlab-ci.yml
CHANGELOG.rst
+1
-1
1 addition, 1 deletion
CHANGELOG.rst
with
6 additions
and
6 deletions
.gitlab-ci.yml
+
5
−
5
View file @
685b68d3
...
@@ -206,7 +206,7 @@ build-doc:
...
@@ -206,7 +206,7 @@ build-doc:
-
docker
-
docker
stage
:
doc
stage
:
doc
image
:
python:3.
6
image
:
python:3.
7
script
:
script
:
-
bash ./.ci/build_doc.sh
-
bash ./.ci/build_doc.sh
...
@@ -227,7 +227,7 @@ build-pypi-dist:
...
@@ -227,7 +227,7 @@ build-pypi-dist:
<<
:
*check_version
<<
:
*check_version
stage
:
build
stage
:
build
image
:
python:3.
6
image
:
python:3.
7
tags
:
tags
:
-
docker
-
docker
...
@@ -251,7 +251,7 @@ deploy-doc:
...
@@ -251,7 +251,7 @@ deploy-doc:
<<
:
*setup_ssh
<<
:
*setup_ssh
stage
:
deploy
stage
:
deploy
when
:
manual
when
:
manual
image
:
python:3.
6
image
:
python:3.
7
tags
:
tags
:
-
docker
-
docker
...
@@ -268,7 +268,7 @@ deploy-pypi:
...
@@ -268,7 +268,7 @@ deploy-pypi:
<<
:
*setup_ssh
<<
:
*setup_ssh
stage
:
deploy
stage
:
deploy
when
:
manual
when
:
manual
image
:
python:3.
6
image
:
python:3.
7
tags
:
tags
:
-
docker
-
docker
...
@@ -285,7 +285,7 @@ deploy-zenodo:
...
@@ -285,7 +285,7 @@ deploy-zenodo:
<<
:
*setup_ssh
<<
:
*setup_ssh
stage
:
deploy
stage
:
deploy
when
:
manual
when
:
manual
image
:
python:3.
6
image
:
python:3.
7
tags
:
tags
:
-
docker
-
docker
...
...
This diff is collapsed.
Click to expand it.
CHANGELOG.rst
+
1
−
1
View file @
685b68d3
...
@@ -51,7 +51,7 @@ Changed
...
@@ -51,7 +51,7 @@ Changed
:attr:`.LOAD` symbol, can now be accessed as attributes of the returned
:attr:`.LOAD` symbol, can now be accessed as attributes of the returned
results object, in addition to being accessed as dict items.
results object, in addition to being accessed as dict items.
* Wrapper functions decorated with the :func:`.fileOrImage`,
* Wrapper functions decorated with the :func:`.fileOrImage`,
:func:`.fileOrArray`, or :func:`.fileOrText` decorators will now pass all
:func:`.fileOrArray`, or :func:`.fileOrText` decorators will now pass all
arguments and return values through unchanged if an argument called ``submit``
arguments and return values through unchanged if an argument called ``submit``
is passed in, and is set to ``True`` (or any non-``False``
is passed in, and is set to ``True`` (or any non-``False``
value). Furthermore, in such a scenario a :exc:`ValueError` will be raised if
value). Furthermore, in such a scenario a :exc:`ValueError` will be raised if
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment