forked from CellProfiler/CellProfiler
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from DavidStirling/compat-4-2-ai
Update 4.2 AI build
- Loading branch information
Showing
100 changed files
with
3,606 additions
and
853 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ jobs: | |
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ macos-10.15, windows-2019 ] | ||
| os: [ macos-latest, windows-2019 ] | ||
| python-version: [ "3.8" ] | ||
| fail-fast: false | ||
| steps: | ||
|
|
@@ -17,92 +17,98 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
| cache: pip | ||
| cache-dependency-path: setup.py | ||
| - uses: actions/setup-java@v1 | ||
| - uses: actions/setup-java@v3 | ||
| name: Install Java | ||
| with: | ||
| java-version: '14.0.1' # The JDK version to make available on the path. | ||
| distribution: "temurin" | ||
| java-version: "11" # The JDK version to make available on the path. | ||
| java-package: jdk | ||
| architecture: x64 | ||
|
|
||
| - name: Install build-time dependencies | ||
| run: | | ||
| pip install --upgrade wheel pip | ||
| pip install setuptools==49 | ||
| pip install numpy==1.20.1 | ||
| pip install pyinstaller==4.10 | ||
| pip install imageio==2.9.0 | ||
| pip install numpy==1.23.1 | ||
| pip install pyinstaller-hooks-contrib==2024.2 | ||
| pip install pyinstaller==5.13.2 | ||
| pip install imageio==2.34.0 | ||
| pip install cython | ||
| pip install lxml | ||
| - env: | ||
| LDFLAGS: -L/usr/local/opt/openssl/lib | ||
| CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }} | ||
| CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} | ||
| if: ${{ matrix.os == 'macos-10.15' }} | ||
| if: startsWith(matrix.os, 'macos') | ||
| name: MacOS dependency install | ||
| run: | | ||
| brew install mysql | ||
| brew install create-dmg | ||
| pip install centrosome==1.2.0 --no-cache-dir --no-build-isolation | ||
| brew install graphicsmagick imagemagick | ||
| npm install --global create-dmg | ||
| brew install [email protected] | ||
| brew link [email protected] | ||
| pip install mysqlclient==2.0.3 | ||
| pip install centrosome==1.2.2 --no-cache-dir --no-build-isolation | ||
| git clone https://github.com/glencoesoftware/core.git | ||
| cd core | ||
| git checkout compat-4-2 | ||
| pip install --editable . --upgrade --no-use-pep517 | ||
| cd .. | ||
| pip install --editable . --no-use-pep517 | ||
| - env: | ||
| JDK_HOME: C:\hostedtoolcache\windows\jdk\14.0.1\x64 | ||
| if: ${{ matrix.os == 'windows-2019' }} | ||
| JDK_HOME: ${{ env.JAVA_HOME }} | ||
| if: startsWith(matrix.os, 'windows') | ||
| name: Windows dependency install | ||
| run: | | ||
| pip install cython | ||
| pip install mysqlclient==1.4.6 | ||
| pip install centrosome==1.2.0 --no-cache-dir --no-build-isolation | ||
| python -m pip install --upgrade pip setuptools wheel | ||
| pip install mysqlclient==2.0.3 | ||
| pip install centrosome==1.2.2 --no-cache-dir --no-build-isolation | ||
| git clone https://github.com/glencoesoftware/core.git | ||
| cd core | ||
| git checkout compat-4-2 | ||
| pip install --editable . --upgrade --no-use-pep517 | ||
| cd .. | ||
| pip install --editable . --no-use-pep517 | ||
| pip install wxpython==4.1.1 | ||
| - name: Install plugins | ||
| run: | | ||
| pip install torch==1.11.0 | ||
| pip install cellpose==2.1.0 | ||
| pip install csbdeep==0.7.2 | ||
| pip install torch==2.2.1 | ||
| pip install cellpose==3.0.5 | ||
| pip install csbdeep==0.7.4 | ||
| pip install stardist==0.8.1 | ||
| pip install tensorflow==2.10.0 | ||
| pip install tensorflow==2.12.1 | ||
| pip install markupsafe==2.0.1 | ||
| pip install h5py==3.2.1 | ||
| pip install h5py==3.6.0 | ||
| - name: Display installed packages | ||
| run: pip list | ||
| - if: ${{ matrix.os == 'windows-2019' }} | ||
| - if: startsWith(matrix.os, 'windows') | ||
| name: Windows pyinstaller build and package | ||
| run: | | ||
| pyinstaller distribution/windows/cellprofiler.spec | ||
| iscc /dMyAppVersion="4.2.10002-ai" "distribution/windows/cellprofiler.iss" | ||
| - if: ${{ matrix.os == 'macos-10.15' }} | ||
| rm ./dist/CellProfiler/jvm.dll | ||
| iscc /dMyAppVersion="4.2.60001-ai" "distribution/windows/cellprofiler.iss" | ||
| - if: startsWith(matrix.os, 'macos') | ||
| name: MacOS pyinstaller build and package | ||
| run: | | ||
| pyinstaller -y ./distribution/macos/CellProfiler.spec | ||
| create-dmg \ | ||
| --volname "CellProfiler" \ | ||
| --window-pos 200 120 \ | ||
| --window-size 800 529 \ | ||
| --icon-size 130 \ | ||
| --text-size 14 \ | ||
| --icon "CellProfiler+AI.app" 260 250 \ | ||
| --app-drop-link 540 250 \ | ||
| --hdiutil-quiet \ | ||
| "./dist/CellProfiler-macOS-4.2.10002-ai.dmg" \ | ||
| "./dist/CellProfiler+AI.app" | ||
| - if: ${{ matrix.os == 'macos-10.15' }} | ||
| uses: actions/upload-artifact@v1 | ||
| name: MacOS artifact upload | ||
| - if: startsWith(matrix.os, 'macos') | ||
| name: MacOS dmg package | ||
| continue-on-error: true | ||
| run: | | ||
| cd dist | ||
| echo Creating DMG | ||
| create-dmg 'CellProfiler+AI.app' --dmg-title "CellProfiler+AI.dmg" | ||
| - if: startsWith(matrix.os, 'macos') | ||
| uses: actions/upload-artifact@v4 | ||
| name: MacOS dmg upload | ||
| with: | ||
| name: CellProfiler-macOS-4.2.10002-ai.dmg | ||
| path: ./dist/CellProfiler-macOS-4.2.10002-ai.dmg | ||
| - if: ${{ matrix.os == 'windows-2019' }} | ||
| uses: actions/upload-artifact@v2 | ||
| name: CellProfiler-macOS-4.2.60001-ai.dmg | ||
| path: ./dist/*.dmg | ||
| - if: startsWith(matrix.os, 'windows') | ||
| uses: actions/upload-artifact@v4 | ||
| name: Windows artifact upload | ||
| with: | ||
| name: CellProfiler-Windows-4.2.10002-ai.exe | ||
| path: ./distribution/windows/Output/CellProfiler-Windows-4.2.10002-ai.exe | ||
| name: CellProfiler-Windows-4.2.60001-ai.exe | ||
| path: ./distribution/windows/Output/*.exe | ||
| upload: | ||
| name: upload | ||
| needs: build | ||
|
|
@@ -121,27 +127,27 @@ jobs: | |
| tag_name: ${{ github.ref }} | ||
| - uses: actions/download-artifact@v1 | ||
| with: | ||
| name: CellProfiler-macOS-4.2.10002-ai.dmg | ||
| name: CellProfiler-macOS-4.2.60001-ai.dmg | ||
| path: ./ | ||
| - uses: actions/download-artifact@v1 | ||
| with: | ||
| name: CellProfiler-Windows-4.2.10002-ai.exe | ||
| name: CellProfiler-Windows-4.2.60001-ai.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.2.10002-ai.dmg | ||
| asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-macOS-4.2.10002-ai.dmg | ||
| asset_name: CellProfiler-macOS-4.2.60001-ai.dmg | ||
| asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-macOS-4.2.60001-ai.dmg | ||
| 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.2.10002-ai.exe | ||
| asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-Windows-4.2.10002-ai.exe | ||
| asset_name: CellProfiler-Windows-4.2.60001-ai.exe | ||
| asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-Windows-4.2.60001-ai.exe | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| name: create-release | ||
| on: | ||
|
|
@@ -150,3 +156,6 @@ on: | |
| - compat-4-2-ai | ||
| tags: | ||
| - "v*" | ||
| pull_request: | ||
| branches: | ||
| - compat-4-2-ai | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| __test__ = False | ||
|
|
||
| __version__ = "4.2.10002" | ||
| __version__ = "4.2.60001" |
Oops, something went wrong.