Merge branch 'develop'

taborlab · Mar 16, 2019 · 031a7af · 031a7af
2 parents 356325b + edbd836
commit 031a7af
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/FlowCal/__init__.py b/FlowCal/__init__.py
@@ -6,7 +6,7 @@
 # Versions should comply with PEP440.  For a discussion on single-sourcing
 # the version across setup.py and the project code, see
 # https://packaging.python.org/en/latest/single_source_version.html
-__version__ = '1.2.0'
+__version__ = '1.2.1'
 
 from . import io
 from . import excel_ui

diff --git a/FlowCal/mef.py b/FlowCal/mef.py
@@ -1208,7 +1208,7 @@ def get_transform_fxn(data_beads,
                   'statistic',
                   'selection',
                   'fitting']
-        MEFOutput = collections.namedtuple('MEFOutput', fields, verbose=False)
+        MEFOutput = collections.namedtuple('MEFOutput', fields)
         out = MEFOutput(mef_channels=mef_channels,
                         transform_fxn=transform_fxn,
                         clustering=clustering_res,

diff --git a/doc/getting_started/install_anaconda.rst b/doc/getting_started/install_anaconda.rst
@@ -3,11 +3,11 @@ Installing FlowCal with Anaconda
 
 To install Anaconda and ``FlowCal``, do the following:
 
-1. Navigate to https://www.continuum.io/downloads. Make sure that your operating system is selected (Windows, macOS, Linux). Click on the "Download" button below the "Python 3.6 version" message. This will download the installer.
+1. Navigate to https://www.anaconda.com/distribution/#download-section. Make sure that your operating system is selected (Windows, macOS, Linux). Click on the "Download" button below the "Python 3.7 version" message. This will download the installer.
 
 .. note:: **Windows**: If your computer is a 32-bit PC, click on the message "32-Bit Graphical Installer" instead of the "Download" button. If you don't know whether yours is a 32 or 64 computer but you have purchased it in the last five years, it is probably a 64-bit computer and you can ignore this message.
 
-.. note:: Python 2.7 is also supported. However, we recommend downloading the Python 3.6 version of Anaconda.
+.. note:: Python 2.7 is also supported. However, we recommend downloading the Python 3.7 version of Anaconda.
 
 2. Double click the installer (.exe in Windows, .pkg in OS X) and follow the instructions on screen.
 

diff --git a/doc/getting_started/install_python.rst b/doc/getting_started/install_python.rst
@@ -1,7 +1,7 @@
 Installing FlowCal in an Existing Python Evironment
 =======================================================
 
-Python (2.7 or 3.6) is required, along with ``pip`` and ``setuptools``. The easiest way is to install ``FlowCal`` is to use ``pip``::
+Python (2.7, 3.6, or 3.7) is required, along with ``pip`` and ``setuptools``. The easiest way is to install ``FlowCal`` is to use ``pip``::
 
 	pip install FlowCal
 

diff --git a/setup.py b/setup.py
@@ -71,6 +71,7 @@ def find_version(file_path):
         # that you indicate whether you support Python 2, Python 3 or both.
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
 
     # What does your project relate to?