Skip to content
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 67 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
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 Jul 8, 2021
726d8cc
Pin deepcell version
elaubsch Jul 8, 2021
6cf85ff
Update copyright year
elaubsch Jul 8, 2021
018ff19
Remove code redundant from deepcell
elaubsch Jul 8, 2021
b6a3ac9
Add github workflows
elaubsch Jul 8, 2021
115846b
Remove python 3.5 from test versions
elaubsch Jul 8, 2021
c33ccfa
Updatebase image to deepcell
elaubsch Jul 8, 2021
665a039
Remove python 3.9 from test versions
elaubsch Jul 8, 2021
51cc092
Fix typo
elaubsch Jul 8, 2021
53a8aab
Update data folder path
elaubsch Jul 15, 2021
059a6d7
Add test requirements file
elaubsch Jul 15, 2021
3f8e277
Add conditional
elaubsch Jul 15, 2021
fc24f56
Update pytest cov command
elaubsch Jul 15, 2021
658c7d2
Update pytest cov command
elaubsch Jul 15, 2021
dba436b
Fix pep8 errors
elaubsch Jul 15, 2021
7cfe0ac
Fix function organization
elaubsch Jul 15, 2021
ff6a3bc
Fix function organization
elaubsch Jul 15, 2021
6eb08b6
Fix function organization
elaubsch Jul 15, 2021
87542fe
Fix pep8 errors
elaubsch Jul 16, 2021
4eaff20
Fix pep8 errors
elaubsch Jul 16, 2021
0ce0f4f
Fix pep8 errors
elaubsch Jul 16, 2021
e651244
Initial commit
elaubsch Jul 19, 2021
c7e04bb
Fix licenses and titles
elaubsch Jul 19, 2021
7de450d
Fix import statement
elaubsch Jul 19, 2021
9d1c52c
Fix import statement
elaubsch Jul 19, 2021
c9e1767
Fix import statement
elaubsch Jul 20, 2021
e157a34
Fix import statement
elaubsch Jul 20, 2021
2e48566
Cache Python environment
elaubsch Jul 21, 2021
101c4d3
Add resize output
elaubsch Aug 26, 2021
e6a19ce
Edit min-max normalization function
elaubsch Sep 1, 2021
e46abff
Update licenses
elaubsch Sep 13, 2021
dbc792b
Add comments
elaubsch Sep 13, 2021
134f70a
Initial commit of multiplex functions
elaubsch Sep 13, 2021
e0fe0d3
Add docstrings and generalize
elaubsch Sep 13, 2021
3f98907
Update doc strings
elaubsch Sep 14, 2021
ee21991
Import application object from deepcell
elaubsch Sep 15, 2021
b6d71e8
Fix order of preprocessing steps
elaubsch Sep 15, 2021
78833cb
Initial commit
elaubsch Nov 16, 2021
967d642
Generalize read_images function
elaubsch Nov 17, 2021
d46925a
Generalize read_images function
elaubsch Nov 17, 2021
30ae469
Generalize read_images function
elaubsch Nov 17, 2021
b976cb5
Add barcode assignment functions
elaubsch Nov 30, 2021
3f4de62
Update gene assignment functions
elaubsch Nov 30, 2021
d475c9d
Add docstrings
elaubsch Dec 1, 2021
cdc8e6a
Add docstrings
elaubsch Dec 1, 2021
9fd15dd
Add new scripts
elaubsch Dec 2, 2021
e53322c
Add comments
elaubsch Dec 3, 2021
0ffb6fe
Initial commit
elaubsch Dec 3, 2021
0ea0d2c
Initial commit
elaubsch Dec 6, 2021
a603525
Merge branch 'repo_management' of https://github.com/vanvalenlab/deep…
elaubsch Dec 6, 2021
73afc34
Add postcode repo to requirements.txt
elaubsch Dec 6, 2021
fafe32e
Change postcode import statements
elaubsch Dec 6, 2021
dab345d
Update requirements
elaubsch Dec 6, 2021
9e292e7
Remove pathlib
elaubsch Dec 6, 2021
1e78286
Update test workflow
elaubsch Dec 6, 2021
7545332
Add install test requirements
elaubsch Dec 6, 2021
8e7eac6
Remove cython
elaubsch Dec 6, 2021
d9ebccc
Fix test imports
elaubsch Dec 6, 2021
2674b0f
Fix postcode requirements
elaubsch Dec 6, 2021
0aebcf3
Fix pep8
elaubsch Dec 6, 2021
1547f02
Fix multiplex tests
elaubsch Dec 7, 2021
5936fa8
Update import statements and fix version issues
elaubsch Dec 7, 2021
c06706b
Write unit tests
elaubsch Dec 7, 2021
0a1ffc5
Add more tests
elaubsch Dec 7, 2021
326d9eb
PEP8
elaubsch Dec 7, 2021
2c7eee0
Remove Python 3.9 tests
elaubsch Dec 7, 2021
68bdbec
Update README
elaubsch Dec 7, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ ignore_errors = True
fail_under = 50
show_missing = True

omit =
omit =
**/*_test.py
deepcell-spots/data/*
data/*
55 changes: 55 additions & 0 deletions .github/release-drafter.yml
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
31 changes: 31 additions & 0 deletions .github/workflows/pypi.yaml
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 }}
25 changes: 25 additions & 0 deletions .github/workflows/release-drafter.yaml
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 }}
64 changes: 64 additions & 0 deletions .github/workflows/tests.yaml
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Use tensorflow/tensorflow as the base image
# Change the build arg to edit the tensorflow version.
# Only supporting python3.
ARG TF_VERSION=2.4.1-gpu
ARG DEEPCELL_VERSION=0.9.0

FROM tensorflow/tensorflow:${TF_VERSION}
FROM deepcell:${DEEPCELL_VERSION}
Copy link
Contributor

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.


# System maintenance
RUN /usr/bin/python3 -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ coords = app.predict(image,threshold=0.9)

## Copyright

Copyright © 2019-2020 [The Van Valen Lab](http://www.vanvalen.caltech.edu/) at the California Institute of Technology (Caltech), with support from the Shurl and Kay Curci Foundation, Google Research Cloud, the Paul Allen Family Foundation, & National Institutes of Health (NIH) under Grant U24CA224309-01.
Copyright © 2019-2021 [The Van Valen Lab](http://www.vanvalen.caltech.edu/) at the California Institute of Technology (Caltech), with support from the Shurl and Kay Curci Foundation, Google Research Cloud, the Paul Allen Family Foundation, & National Institutes of Health (NIH) under Grant U24CA224309-01.
All rights reserved.

## License
Expand Down
44 changes: 44 additions & 0 deletions deepcell_spots/__init__.py
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
36 changes: 36 additions & 0 deletions deepcell_spots/_version.py
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)'
30 changes: 30 additions & 0 deletions deepcell_spots/applications/__init__.py
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
Loading