Skip to content

Commit

Permalink
Hotfix (#6)
Browse files Browse the repository at this point in the history
* update github workflow
  • Loading branch information
jxchen01 authored Dec 12, 2024
1 parent a702cf2 commit 5aba371
Show file tree
Hide file tree
Showing 15 changed files with 71 additions and 70 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This workflows will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: deploy

on:
push:
branches:
- release

jobs:
deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U setuptools setuptools_scm wheel twine
- name: Build and publish
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
run: |
git tag
python setup.py sdist bdist_wheel
twine upload dist/*
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
# This workflows will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: tests
name: test

on:
push:
branches:
- release
tags:
- "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
on:
pull_request:
branches:
- release
workflow_dispatch:
- main # Specify the branch to monitor (adjust as needed)
schedule:
# Triggers the workflow on a schedule
- cron: '0 18 1 * *' # First day of every month at 18:00 UTC

jobs:
test:
Expand All @@ -21,7 +18,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -60,29 +57,3 @@ jobs:

- name: Coverage
uses: codecov/codecov-action@v3

deploy:
# this will run when you have tagged a commit, starting with "v*"
# and requires that you have put your twine API key in your
# github secrets (see readme for details)
needs: [test]
runs-on: ubuntu-latest
if: contains(github.ref, 'tags')
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.x"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U setuptools setuptools_scm wheel twine build
- name: Build and publish
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
run: |
git tag
python -m build .
twine upload dist/*
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# destripe-lsfm

[![License BSD-3](https://img.shields.io/pypi/l/destripe-lsfm.svg?color=green)](https://github.com/MMV-Lab/destripe-lsfm/raw/main/LICENSE)
[![PyPI](https://img.shields.io/pypi/v/destripe-lsfm.svg?color=green)](https://pypi.org/project/destripe-lsfm)
[![Python Version](https://img.shields.io/pypi/pyversions/destripe-lsfm.svg?color=green)](https://python.org)
[![tests](https://github.com/MMV-Lab/destripe-lsfm/workflows/tests/badge.svg)](https://github.com/MMV-Lab/destripe-lsfm/actions)
[![codecov](https://codecov.io/gh/MMV-Lab/destripe-lsfm/branch/main/graph/badge.svg)](https://codecov.io/gh/MMV-Lab/destripe-lsfm)
[![napari hub](https://img.shields.io/endpoint?url=https://api.napari-hub.org/shields/destripe-lsfm)](https://napari-hub.org/plugins/destripe-lsfm)
[![License BSD-3](https://img.shields.io/pypi/l/destripe-lsfm.svg?color=green)](https://github.com/peng-Lab/lsfm_destripe_napari/raw/main/LICENSE)
[![PyPI](https://img.shields.io/pypi/v/lsfm_destripe_napari.svg?color=green)](https://pypi.org/project/lsfm_destripe_napari)
[![Python Version](https://img.shields.io/pypi/pyversions/lsfm_destripe_napari.svg?color=green)](https://python.org)
[![tests](https://github.com/peng-Lab/lsfm_destripe_napari/workflows/tests/badge.svg)](https://github.com/peng-Lab/lsfm_destripe_napari/actions)
[![codecov](https://codecov.io/gh/peng-Lab/lsfm_destripe_napari/branch/main/graph/badge.svg)](https://codecov.io/gh/peng-Lab/lsfm_destripe_napari)
[![napari hub](https://img.shields.io/endpoint?url=https://api.napari-hub.org/shields/lsfm_destripe_napari)](https://napari-hub.org/plugins/lsfm_destripe_napari)

A simple plugin to destripe microscopy images

Expand All @@ -23,15 +23,15 @@ https://napari.org/stable/plugins/index.html

## Installation

You can install `destripe-lsfm` via [pip]:
You can install `lsfm_destripe_napari` via [pip]:

pip install destripe-lsfm
pip install lsfm_destripe_napari



To install latest development version :

pip install git+https://github.com/MMV-Lab/destripe-lsfm.git
pip install git+https://github.com/peng-Lab/lsfm_destripe_napari.git


## Contributing
Expand Down Expand Up @@ -59,7 +59,7 @@ If you encounter any problems, please [file an issue] along with a detailed desc
[Mozilla Public License 2.0]: https://www.mozilla.org/media/MPL/2.0/index.txt
[cookiecutter-napari-plugin]: https://github.com/napari/cookiecutter-napari-plugin

[file an issue]: https://github.com/MMV-Lab/destripe-lsfm/issues
[file an issue]: https://github.com/peng-Lab/lsfm_destripe_napari/issues

[napari]: https://github.com/napari/napari
[tox]: https://tox.readthedocs.io/en/latest/
Expand Down
16 changes: 8 additions & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = destripe-lsfm
version = attr: destripe_lsfm.__version__
version = attr: lsfm_destripe_napari.__version__
description = A simple plugin to destripe microscopy images
long_description = file: README.md
long_description_content_type = text/markdown
Expand All @@ -18,15 +18,15 @@ classifiers =
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Scientific/Engineering :: Image Processing
project_urls =
Bug Tracker = https://github.com/MMV-Lab/destripe-lsfm/issues
Documentation = https://github.com/MMV-Lab/destripe-lsfm#README.md
Source Code = https://github.com/MMV-Lab/destripe-lsfm
User Support = https://github.com/MMV-Lab/destripe-lsfm/issues
Bug Tracker = https://github.com/peng-Lab/lsfm_destripe_napari/issues
Documentation = https://github.com/peng-Lab/lsfm_destripe_napari#README.md
Source Code = https://github.com/peng-Lab/lsfm_destripe_napari
User Support = https://github.com/peng-Lab/lsfm_destripe_napari/issues

[options]
packages = find:
Expand All @@ -37,7 +37,7 @@ install_requires =
aicsimageio
lsfm_destripe

python_requires = >=3.8
python_requires = >=3.9
include_package_data = True
package_dir =
=src
Expand All @@ -49,7 +49,7 @@ where = src

[options.entry_points]
napari.manifest =
destripe-lsfm = destripe_lsfm:napari.yaml
destripe-lsfm = lsfm_destripe_napari:napari.yaml

[options.extras_require]
testing =
Expand Down
7 changes: 0 additions & 7 deletions src/destripe_lsfm/_tests/test_writer.py

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import pytest

from destripe_lsfm._widget import (
from lsfm_destripe_napari._widget import (
DestripeWidget,
)

Expand Down
6 changes: 6 additions & 0 deletions src/lsfm_destripe_napari/_tests/test_writer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

# add your tests here...


def test_something():
pass
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

from lsfm_destripe.core import DeStripe

from destripe_lsfm._reader import open_dialog, napari_get_reader
from destripe_lsfm._writer import save_dialog, write_tiff
from lsfm_destripe_napari._reader import open_dialog, napari_get_reader
from lsfm_destripe_napari._writer import save_dialog, write_tiff



Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ categories: ["Annotation", "Segmentation", "Acquisition"]
contributions:
commands:
- id: destripe-lsfm.get_reader
python_name: destripe_lsfm._reader:napari_get_reader
python_name: lsfm_destripe_napari._reader:napari_get_reader
title: Open data with DeStripeLSFM
- id: destripe-lsfm.write_tiff
python_name: destripe_lsfm._writer:write_tiff
python_name: lsfm_destripe_napari._writer:write_tiff
title: Save image data with DeStripeLSFM
- id: destripe-lsfm.make_qwidget
python_name: destripe_lsfm:DestripeWidget
python_name: lsfm_destripe_napari:DestripeWidget
title: Make LSFM Destripe Widget
readers:
- command: destripe-lsfm.get_reader
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{38,39,310}-{linux,macos,windows}
envlist = py{39,310}-{linux,macos,windows}
isolated_build=true

[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310

Expand All @@ -29,4 +28,4 @@ passenv =
PYVISTA_OFF_SCREEN
extras =
testing
commands = pytest -v --color=yes --cov=destripe_lsfm --cov-report=xml
commands = pytest -v --color=yes --cov=lsfm_destripe_napari --cov-report=xml

0 comments on commit 5aba371

Please sign in to comment.