Commit 9dceb5d0 authored by Paul McCarthy's avatar 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
......@@ -173,7 +173,7 @@ test:3.9:
test:build-pypi-dist:
stage: test
image: pauldmccarthy/fsleyes-py36-wxpy4-gtk3
image: pauldmccarthy/fsleyes-py37-wxpy4-gtk3
<<: *except_releases
tags:
......@@ -191,7 +191,7 @@ test:build-pypi-dist:
style:
stage: style
image: pauldmccarthy/fsleyes-py36-wxpy4-gtk3
image: pauldmccarthy/fsleyes-py37-wxpy4-gtk3
<<: *test_template
variables:
TEST_STYLE: "true"
......
......@@ -2,6 +2,18 @@ This document contains the ``fslpy`` release history in reverse chronological
order.
3.6.1 (Thursday 27th April 2021)
--------------------------------
Changed
^^^^^^^
* Removed the ``dataclasses`` backport from requirements (!297).
3.6.0 (Monday 19th April 2021)
------------------------------
......@@ -11,7 +23,7 @@ Changed
* 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
`pkgutil-style
<https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages>`_
......
......@@ -98,6 +98,9 @@ The `fsl.transform.x5 <fsl/transform/x5.py>`_ module uses `h5py
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
can build the API documentation by running::
......
......@@ -47,7 +47,7 @@ import re
import string
__version__ = '3.6.0'
__version__ = '3.6.1'
"""Current version number, as a string. """
......
......@@ -2,4 +2,3 @@ h5py>=2.9
nibabel>=2.4
numpy>=1
scipy>=0.18
dataclasses
......@@ -93,6 +93,7 @@ setup(
author='Paul McCarthy',
author_email='pauldmccarthy@gmail.com',
license='Apache License Version 2.0',
python_requires='>=3.7',
classifiers=[
'Development Status :: 3 - Alpha',
......
......@@ -10,6 +10,7 @@ import os
import gc
import os.path as op
import sys
import time
import shutil
import tempfile
import pytest
......@@ -41,8 +42,22 @@ def test_haveGui():
import wx
p = fslplatform.Platform()
app = wx.App()
p = fslplatform.Platform()
# 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)
passed = [False]
frame.Show()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment