Skip to content
Snippets Groups Projects
Commit e3d8414d authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

Merge branch 'mnt/suppress_wx_warning' into 'master'

Mnt/suppress wx warning

See merge request fsl/fslpy!94
parents d704a099 4260a3ad
No related branches found
No related tags found
No related merge requests found
fslpy fslpy
===== =====
.. image:: https://img.shields.io/pypi/v/fslpy.svg
:target: https://pypi.python.org/pypi/fslpy/
.. image:: https://git.fmrib.ox.ac.uk/fsl/fslpy/badges/master/build.svg .. image:: https://anaconda.org/conda-forge/fslpy/badges/version.svg
:target: https://git.fmrib.ox.ac.uk/fsl/fslpy/commits/master/ :target: https://anaconda.org/conda-forge/fslpy
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1470750.svg .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1470750.svg
:target: https://doi.org/10.5281/zenodo.1470750 :target: https://doi.org/10.5281/zenodo.1470750
...@@ -11,12 +13,6 @@ fslpy ...@@ -11,12 +13,6 @@ fslpy
.. image:: https://git.fmrib.ox.ac.uk/fsl/fslpy/badges/master/coverage.svg .. image:: https://git.fmrib.ox.ac.uk/fsl/fslpy/badges/master/coverage.svg
:target: https://git.fmrib.ox.ac.uk/fsl/fslpy/commits/master/ :target: https://git.fmrib.ox.ac.uk/fsl/fslpy/commits/master/
.. image:: https://img.shields.io/pypi/v/fslpy.svg
:target: https://pypi.python.org/pypi/fslpy/
.. image:: https://anaconda.org/conda-forge/fslpy/badges/version.svg
:target: https://anaconda.org/conda-forge/fslpy
The ``fslpy`` project is a `FSL <http://fsl.fmrib.ox.ac.uk/fsl/fslwiki/>`_ The ``fslpy`` project is a `FSL <http://fsl.fmrib.ox.ac.uk/fsl/fslwiki/>`_
programming library written in Python. It is used by `FSLeyes programming library written in Python. It is used by `FSLeyes
...@@ -68,10 +64,6 @@ not available on PyPI. Change the URL for your specific platform:: ...@@ -68,10 +64,6 @@ not available on PyPI. Change the URL for your specific platform::
pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk2/ubuntu-16.04/ wxpython pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk2/ubuntu-16.04/ wxpython
The ``rtree`` library also assumes that ``libspatialindex`` is installed on
your system.
Once wxPython has been installed, you can simply type the following to install Once wxPython has been installed, you can simply type the following to install
the rest of the extra dependencies:: the rest of the extra dependencies::
...@@ -90,6 +82,10 @@ The ``fsl.data.dicom`` module requires the presence of Chris Rorden's ...@@ -90,6 +82,10 @@ The ``fsl.data.dicom`` module requires the presence of Chris Rorden's
`dcm2niix <https://github.com/rordenlab/dcm2niix>`_ program. `dcm2niix <https://github.com/rordenlab/dcm2niix>`_ program.
The ``rtree`` library assumes that ``libspatialindex`` is installed on
your system.
Documentation Documentation
------------- -------------
......
...@@ -129,7 +129,6 @@ class Platform(notifier.Notifier): ...@@ -129,7 +129,6 @@ class Platform(notifier.Notifier):
import wx import wx
self.__canHaveGui = wx.App.IsDisplayAvailable() self.__canHaveGui = wx.App.IsDisplayAvailable()
except ImportError: except ImportError:
log.warning('Could not import wx', exc_info=True)
self.__canHaveGui = False self.__canHaveGui = False
# If one of the SSH_/VNC environment # If one of the SSH_/VNC environment
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment