Skip to content

Commit

Permalink
4.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
David Stirling committed Feb 16, 2021
1 parent 6aa5749 commit 7aed638
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/release.yml
Expand Up @@ -38,12 +38,12 @@ jobs:
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
if: ${{ matrix.os == 'macos-10.15' }}
run: |
sed -i '' 's/4.0.0/4.1.2/' Info.plist
sed -i '' 's/4.0.0/4.1.3/' Info.plist
brew install mysql
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.app ./dist/CellProfiler-macOS-4.1.2.zip
ditto -ck --keepParent --rsrc --sequesterRsrc ./dist/CellProfiler.app ./dist/CellProfiler-macOS-4.1.3.zip
working-directory: ./distribution/macos
- env:
JDK_HOME: C:\hostedtoolcache\windows\jdk\14.0.1\x64
Expand All @@ -55,17 +55,17 @@ jobs:
- if: ${{ matrix.os == 'windows-2019' }}
run: |
pyinstaller distribution/windows/cellprofiler.spec
iscc /dMyAppVersion="4.1.2" "distribution/windows/cellprofiler.iss"
iscc /dMyAppVersion="4.1.3" "distribution/windows/cellprofiler.iss"
- if: ${{ matrix.os == 'macos-10.15' }}
uses: actions/upload-artifact@v1
with:
name: CellProfiler-macOS-4.1.2.zip
path: ./distribution/macos/dist/CellProfiler-macOS-4.1.2.zip
name: CellProfiler-macOS-4.1.3.zip
path: ./distribution/macos/dist/CellProfiler-macOS-4.1.3.zip
- if: ${{ matrix.os == 'windows-2019' }}
uses: actions/upload-artifact@v2
with:
name: CellProfiler-Windows-4.1.2.exe
path: ./distribution/windows/Output/CellProfiler-Windows-4.1.2.exe
name: CellProfiler-Windows-4.1.3.exe
path: ./distribution/windows/Output/CellProfiler-Windows-4.1.3.exe
strategy:
matrix:
os: [macos-10.15, windows-2019]
Expand All @@ -87,27 +87,27 @@ jobs:
tag_name: ${{ github.ref }}
- uses: actions/download-artifact@v1
with:
name: CellProfiler-macOS-4.1.2.zip
name: CellProfiler-macOS-4.1.3.zip
path: ./
- uses: actions/download-artifact@v1
with:
name: CellProfiler-Windows-4.1.2.exe
name: CellProfiler-Windows-4.1.3.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.2.zip
asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-macOS-4.1.2.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-Windows-4.1.2.exe
asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-Windows-4.1.2.exe
asset_name: CellProfiler-Windows-4.1.3.exe
asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-Windows-4.1.3.exe
upload_url: ${{ steps.create_release.outputs.upload_url }}
name: create-release
on:
Expand Down
2 changes: 1 addition & 1 deletion cellprofiler/__init__.py
@@ -1,3 +1,3 @@
__test__ = False

__version__ = "4.1.2"
__version__ = "4.1.3"
2 changes: 1 addition & 1 deletion docs/source/conf.py
Expand Up @@ -67,7 +67,7 @@
# The short X.Y version.
version = "4.1"
# The full version, including alpha/beta/rc tags.
release = "4.1.2"
release = "4.1.3"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -63,7 +63,7 @@ def package_data():
},
install_requires=[
"boto3>=1.12.28",
"cellprofiler-core==4.1.2",
"cellprofiler-core==4.1.3",
"centrosome==1.2.0",
"docutils==0.15.2",
"h5py==2.10.0",
Expand Down Expand Up @@ -93,7 +93,7 @@ def package_data():
package_data=package_data(),
include_package_data=True,
packages=setuptools.find_packages(exclude=["tests*"]),
python_requires=">=3.8, <3.9",
python_requires=">=3.8",
setup_requires=["pytest"],
url="https://github.com/CellProfiler/CellProfiler",
version=find_version("cellprofiler", "__init__.py"),
Expand Down

0 comments on commit 7aed638

Please sign in to comment.