Skip to content

Commit

Permalink
Merge branch 'develop' into fix_image_range
Browse files Browse the repository at this point in the history
  • Loading branch information
Czaki authored Jul 9, 2024
2 parents 5b95990 + b56a34c commit 453433e
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
6 changes: 6 additions & 0 deletions .github/project_dict.pws
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
personal_ws-1.1 en 5
napari
autoupdate
aspell
yaml
yml
23 changes: 11 additions & 12 deletions .github/workflows/check_pr_title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:
- edited
- synchronize
pull_request:
branches:
- '**'
paths:
- '.github/workflows/check_pr_title.yml'

jobs:
lint:
Expand All @@ -26,20 +26,19 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '20'

- name: Install cspell
run: npm install -g cspell
- name: Install aspell
run: sudo apt-get install aspell

- name: Check PR title spelling
env:
PR_TITLE: ${{ github.event.pull_request.title }}
run: |
echo "$PR_TITLE"
if ! cspell --no-progress stdin <<< "$PR_TITLE"; then
echo "Spelling errors found in PR title"
exit 1
if aspell --personal="./.github/project_dict.pws" list <<< "$PR_TITLE" | grep -q .; then
echo "Misspelled words found."
aspell --personal="./.github/project_dict.pws" list <<< "$PR_TITLE"
exit 1
else
echo "No misspelled words found."
exit 0
fi
6 changes: 4 additions & 2 deletions build_utils/create_and_pack_executable.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def main():
parser.add_argument(
"--spec", default=os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "launcher.spec")
)
parser.add_argument("--without-compress", action="store_true")
parser.add_argument("--working-dir", default=os.path.abspath(os.curdir))

args = parser.parse_args()
Expand All @@ -91,8 +92,9 @@ def main():

dir_name = "PartSeg.app" if platform.system() == "Darwin2" else "PartSeg"

fix_qt_location(args.working_dir, dir_name)
archive_build(args.working_dir, dir_name)
if not args.without_compress:
fix_qt_location(args.working_dir, dir_name)
archive_build(args.working_dir, dir_name)


if __name__ == "__main__":
Expand Down
4 changes: 3 additions & 1 deletion launcher.spec
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ a = Analysis(
]
]
+ qt_data
+ [(os.path.join(base_path, "plugins/itk_snap_save/__init__.py"), "plugins/itk_snap_save")]
+ [(os.path.join(base_path, "napari.yaml"), "PartSeg")]
+ [(os.path.join(base_path, "plugins/napari_widgets/__init__.py"), "plugins/napari")]
+ [(os.path.join(base_path, "plugins/napari_widgets/simple_measurement_widget.py"), "plugins/napari")]
# + [ ("Readme.md", "/"), ("changelog.md", "/")]
Expand All @@ -174,6 +174,8 @@ a = Analysis(
+ collect_data_files("dask")
+ collect_data_files("vispy")
+ collect_data_files("napari")
+ collect_data_files("napari_svg")
+ collect_data_files("napari_console")
+ collect_data_files("freetype")
+ collect_data_files("skimage")
+ collect_data_files("fonticon_fa6")
Expand Down

0 comments on commit 453433e

Please sign in to comment.