diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56b4d7e0..4edc24d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,7 @@ jobs: CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} if: ${{ matrix.os == 'macos-10.15' }} run: | - sed -i '' 's/4.0.0/3.0.1/' Info.plist + sed -i '' 's/4.0.0/3.0.2/' Info.plist brew install mysql git clone https://github.com/CellProfiler/python-javabridge.git cd python-javabridge/ @@ -54,7 +54,7 @@ jobs: make chmod +x add-osx-certificate.sh && ./add-osx-certificate.sh chmod +x osx-codesign.sh && ./osx-codesign.sh - ditto -ck --keepParent --rsrc --sequesterRsrc ./dist/CellProfiler-Analyst.app ./dist/CellProfiler-Analyst-macOS-3.0.1.zip + ditto -ck --keepParent --rsrc --sequesterRsrc ./dist/CellProfiler-Analyst.app ./dist/CellProfiler-Analyst-macOS-3.0.2.zip working-directory: ./distribution/macos - env: JDK_HOME: C:\hostedtoolcache\windows\jdk\14.0.1\x64 @@ -65,17 +65,17 @@ jobs: - if: ${{ matrix.os == 'windows-2019' }} run: | pyinstaller distribution/windows/CellProfiler-Analyst.spec - iscc /dMyAppVersion="3.0.1" "distribution/windows/CellProfiler-Analyst.iss" + iscc /dMyAppVersion="3.0.2" "distribution/windows/CellProfiler-Analyst.iss" - if: ${{ matrix.os == 'macos-10.15' }} uses: actions/upload-artifact@v1 with: - name: CellProfiler-Analyst-macOS-3.0.1.zip - path: ./distribution/macos/dist/CellProfiler-Analyst-macOS-3.0.1.zip + name: CellProfiler-Analyst-macOS-3.0.2.zip + path: ./distribution/macos/dist/CellProfiler-Analyst-macOS-3.0.2.zip - if: ${{ matrix.os == 'windows-2019' }} uses: actions/upload-artifact@v2 with: - name: CellProfiler-Analyst-Windows-3.0.1.exe - path: ./distribution/windows/Output/CellProfiler-Analyst-Windows-3.0.1.exe + name: CellProfiler-Analyst-Windows-3.0.2.exe + path: ./distribution/windows/Output/CellProfiler-Analyst-Windows-3.0.2.exe strategy: matrix: os: [macos-10.15, windows-2019] @@ -97,25 +97,25 @@ jobs: tag_name: ${{ github.ref }} - uses: actions/download-artifact@v1 with: - name: CellProfiler-Analyst-macOS-3.0.1.zip + name: CellProfiler-Analyst-macOS-3.0.2.zip path: ./ - uses: actions/download-artifact@v1 with: - name: CellProfiler-Analyst-Windows-3.0.1.exe + name: CellProfiler-Analyst-Windows-3.0.2.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.1.zip - asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-macOS-3.0.1.zip + asset_name: CellProfiler-Analyst-macOS-3.0.2.zip + asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-macOS-3.0.2.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.1.exe - asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-Windows-3.0.1.exe + asset_name: CellProfiler-Analyst-Windows-3.0.2.exe + asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-Windows-3.0.2.exe upload_url: ${{ steps.create_release.outputs.upload_url }} \ No newline at end of file diff --git a/README.md b/README.md index c5cd6703..655eb761 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ | **`Version`** | **`Documentation`** | **`Forum`** | |---------------|----------------|-----------------| -| [![Build Status](https://img.shields.io/badge/version-3.0.1-green.svg)](https://cellprofileranalyst.org/releases) | [![Build Status](https://img.shields.io/badge/documentation-3.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.2-green.svg)](https://cellprofileranalyst.org/releases) | [![Build Status](https://img.shields.io/badge/documentation-3.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 diff --git a/cpa/util/version.py b/cpa/util/version.py index 5b528e81..276ddd4b 100755 --- a/cpa/util/version.py +++ b/cpa/util/version.py @@ -21,7 +21,7 @@ _cached_description = None -__version__ = '3.0.1' # Version used by update checker, must be in format "N.N.N" +__version__ = '3.0.2' # Version used by update checker, must be in format "N.N.N" _sub_version = '' # Use this to tag release candidates, betas, etc. display_version = __version__ + _sub_version diff --git a/docs/source/conf.py b/docs/source/conf.py index 0b6e2ca8..3d69a40b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '3.0' # The full version, including alpha/beta/rc tags. -release = '3.0.1' +release = '3.0.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/index.rst b/docs/source/index.rst index 668d4569..a49f5734 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -4,7 +4,7 @@ contain the root `toctree` directive. ============ -Manual 3.0.1 +Manual 3.0.2 ============ .. image:: https://i.imgur.com/uaEp2md.png