Skip to content

Commit

Permalink
Update all imports, app name, hard coded napari strings, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
cmalinmayor committed Jan 23, 2025
1 parent 42a6b9e commit 5a493d6
Show file tree
Hide file tree
Showing 948 changed files with 3,848 additions and 4,041 deletions.
9 changes: 0 additions & 9 deletions .devcontainer/Dockerfile

This file was deleted.

19 changes: 0 additions & 19 deletions .devcontainer/add-notice.sh

This file was deleted.

47 changes: 0 additions & 47 deletions .devcontainer/devcontainer.json

This file was deleted.

6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
*Created: 2024-11-11; Updated:*

See the napari website for more detailed contributor information:
- [deployment](https://napari.org/stable/developers/contributing/documentation/docs_deployment.html)
- [contributing guide](https://napari.org/stable/developers/contributing/index.html)
- [core developer guide](https://napari.org/stable/developers/coredev/core_dev_guide.html)
- [deployment](https://finn.org/stable/developers/contributing/documentation/docs_deployment.html)
- [contributing guide](https://finn.org/stable/developers/contributing/index.html)
- [core developer guide](https://finn.org/stable/developers/coredev/core_dev_guide.html)

## Workflows and actions

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:
Please fill out the sections below to help us reproduce the problem.
If you've found a problem with content on the napari documentation site (napari.org) or with the rendering of the content,
If you've found a problem with content on the napari documentation site (finn.org) or with the rendering of the content,
please let us know [here](https://github.com/napari/docs/issues)
- type: textarea
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ contact_links:
- name: 🗎 napari documentation
url: https://github.com/napari/docs/issues
about: |
If you've found a problem with content on the napari documentation site (napari.org) or with the rendering of the content, please let us know here.
If you've found a problem with content on the napari documentation site (finn.org) or with the rendering of the content, please let us know here.
- name: 🤷💻 napari forum
url: https://forum.image.sc/tag/napari
about: |
Please ask general "how do I ... ?" questions over at image.sc
- name: '💬 napari @ zulip'
url: https://napari.zulipchat.com/
url: https://finn.zulipchat.com/
about: Chat with devs
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ a screenshot or a screen capture: "An image is worth a thousand words!" -->
(open a PR on the docs repository (https://github.com/napari/docs) if relevant!)
- I have added tests that prove my fix is effective or that my feature works
- If I included new strings, I have used `trans._("some string")` to make them localizable.
(For more information see our [translations guide](https://napari.org/stable/developers/contributing/translations.html)).
(For more information see our [translations guide](https://finn.org/stable/developers/contributing/translations.html)).
- If an API has been modified, I have added a `.. versionadded::` or `.. versionchanged::`
directive to the appropriate docstring (For more information see
[the Sphinx documentation](https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#describing-changes-between-versions)).
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,43 +24,43 @@ jobs:
uses: actions/checkout@v4
with:
path: docs # place in a named directory
repository: napari/docs
repository: finn/docs

- name: Clone main repo
uses: actions/checkout@v4
with:
path: napari # place in a named directory
path: finn # place in a named directory
# ensure version metadata is proper
fetch-depth: 0

- uses: actions/setup-python@v5
with:
python-version: "3.10"
cache-dependency-path: |
napari/pyproject.toml
finn/pyproject.toml
docs/requirements.txt
- uses: tlambert03/setup-qt-libs@v1

- name: Install Dependencies
run: |
python -m pip install --upgrade pip
python -m pip install "napari/[all]"
python -m pip install "finn/[all]"
python -m pip install -r docs/requirements.txt
env:
PIP_CONSTRAINT: ${{ github.workspace }}/napari/resources/constraints/constraints_py3.10_docs.txt
PIP_CONSTRAINT: ${{ github.workspace }}/finn/resources/constraints/constraints_py3.10_docs.txt

- name: Testing
run: |
python -c 'import napari; print(napari.__version__)'
python -c 'import napari.layers; print(napari.layers.__doc__)'
python -c 'import finn; print(finn.__version__)'
python -c 'import finn.layers; print(finn.layers.__doc__)'
- name: Build Docs
uses: aganders3/headless-gui@v2
env:
GOOGLE_CALENDAR_ID: ${{ secrets.GOOGLE_CALENDAR_ID }}
GOOGLE_CALENDAR_API_KEY: ${{ secrets.GOOGLE_CALENDAR_API_KEY }}
PIP_CONSTRAINT: ${{ github.workspace }}/napari/resources/constraints/constraints_py3.10_docs.txt
PIP_CONSTRAINT: ${{ github.workspace }}/finn/resources/constraints/constraints_py3.10_docs.txt
with:
run: make -C docs docs
# skipping setup stops the action from running the default (tiling) window manager
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_comprehensive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
token: ${{ secrets.GHA_TOKEN_BOT_REPO_WORKFLOW }}
- name: Synchronize bot repository
run: |
git remote add napari-bot https://github.com/napari-bot/napari.git
git remote add napari-bot https://github.com/napari-bot/finn.git
git fetch napari-bot
git push --force --set-upstream napari-bot main
- name: Report Failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade_test_constraints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
run: |
cd napari_repo
git remote -v
git remote add napari-bot https://github.com/napari-bot/napari.git
git remote add napari-bot https://github.com/napari-bot/finn.git
git remote -v
# START PYTHON DEPENDENCIES
Expand Down
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,16 @@ tramp
_qt_resources*.py
res.qrc
# ignore all generated themed svgs
napari/resources/themes
finn/resources/themes

napari/_version.py
finn/_version.py

docs/api/napari*
docs/api/finn*
docs/_build

# built in setup.py
napari/view_layers.pyi
napari/components/viewer_model.pyi
finn/view_layers.pyi
finn/components/viewer_model.pyi

# Autogenerated documentation
docs/images/_autogenerated/
Expand All @@ -164,15 +164,15 @@ docs/guides/_layerlist_events.md
# come from npe2 docs
docs/plugins/_npe2_*.md

napari/settings/napari.schema.json
finn/settings/finn.schema.json

docs/jupyter_execute/
docs/.jupyter_cache/
docs/gallery/

# pytest reports in json format https://github.com/napari/napari/pull/4518
report*.json
napari/resources/icons/_themes/
finn/resources/icons/_themes/

# perfmon
tools/perfmon/*/traces-*.json
Expand Down
4 changes: 2 additions & 2 deletions EULA.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
napari may be [installed][napari_installers] through a variety of methods. Particularly, the
bundled installers may include third party software packages or tools licensed under different
terms. These licenses may be accessed from within the resulting napari installation or
https://napari.org.
https://finn.org.

<!-- Links -->

[napari_installers]: https://napari.org/stable/#installation
[napari_installers]: https://finn.org/stable/#installation

<!-- List of EULAs starts here -->
<!--
Expand Down
20 changes: 10 additions & 10 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
include LICENSE
include *.cff
graft napari/_vendor
recursive-include napari *.pyi
recursive-include napari _tests/*.py
graft finn/_vendor
recursive-include finn *.pyi
recursive-include finn _tests/*.py
recursive-include napari_builtins _tests/*.py
recursive-include napari *.pyi
recursive-include napari *.png *.svg *.qss *.gif *.ico *.icns
recursive-include napari *.yaml
recursive-include napari *.py_tmpl
recursive-include finn *.pyi
recursive-include finn *.png *.svg *.qss *.gif *.ico *.icns
recursive-include finn *.yaml
recursive-include finn *.py_tmpl

# explicit excludes to keep check-manifest happy and remind us that
# these things are not being included unless we ask
recursive-exclude tools *
recursive-exclude napari *.pyc
exclude napari/benchmarks/*
include napari/benchmarks/utils.py
recursive-exclude finn *.pyc
exclude finn/benchmarks/*
include finn/benchmarks/utils.py
recursive-exclude resources *
recursive-exclude binder *
recursive-exclude examples *
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: typestubs pre watch dist settings-schema

typestubs:
python -m napari.utils.stubgen
python -m finn.utils.stubgen

# note: much faster to run mypy as daemon,
# dmypy run -- ...
Expand All @@ -18,7 +18,7 @@ dist: typestubs check-manifest
python -m build

settings-schema:
python -m napari.settings._napari_settings
python -m finn.settings._napari_settings

pre:
pre-commit run -a
Expand Down
Loading

0 comments on commit 5a493d6

Please sign in to comment.