-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Repo management #7
Merged
Merged
Changes from 57 commits
Commits
Show all changes
67 commits
Select commit
Hold shift + click to select a range
0e1286f
Update requirements in setup.py
elaubsch 726d8cc
Pin deepcell version
elaubsch 6cf85ff
Update copyright year
elaubsch 018ff19
Remove code redundant from deepcell
elaubsch b6a3ac9
Add github workflows
elaubsch 115846b
Remove python 3.5 from test versions
elaubsch c33ccfa
Updatebase image to deepcell
elaubsch 665a039
Remove python 3.9 from test versions
elaubsch 51cc092
Fix typo
elaubsch 53a8aab
Update data folder path
elaubsch 059a6d7
Add test requirements file
elaubsch 3f8e277
Add conditional
elaubsch fc24f56
Update pytest cov command
elaubsch 658c7d2
Update pytest cov command
elaubsch dba436b
Fix pep8 errors
elaubsch 7cfe0ac
Fix function organization
elaubsch ff6a3bc
Fix function organization
elaubsch 6eb08b6
Fix function organization
elaubsch 87542fe
Fix pep8 errors
elaubsch 4eaff20
Fix pep8 errors
elaubsch 0ce0f4f
Fix pep8 errors
elaubsch e651244
Initial commit
elaubsch c7e04bb
Fix licenses and titles
elaubsch 7de450d
Fix import statement
elaubsch 9d1c52c
Fix import statement
elaubsch c9e1767
Fix import statement
elaubsch e157a34
Fix import statement
elaubsch 2e48566
Cache Python environment
elaubsch 101c4d3
Add resize output
elaubsch e6a19ce
Edit min-max normalization function
elaubsch e46abff
Update licenses
elaubsch dbc792b
Add comments
elaubsch 134f70a
Initial commit of multiplex functions
elaubsch e0fe0d3
Add docstrings and generalize
elaubsch 3f98907
Update doc strings
elaubsch ee21991
Import application object from deepcell
elaubsch b6d71e8
Fix order of preprocessing steps
elaubsch 78833cb
Initial commit
elaubsch 967d642
Generalize read_images function
elaubsch d46925a
Generalize read_images function
elaubsch 30ae469
Generalize read_images function
elaubsch b976cb5
Add barcode assignment functions
elaubsch 3f4de62
Update gene assignment functions
elaubsch d475c9d
Add docstrings
elaubsch cdc8e6a
Add docstrings
elaubsch 9fd15dd
Add new scripts
elaubsch e53322c
Add comments
elaubsch 0ffb6fe
Initial commit
elaubsch 0ea0d2c
Initial commit
elaubsch a603525
Merge branch 'repo_management' of https://github.com/vanvalenlab/deep…
elaubsch 73afc34
Add postcode repo to requirements.txt
elaubsch fafe32e
Change postcode import statements
elaubsch dab345d
Update requirements
elaubsch 9e292e7
Remove pathlib
elaubsch 1e78286
Update test workflow
elaubsch 7545332
Add install test requirements
elaubsch 8e7eac6
Remove cython
elaubsch d9ebccc
Fix test imports
elaubsch 2674b0f
Fix postcode requirements
elaubsch 0aebcf3
Fix pep8
elaubsch 1547f02
Fix multiplex tests
elaubsch 5936fa8
Update import statements and fix version issues
elaubsch c06706b
Write unit tests
elaubsch 0a1ffc5
Add more tests
elaubsch 326d9eb
PEP8
elaubsch 2c7eee0
Remove Python 3.9 tests
elaubsch 68bdbec
Update README
elaubsch File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
name-template: '$RESOLVED_VERSION' | ||
|
||
tag-template: '$RESOLVED_VERSION' | ||
|
||
version-template: '$MAJOR.$MINOR.$PATCH' | ||
|
||
categories: | ||
- title: '🚀 Features' | ||
labels: | ||
- 'feature' | ||
- 'enhancement' | ||
- title: '🐛 Bug Fixes' | ||
labels: | ||
- 'fix' | ||
- 'bugfix' | ||
- 'bug' | ||
- 'hotfix' | ||
- title: '🧰 Maintenance' | ||
labels: | ||
- 'chore' | ||
- title: '📚️ Documentation' | ||
labels: | ||
- 'documentation' | ||
|
||
change-template: | | ||
<details> | ||
<summary>$TITLE @$AUTHOR (#$NUMBER)</summary> | ||
|
||
$BODY | ||
</details> | ||
|
||
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. | ||
|
||
version-resolver: | ||
major: | ||
labels: | ||
- 'major' | ||
minor: | ||
labels: | ||
- 'minor' | ||
- 'enhancement' | ||
patch: | ||
labels: | ||
- 'auto-update' | ||
- 'patch' | ||
- 'fix' | ||
- 'bugfix' | ||
- 'bug' | ||
- 'hotfix' | ||
- 'packages' | ||
- 'documentation' | ||
default: minor | ||
|
||
template: | | ||
$CHANGES |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# 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: Upload Python Package | ||
|
||
on: | ||
release: | ||
types: [published] | ||
|
||
jobs: | ||
deploy: | ||
|
||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Set up Python | ||
uses: actions/setup-python@v2 | ||
with: | ||
python-version: '3.x' | ||
|
||
- name: Build a source distribution | ||
run: python setup.py sdist | ||
|
||
- name: Publish distribution 📦 to PyPI | ||
if: startsWith(github.ref, 'refs/tags') | ||
uses: pypa/gh-action-pypi-publish@master | ||
with: | ||
user: __token__ | ||
password: ${{ secrets.PYPI_PASSWORD }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
name: Release Drafter | ||
|
||
on: | ||
push: | ||
# branches to consider in the event; optional, defaults to all | ||
branches: | ||
- master | ||
# pull_request event is required only for autolabeler | ||
pull_request: | ||
# Only following types are handled by the action, but one can default to all as well | ||
types: [opened, reopened, synchronize] | ||
|
||
jobs: | ||
update_release_draft: | ||
runs-on: ubuntu-latest | ||
steps: | ||
|
||
# Drafts your next Release notes as Pull Requests are merged into "master" | ||
- uses: release-drafter/release-drafter@v5 | ||
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml | ||
# with: | ||
# config-name: my-config.yml | ||
# disable-autolabeler: true | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
# This workflow will install Python dependencies, run tests and lint with a single version of Python | ||
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions | ||
|
||
name: build | ||
|
||
on: [push, pull_request] | ||
|
||
jobs: | ||
tests: | ||
|
||
runs-on: ubuntu-latest | ||
|
||
strategy: | ||
matrix: | ||
python-version: [3.6, 3.7, 3.8] | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Set up Python ${{ matrix.python-version }} | ||
uses: actions/setup-python@v2 | ||
with: | ||
python-version: ${{ matrix.python-version }} | ||
|
||
- name: Cache pip | ||
uses: actions/cache@v2 | ||
with: | ||
path: ${{ env.pythonLocation }} | ||
key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }} | ||
restore-keys: | | ||
${{ env.pythonLocation }}- | ||
|
||
- name: Install Dependencies | ||
run: | | ||
python -m pip install --upgrade pip | ||
pip install -r requirements.txt | ||
pip install -r requirements-test.txt | ||
|
||
- name: PyTest | ||
run: | | ||
python -m pytest deepcell_spots --pep8 --cov deepcell_spots | ||
|
||
- name: Coveralls | ||
if: env.COVERALLS_REPO_TOKEN != null | ||
env: | ||
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} | ||
COVERALLS_FLAG_NAME: ${{ matrix.python-version }} | ||
COVERALLS_PARALLEL: true | ||
run: | | ||
coveralls | ||
|
||
coveralls: | ||
name: Finish Coveralls | ||
needs: tests | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Coveralls Finished | ||
uses: coverallsapp/github-action@master | ||
if: env.COVERALLS_REPO_TOKEN != null | ||
env: | ||
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} | ||
with: | ||
github-token: ${{ secrets.GITHUB_TOKEN }} | ||
parallel-finished: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# Copyright 2019-2021 The Van Valen Lab at the California Institute of | ||
# Technology (Caltech), with support from the Paul Allen Family Foundation, | ||
# Google, & National Institutes of Health (NIH) under Grant U24CA224309-01. | ||
# All rights reserved. | ||
# | ||
# Licensed under a modified Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.github.com/vanvalenlab/deepcell-spots/LICENSE | ||
# | ||
# The Work provided may be used for non-commercial academic purposes only. | ||
# For any other use of the Work, including commercial use, please contact: | ||
# [email protected] | ||
# | ||
# Neither the name of Caltech nor the names of its contributors may be used | ||
# to endorse or promote products derived from this software without specific | ||
# prior written permission. | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# ============================================================================== | ||
|
||
from deepcell_spots._version import __version__ | ||
|
||
from deepcell_spots import applications | ||
from deepcell_spots import cluster_vis | ||
from deepcell_spots import data_utils | ||
from deepcell_spots import dotnet_losses | ||
from deepcell_spots import dotnet | ||
from deepcell_spots import image_alignment | ||
from deepcell_spots import image_generators | ||
from deepcell_spots import multiplex | ||
from deepcell_spots import point_metrics | ||
from deepcell_spots import postprocessing_utils | ||
from deepcell_spots import preprocessing_utils | ||
from deepcell_spots import simulate_data | ||
from deepcell_spots import singleplex | ||
from deepcell_spots import spot_em | ||
from deepcell_spots import training | ||
from deepcell_spots import utils |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# Copyright 2016-2021 The Van Valen Lab at the California Institute of | ||
elaubsch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# Technology (Caltech), with support from the Paul Allen Family Foundation, | ||
# Google, & National Institutes of Health (NIH) under Grant U24CA224309-01. | ||
# All rights reserved. | ||
# | ||
# Licensed under a modified Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.github.com/vanvalenlab/deepcell-tf/LICENSE | ||
elaubsch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# | ||
# The Work provided may be used for non-commercial academic purposes only. | ||
# For any other use of the Work, including commercial use, please contact: | ||
# [email protected] | ||
# | ||
# Neither the name of Caltech nor the names of its contributors may be used | ||
# to endorse or promote products derived from this software without specific | ||
# prior written permission. | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# ============================================================================== | ||
|
||
__title__ = 'DeepCell Spots' | ||
__description__ = 'Deep learning for fluorescent spot detection' | ||
__url__ = 'https://github.com/vanvalenlab/deepcell-spots' | ||
__version__ = '0.1.0' | ||
__download_url__ = '{}/tarball/{}'.format(__url__, __version__) | ||
__author__ = 'The Van Valen Lab' | ||
__author_email__ = '[email protected]' | ||
__license__ = 'LICENSE' | ||
__copyright__ = 'Copyright 2019-2021 The Van Valen Lab at the ' \ | ||
'California Institute of Technology (Caltech)' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# Copyright 2019-2021 The Van Valen Lab at the California Institute of | ||
# Technology (Caltech), with support from the Paul Allen Family Foundation, | ||
# Google, & National Institutes of Health (NIH) under Grant U24CA224309-01. | ||
# All rights reserved. | ||
# | ||
# Licensed under a modified Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.github.com/vanvalenlab/deepcell-spots/LICENSE | ||
# | ||
# The Work provided may be used for non-commercial academic purposes only. | ||
# For any other use of the Work, including commercial use, please contact: | ||
# [email protected] | ||
# | ||
# Neither the name of Caltech nor the names of its contributors may be used | ||
# to endorse or promote products derived from this software without specific | ||
# prior written permission. | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# ============================================================================== | ||
|
||
from deepcell_spots._version import __version__ | ||
elaubsch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
from deepcell_spots.applications.spots_application import Application | ||
from deepcell_spots.applications.spot_detection import SpotDetection |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you're already starting with a
deepcell
container, you may not need some of the later updating/upgrading.Pruning out any unnecessary build steps can save a lot of time and image space.