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
FSL
fslpy
Commits
9dceb5d0
Commit
9dceb5d0
authored
May 26, 2021
by
Paul McCarthy
🚵
Browse files
Merge branch 'rel/3.6.1' into 'v3.6'
Rel/3.6.1 See merge request fsl/fslpy!298
parents
800fd87e
bed8aa6c
Pipeline
#8632
passed with stages
in 1 minute and 20 seconds
Changes
7
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
9dceb5d0
...
@@ -173,7 +173,7 @@ test:3.9:
...
@@ -173,7 +173,7 @@ test:3.9:
test:build-pypi-dist:
test:build-pypi-dist:
stage
:
test
stage
:
test
image
:
pauldmccarthy/fsleyes-py3
6
-wxpy4-gtk3
image
:
pauldmccarthy/fsleyes-py3
7
-wxpy4-gtk3
<<
:
*except_releases
<<
:
*except_releases
tags
:
tags
:
...
@@ -191,7 +191,7 @@ test:build-pypi-dist:
...
@@ -191,7 +191,7 @@ test:build-pypi-dist:
style
:
style
:
stage
:
style
stage
:
style
image
:
pauldmccarthy/fsleyes-py3
6
-wxpy4-gtk3
image
:
pauldmccarthy/fsleyes-py3
7
-wxpy4-gtk3
<<
:
*test_template
<<
:
*test_template
variables
:
variables
:
TEST_STYLE
:
"
true"
TEST_STYLE
:
"
true"
...
...
CHANGELOG.rst
View file @
9dceb5d0
...
@@ -2,6 +2,18 @@ This document contains the ``fslpy`` release history in reverse chronological
...
@@ -2,6 +2,18 @@ This document contains the ``fslpy`` release history in reverse chronological
order.
order.
3.6.1 (Thursday 27th April 2021)
--------------------------------
Changed
^^^^^^^
* Removed the ``dataclasses`` backport from requirements (!297).
3.6.0 (Monday 19th April 2021)
3.6.0 (Monday 19th April 2021)
------------------------------
------------------------------
...
@@ -11,7 +23,7 @@ Changed
...
@@ -11,7 +23,7 @@ Changed
* The ``fslpy`` API ocumentation is now hosted at
* The ``fslpy`` API ocumentation is now hosted at
https://open.win.ox.ac.uk/fsl/fslpy (!290).
https://open.win.ox.ac.uk/
pages/
fsl/fslpy (!290).
* The :mod:`fsl` and :mod:`fsl.scripts` packages have been changed from being
* The :mod:`fsl` and :mod:`fsl.scripts` packages have been changed from being
`pkgutil-style
`pkgutil-style
<https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages>`_
<https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages>`_
...
...
README.rst
View file @
9dceb5d0
...
@@ -98,6 +98,9 @@ The `fsl.transform.x5 <fsl/transform/x5.py>`_ module uses `h5py
...
@@ -98,6 +98,9 @@ The `fsl.transform.x5 <fsl/transform/x5.py>`_ module uses `h5py
Documentation
Documentation
-------------
-------------
API documentation for ``fslpy`` is hosted at
https://open.win.ox.ac.uk/pages/fsl/fslpy/.
``fslpy`` is documented using `sphinx <http://http://sphinx-doc.org/>`_. You
``fslpy`` is documented using `sphinx <http://http://sphinx-doc.org/>`_. You
can build the API documentation by running::
can build the API documentation by running::
...
...
fsl/version.py
View file @
9dceb5d0
...
@@ -47,7 +47,7 @@ import re
...
@@ -47,7 +47,7 @@ import re
import
string
import
string
__version__
=
'3.6.
0
'
__version__
=
'3.6.
1
'
"""Current version number, as a string. """
"""Current version number, as a string. """
...
...
requirements.txt
View file @
9dceb5d0
...
@@ -2,4 +2,3 @@ h5py>=2.9
...
@@ -2,4 +2,3 @@ h5py>=2.9
nibabel
>=2.4
nibabel
>=2.4
numpy
>=1
numpy
>=1
scipy
>=0.18
scipy
>=0.18
dataclasses
setup.py
View file @
9dceb5d0
...
@@ -93,6 +93,7 @@ setup(
...
@@ -93,6 +93,7 @@ setup(
author
=
'Paul McCarthy'
,
author
=
'Paul McCarthy'
,
author_email
=
'pauldmccarthy@gmail.com'
,
author_email
=
'pauldmccarthy@gmail.com'
,
license
=
'Apache License Version 2.0'
,
license
=
'Apache License Version 2.0'
,
python_requires
=
'>=3.7'
,
classifiers
=
[
classifiers
=
[
'Development Status :: 3 - Alpha'
,
'Development Status :: 3 - Alpha'
,
...
...
tests/test_platform.py
View file @
9dceb5d0
...
@@ -10,6 +10,7 @@ import os
...
@@ -10,6 +10,7 @@ import os
import
gc
import
gc
import
os.path
as
op
import
os.path
as
op
import
sys
import
sys
import
time
import
shutil
import
shutil
import
tempfile
import
tempfile
import
pytest
import
pytest
...
@@ -41,8 +42,22 @@ def test_haveGui():
...
@@ -41,8 +42,22 @@ def test_haveGui():
import
wx
import
wx
p
=
fslplatform
.
Platform
()
p
=
fslplatform
.
Platform
()
app
=
wx
.
App
()
# We can get weird conflicts w.r.t. access to
# the display when multiple tests are running
# simultaneously within docker on the same
# machine.
app
=
None
for
_
in
range
(
5
):
try
:
app
=
wx
.
App
()
break
except
Exception
:
time
.
sleep
(
1
)
if
app
is
None
:
assert
False
frame
=
wx
.
Frame
(
None
)
frame
=
wx
.
Frame
(
None
)
passed
=
[
False
]
passed
=
[
False
]
frame
.
Show
()
frame
.
Show
()
...
...
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