Skip to content

Commit 8315e00

Browse files
Merge pull request #183 from mehta-lab/recorder-merge
Merge `recOrder` into `waveorder`
2 parents aa7050f + 394e442 commit 8315e00

File tree

146 files changed

+19502
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+19502
-140
lines changed

.git-blame-ignore-revs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# .git-blame-ignore-revs
22
# created as described in: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
3+
34
# black-format files
45
07517c3353c392106cabae003d589946ea25918a
6+
82f6df5ed34460374ce7c0fdca089d8caa570b9f
7+
aa7050f973f36dc204ea495e105b5432223dc68d
8+
a3dd7e5e9bc0bed404792e9b241f1639ade76f33
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: "[BUG]"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Summary and expected behavior**
11+
12+
**Code for reproduction (using python script or command line interface)**
13+
```
14+
# paste your code here
15+
16+
```
17+
18+
**Screenshots or steps for reproduction (using napari GUI)**
19+
20+
**Include relevant logs which are created next to the output dir, name of the dataset, yaml file(s) if encountering reconstruction errors.**
21+
22+
**Expected behavior**
23+
A clear and concise description of what you expected to happen.
24+
25+
**Environment:**
26+
27+
Operating system:
28+
Python version:
29+
Python environment (command line, IDE, Jupyter notebook, etc):
30+
Micro-Manager/pycromanager version:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: Documentation
3+
about: Help us improve documentation
4+
title: "[DOC]"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Suggested improvement**
11+
12+
**Optional: Pull request with better documentation**
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: "[FEATURE]"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Problem**
11+
12+
**Proposed solution**
13+
14+
15+
**Alternatives you have considered, if any**
16+
17+
**Additional context**
18+
Note relevant experimental conditions or datasets

.github/workflows/pr.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ name: lint, style, and tests
55

66
on:
77
pull_request:
8-
branches:
9-
- main
108

119
jobs:
1210
style:
@@ -77,25 +75,25 @@ jobs:
7775
run: |
7876
isort --check waveorder
7977
80-
tests:
81-
needs: [style, isort] # lint
82-
runs-on: ubuntu-latest
83-
strategy:
84-
matrix:
85-
python-version: ["3.10", "3.11", "3.12"]
78+
# needs: [style, isort] # lint
79+
# runs-on: ubuntu-latest
80+
# strategy:
81+
# matrix:
82+
# python-version: ["3.10", "3.11", "3.12"]
8683

87-
steps:
88-
- uses: actions/checkout@v3
84+
# steps:
85+
# - uses: actions/checkout@v3
8986

90-
- uses: actions/setup-python@v4
91-
with:
92-
python-version: ${{ matrix.python-version }}
87+
# - uses: actions/setup-python@v4
88+
# with:
89+
# python-version: ${{ matrix.python-version }}
9390

94-
- name: Install dependencies
95-
run: |
96-
python -m pip install --upgrade pip
97-
pip install ".[dev]"
91+
# - name: Install dependencies
92+
# run: |
93+
# python -m pip install --upgrade pip
94+
# pip install ".[all,dev]"
9895

99-
- name: Test with pytest
100-
run: |
101-
pytest -v --cov=./ --cov-report=xml
96+
# - name: Test with pytest
97+
# run: |
98+
# pytest -v
99+
# pytest -v --cov=./ --cov-report=xml

.github/workflows/pytests.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: test
2+
3+
on: [push]
4+
5+
jobs:
6+
test:
7+
name: ${{ matrix.platform }} py${{ matrix.python-version }}
8+
runs-on: ${{ matrix.platform }}
9+
strategy:
10+
matrix:
11+
platform: [ubuntu-latest, windows-latest, macos-latest]
12+
python-version: ["3.10", "3.11"]
13+
14+
steps:
15+
- name: Checkout repo
16+
uses: actions/checkout@v3
17+
18+
- name: Set up Python ${{ matrix.python-version }}
19+
uses: actions/setup-python@v4
20+
with:
21+
python-version: ${{ matrix.python-version }}
22+
23+
# these libraries enable testing on Qt on linux
24+
- uses: tlambert03/setup-qt-libs@v1
25+
26+
# strategy borrowed from vispy for installing opengl libs on windows
27+
- name: Install Windows OpenGL
28+
if: runner.os == 'Windows'
29+
run: |
30+
git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git
31+
powershell gl-ci-helpers/appveyor/install_opengl.ps1
32+
33+
- name: Install dependencies
34+
run: |
35+
python -m pip install --upgrade pip
36+
python -m pip install setuptools tox tox-gh-actions
37+
38+
# https://github.com/napari/cookiecutter-napari-plugin/commit/cb9a8c152b68473e8beabf44e7ab11fc46483b5d
39+
- name: Test
40+
uses: aganders3/headless-gui@v1
41+
with:
42+
run: python -m tox
43+
44+
- name: Coverage
45+
uses: codecov/codecov-action@v3

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,15 @@ dmypy.json
143143

144144
# written by setuptools_scm
145145
*/_version.py
146-
recOrder/_version.py
146+
waveorder/_version.py
147147
*.autosave
148148

149149
# images
150150
*.npz
151151
*.png
152152
*.tif[f]
153153
*.pdf
154+
155+
# example data
156+
/examples/data_temp/*
157+
/logs/*

.pre-commit-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
repos:
32
# basic pre-commit
43
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -31,4 +30,4 @@ repos:
3130
- repo: https://github.com/psf/black
3231
rev: 25.1.0
3332
hooks:
34-
- id: black
33+
- id: black

CITATION.cff

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ identifiers:
4343
- type: url
4444
value: 'https://www.napari-hub.org/plugins/recOrder-napari'
4545
description: >-
46-
recOrder-napari plugin for label-free imaging that
47-
depends on waveOrder library
46+
waveorder plugin for label-free imaging (TODO: update URL)
4847
- type: doi
4948
value: 10.1364/BOE.455770
5049
description: >-

0 commit comments

Comments
 (0)