Skip to content

Commit 7bc288b

Browse files
authored
Merge pull request #409 from jo-mueller/fix-precommit
Fix precommit and update python versions
2 parents 3146476 + 76754c2 commit 7bc288b

40 files changed

Lines changed: 227 additions & 194 deletions

.github/workflows/build_book.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# pre-commit: disable
12
name: deploy-book
23

34
# Run this when the master or main branch changes
@@ -57,4 +58,4 @@ jobs:
5758
# Deploy the book's HTML to GitHub Pages
5859
- name: Deploy to GitHub Pages
5960
id: deployment
60-
uses: actions/deploy-pages@v4
61+
uses: actions/deploy-pages@v4

.github/workflows/test_and_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
matrix:
2323
platform: [ubuntu-latest, windows-latest, macos-latest]
24-
python-version: ["3.9", "3.10", "3.11", "3.12"]
24+
python-version: ["3.10", "3.11", "3.12"]
2525

2626
steps:
2727
- uses: actions/checkout@v4

.pre-commit-config.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,3 @@ repos:
1919
rev: v0.3.0
2020
hooks:
2121
- id: napari-plugin-checks
22-
# https://mypy.readthedocs.io/en/stable/
23-
# you may wish to add this as well!
24-
# - repo: https://github.com/pre-commit/mirrors-mypy
25-
# rev: v1.9.0
26-
# hooks:
27-
# - id: mypy

docs/04_FAQ/Installation.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ Depending on how you have your Python set up on your machine, different preparat
88
- [Getting started with Python and Anaconda](https://biapol.github.io/blog/mara_lampert/getting_started_with_mambaforge_and_python/readme.html): If you have not yet installed Python or Anaconda on your computer **at all**, this explains how to set it up and create an environment that contain the most basic functionality ([napari](https://napari.org/stable/) & [Jupyterlab](https://jupyter.org/))
99
- Setting up a new environment: If you already have Python installed and want to create a new environment for napari-stress, follow these steps to create a new environment and install napari-stress into it.
1010

11+
```{important}
12+
Please note that napari-stress is not compatible with Python 3.9 or lower. You need to use Python 3.10 or higher.
13+
```
14+
1115
```bash
12-
conda create -n stress Python=3.9
16+
conda create -n stress Python=3.10
1317
conda acticate stress
14-
conda install mamba -c conda-forge
1518

16-
mamba install napari pyqt devbio-napari
19+
conda install napari pyqt devbio-napari
1720
pip install napari-stress
1821
```
1922

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
autosummary_generate = True
1414
bibtex_bibfiles = ["references.bib"]
1515
comments_config = {"hypothesis": False, "utterances": False}
16-
copyright = "2022"
1716
exclude_patterns = ["**.ipynb_checkpoints", ".DS_Store", "Thumbs.db", "_build"]
1817
extensions = [
1918
"sphinx_togglebutton",

docs/intro.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ Welcome to the documentation for napari-stress! This ressource provides informat
2222

2323
## Installation
2424

25-
To install nappari-STRESS in your environment (provided you have Python and napari already installed), simply type this in your command:
25+
To install nappari-STRESS in your environment (provided you have Python>=3.10 and napari already installed), simply type this in your command:
2626

2727
```
2828
pip install napari-stress
2929
```
3030

31-
For more detailed installation instructions,, hints and some known issues, please refer to the [installation section](FAQ:installation).
31+
For more detailed installation instructions, hints and some known issues, please refer to the [installation section](FAQ:installation).
3232

3333
### Other useful packages
3434

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
jupyter-book>=0.7.0b
1+
jupyter-book>=1.0.4
22
napari
33
QtPy
44
napari-stress>=0.3.9

src/napari_stress/_approximation/expansion.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import numpy as np
21
from typing import TYPE_CHECKING
32

3+
import numpy as np
4+
45
if TYPE_CHECKING:
56
import napari
67

src/napari_stress/_approximation/expansion_base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from abc import ABC, abstractmethod
22
from typing import TYPE_CHECKING
3+
34
if TYPE_CHECKING:
45
import napari
56

src/napari_stress/_approximation/expansion_napari.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
from napari_tools_menu import register_function
21
from typing import TYPE_CHECKING
2+
3+
from napari_tools_menu import register_function
4+
35
if TYPE_CHECKING:
46
import napari
57

0 commit comments

Comments
 (0)