Release 3.0.0 prep, test build system

Author: David Stirling

.github/workflows/release.yml

@@ -80,42 +80,42 @@ jobs:
       matrix:
         os: [macos-10.15, windows-2019]
         python-version: [ "3.8" ]
-#  upload:
-#    name: upload
-#    needs: build
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v2
-#      - env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        id: create_release
-#        uses: actions/create-release@v1
-#        with:
-#          draft: true
-#          prerelease: true
-#          release_name: ${{ github.ref }}
-#          tag_name: ${{ github.ref }}
-##      - uses: actions/download-artifact@v1
-##        with:
-##          name: CellProfiler-macOS-4.1.3.zip
-##          path: ./
-#      - uses: actions/download-artifact@v1
-#        with:
-#          name: CellProfiler-Analyst-Windows-3.0.0.exe
-#          path: ./
-##      - env:
-##          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-##        uses: actions/upload-release-asset@v1
-##        with:
-##          asset_content_type: application/zip
-##          asset_name: CellProfiler-macOS-4.1.3.zip
-##          asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-macOS-4.1.3.zip
-##          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#      - env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        uses: actions/upload-release-asset@v1
-#        with:
-#          asset_content_type: application/exe
-#          asset_name: CellProfiler-Analyst-3.0.0rc1.exe
-#          asset_path: /home/runner/work/CellProfiler/CellProfiler-Analyst/CellProfiler-Windows-4.1.3.exe
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
+  upload:
+    name: upload
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        id: create_release
+        uses: actions/create-release@v1
+        with:
+          draft: true
+          prerelease: true
+          release_name: ${{ github.ref }}
+          tag_name: ${{ github.ref }}
+      - uses: actions/download-artifact@v1
+        with:
+          name: CellProfiler-Analyst-macOS-3.0.0.zip
+          path: ./
+      - uses: actions/download-artifact@v1
+        with:
+          name: CellProfiler-Analyst-Windows-3.0.0.exe
+          path: ./
+      - env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: actions/upload-release-asset@v1
+        with:
+          asset_content_type: application/zip
+          asset_name: CellProfiler-Analyst-macOS-3.0.0.zip
+          asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-macOS-3.0.0.zip
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+      - env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: actions/upload-release-asset@v1
+        with:
+          asset_content_type: application/exe
+          asset_name: CellProfiler-Analyst-Windows-3.0.0.exe
+          asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-Windows-3.0.0.exe
+          upload_url: ${{ steps.create_release.outputs.upload_url }}

README.md

@@ -5,7 +5,7 @@
 
 |  **`Version`**  |  **`Documentation`** | **`Forum`** |
 |---------------|----------------|-----------------|
-| [![Build Status](https://img.shields.io/badge/version-2.2.1-green.svg)](https://cellprofileranalyst.org/releases) | [![Build Status](https://img.shields.io/badge/documentation-3.0.0-brightgreen.svg)](https://cellprofiler-manual.s3.amazonaws.com/CellProfiler-Analyst-3.0.0/index.html) | [![Build Status](https://img.shields.io/badge/forum-CPA-blue.svg)](https://forum.image.sc/tag/cellprofiler-analyst) |
+| [![Build Status](https://img.shields.io/badge/version-3.0.0-green.svg)](https://cellprofileranalyst.org/releases) | [![Build Status](https://img.shields.io/badge/documentation-3.0.0-brightgreen.svg)](https://cellprofiler-manual.s3.amazonaws.com/CellProfiler-Analyst-3.0.0/index.html) | [![Build Status](https://img.shields.io/badge/forum-CPA-blue.svg)](https://forum.image.sc/tag/cellprofiler-analyst) |
 
 **CellProfiler Analyst** allows interactive exploration and analysis of data,
 particularly from high-throughput, image-based experiments. Included is a
@@ -79,7 +79,7 @@ BMC Bioinformatics (2008) doi:10.1186/1471-2105-9-482
 
 ## Contributors
 
-David Dao, Adam Fraser, Vebjorn Ljosa, Thouis R. Jones, Jane Hung, Shantanu Singh, Mark Bray, Lee Kamentsky, Anne Carpenter
+David Dao, Adam Fraser, David Stirling, Pearl Ryder, Beth Cimini, Vebjorn Ljosa, Thouis R. Jones, Jane Hung, Shantanu Singh, Mark Bray, Lee Kamentsky, Anne Carpenter
 
 ## Kudos
 

cpa/imagereader.py

@@ -9,7 +9,7 @@
 from .errors import ClearException
 
 p = Properties()
-IMAGEIO_FORMATS = (".tif", ".tiff", ".bmp", ".png", ".jpeg")
+IMAGEIO_FORMATS = (".tif", ".tiff", ".bmp", ".gif", ".png", ".jpeg")
 
 class ThrowingURLopener(urllib.request.URLopener):
     def http_error_default(*args, **kwargs):

cpa/util/version.py

@@ -1,12 +1,11 @@
 '''version.py - Version fetching and comparison.
 
-CellProfiler is distributed under the GNU General Public License,
+CellProfiler Analyst is distributed under the GNU General Public License,
 but this file is licensed under the more permissive BSD license.
 See the accompanying file LICENSE for details.
 
 Copyright (c) 2003-2009 Massachusetts Institute of Technology
-Copyright (c) 2009-2011 Broad Institute
-Copyright (c) 2015 Broad Institute
+Copyright (c) 2009-2021 Broad Institute
 
 All rights reserved.
 
@@ -23,7 +22,7 @@
 _cached_description = None
 
 __version__ = '3.0.0' # Version used by update checker, must be in format "N.N.N"
-_sub_version = 'rc6' # Use this to tag release candidates, betas, etc.
+_sub_version = '' # Use this to tag release candidates, betas, etc.
 
 display_version = __version__ + _sub_version