Skip to content

Commit 836b04f

Browse files
authored
Merge pull request #333 from CellProfiler/3.0.5
Version bumps
2 parents 8cb69d0 + a0fb503 commit 836b04f

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.github/workflows/release.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
PKG_CONFIG_PATH: /usr/local/opt/[email protected]/lib/pkgconfig
6464
if: ${{ matrix.os == 'macos-13' }}
6565
run: |
66-
sed -i '' 's/4.0.0/3.0.4.1/' Info.plist
66+
sed -i '' 's/4.0.0/3.0.5/' Info.plist
6767
make
6868
chmod +x add-osx-certificate.sh && ./add-osx-certificate.sh
6969
echo "Finished add-osx-certificate"
@@ -81,7 +81,7 @@ jobs:
8181
if: ${{ matrix.os == 'macos-13' }}
8282
run: |
8383
chmod +x osx-codesign.sh && ./osx-codesign.sh
84-
ditto -ck --keepParent --rsrc --sequesterRsrc ./dist/CellProfiler-Analyst.app ./dist/CellProfiler-Analyst-macOS-3.0.4.1.zip
84+
ditto -ck --keepParent --rsrc --sequesterRsrc ./dist/CellProfiler-Analyst.app ./dist/CellProfiler-Analyst-macOS-3.0.5.zip
8585
working-directory: ./distribution/macos
8686
- env:
8787
JDK_HOME: C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\11.0.20-8\x64
@@ -92,17 +92,17 @@ jobs:
9292
- if: ${{ matrix.os == 'windows-latest' }}
9393
run: |
9494
pyinstaller distribution/windows/CellProfiler-Analyst.spec
95-
iscc /dMyAppVersion="3.0.4.1" "distribution/windows/CellProfiler-Analyst.iss"
95+
iscc /dMyAppVersion="3.0.5" "distribution/windows/CellProfiler-Analyst.iss"
9696
- if: ${{ matrix.os == 'macos-13' }}
9797
uses: actions/upload-artifact@v4
9898
with:
99-
name: CellProfiler-Analyst-macOS-3.0.4.1.zip
100-
path: ./distribution/macos/dist/CellProfiler-Analyst-macOS-3.0.4.1.zip
99+
name: CellProfiler-Analyst-macOS-3.0.5.zip
100+
path: ./distribution/macos/dist/CellProfiler-Analyst-macOS-3.0.5.zip
101101
- if: ${{ matrix.os == 'windows-latest' }}
102102
uses: actions/upload-artifact@v4
103103
with:
104-
name: CellProfiler-Analyst-Windows-3.0.4.1.exe
105-
path: ./distribution/windows/Output/CellProfiler-Analyst-Windows-3.0.4.1.exe
104+
name: CellProfiler-Analyst-Windows-3.0.5.exe
105+
path: ./distribution/windows/Output/CellProfiler-Analyst-Windows-3.0.5.exe
106106
strategy:
107107
matrix:
108108
os: [macos-13, windows-latest]
@@ -124,25 +124,25 @@ jobs:
124124
tag_name: ${{ github.ref }}
125125
- uses: actions/download-artifact@v4
126126
with:
127-
name: CellProfiler-Analyst-macOS-3.0.4.1.zip
127+
name: CellProfiler-Analyst-macOS-3.0.5.zip
128128
path: ./
129129
- uses: actions/download-artifact@v4
130130
with:
131-
name: CellProfiler-Analyst-Windows-3.0.4.1.exe
131+
name: CellProfiler-Analyst-Windows-3.0.5.exe
132132
path: ./
133133
- env:
134134
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
135135
uses: actions/upload-release-asset@v1
136136
with:
137137
asset_content_type: application/zip
138-
asset_name: CellProfiler-Analyst-macOS-3.0.4.1.zip
139-
asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-macOS-3.0.4.1.zip
138+
asset_name: CellProfiler-Analyst-macOS-3.0.5.zip
139+
asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-macOS-3.0.5.zip
140140
upload_url: ${{ steps.create_release.outputs.upload_url }}
141141
- env:
142142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
143143
uses: actions/upload-release-asset@v1
144144
with:
145145
asset_content_type: application/exe
146-
asset_name: CellProfiler-Analyst-Windows-3.0.4.1.exe
147-
asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-Windows-3.0.4.1.exe
146+
asset_name: CellProfiler-Analyst-Windows-3.0.5.exe
147+
asset_path: /home/runner/work/CellProfiler-Analyst/CellProfiler-Analyst/CellProfiler-Analyst-Windows-3.0.5.exe
148148
upload_url: ${{ steps.create_release.outputs.upload_url }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
| **`Version`** | **`Documentation`** | **`Forum`** |
77
|---------------|----------------|-----------------|
8-
| [![Build Status](https://img.shields.io/badge/version-3.0.4-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) |
8+
| [![Build Status](https://img.shields.io/badge/version-3.0.5-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) |
99

1010
**CellProfiler Analyst** allows interactive exploration and analysis of data,
1111
particularly from high-throughput, image-based experiments. Included is a

cpa/util/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
_cached_description = None
2323

24-
__version__ = '3.0.4' # Version used by update checker, must be in format "N.N.N"
24+
__version__ = '3.0.5' # Version used by update checker, must be in format "N.N.N"
2525
_sub_version = '' # Use this to tag release candidates, betas, etc.
2626

2727
display_version = __version__ + _sub_version

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
# The short X.Y version.
6060
version = '3.0'
6161
# The full version, including alpha/beta/rc tags.
62-
release = '3.0.4'
62+
release = '3.0.5'
6363

6464
# The language for content autogenerated by Sphinx. Refer to documentation
6565
# for a list of supported languages.

0 commit comments

Comments
 (0)