Skip to content

Commit

Permalink
Merge pull request #110 from nel-lab/organize-for-release
Browse files Browse the repository at this point in the history
organizing stuff for release
  • Loading branch information
kushalkolar authored Sep 20, 2022
2 parents 0935626 + 687bec2 commit 0f36abc
Show file tree
Hide file tree
Showing 10 changed files with 113 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
branches: [ master ]

jobs:
build-linux:
build-linux-conda:
runs-on: ubuntu-latest
strategy:
max-parallel: 5
Expand Down Expand Up @@ -38,10 +38,9 @@ jobs:
run: |
mamba env update -n base --file environment.yml
caimanmanager.py install
pip install "pandas==1.5.0rc0"
pip install .
- name: Test with pytest
run: |
mamba install pytest
DOWNLOAD_GROUND_TRUTHS=1 pytest -s .
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:
contents: read

jobs:
build:
build-linux-pip:

runs-on: ubuntu-latest

Expand All @@ -41,8 +41,6 @@ jobs:
- name: Install mesmerize-core
run: |
pip install -r requirements.txt
pip install pytest
pip install .
- name: Test with pytest
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/macos-conda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: MacOS Conda

on:
pull_request:
branches:
- master
- dev
push:
branches: [ master ]

jobs:
build-macos-conda:
runs-on: macos-latest
strategy:
max-parallel: 5

steps:
- uses: actions/checkout@v3
- name: Set up Python '3.10'
uses: actions/setup-python@v3
with:
python-version: '3.10'
- name: Add conda to system path
run: |
# $CONDA is an environment variable pointing to the root of the miniconda directory
echo $CONDA/bin >> $GITHUB_PATH
- name: Install mamba
run: |
conda install -c conda-forge mamba
conda clean -a
# - name: install caiman
# run: |
# mamba install -c conda-forge caiman
- name: install mesmerize-core
run: |
mamba env update -n base --file environment.yml
caimanmanager.py install
pip install .
- name: Test with pytest
run: |
DOWNLOAD_GROUND_TRUTHS=1 pytest -s .
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
branches: [ master ]

jobs:
build:
build-windows:
name: windows conda
runs-on: "windows-latest"
steps:
Expand All @@ -35,6 +35,5 @@ jobs:
conda activate mescore
mamba install pytest
caimanmanager.py install
pip install "pandas==1.5.0rc0"
pip install .
DOWNLOAD_GROUND_TRUTHS=1 pytest -s .
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include mesmerize_core/VERSION

8 changes: 7 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ channels:
- conda-forge
dependencies:
- caiman >= 1.9.10
- pandas
- pandas >= 1.5.0
- requests
- click
- jupyterlab
- tqdm
- pims
- psutil
- pytest
- pydata-sphinx-theme

1 change: 1 addition & 0 deletions mesmerize_core/VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.1.0b1
5 changes: 5 additions & 0 deletions mesmerize_core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
create_batch,
)
from .caiman_extensions import *
from pathlib import Path


with open(Path(__file__).parent.joinpath("VERSION"), "r") as f:
__version__ = f.read().split("\n")[0]

__all__ = [
"set_parent_raw_data_path",
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "wheel"]

49 changes: 45 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,53 @@
from setuptools import setup, find_packages
from pathlib import Path


install_requires = [
"pandas>=1.5.0",
"pytest",
"requests",
"tqdm",
"numpy",
"matplotlib",
"click",
"psutil",
"pims",
"jupyterlab",
]


with open(Path(__file__).parent.joinpath("README.md")) as f:
readme = f.read()

with open(Path(__file__).parent.joinpath("mesmerize_core", "VERSION"), "r") as f:
ver = f.read().split("\n")[0]


classifiers = \
[
"Programming Language :: Python :: 3",
"LICENSE :: OSI APPROVED :: APACHE SOFTWARE LICENSE",
"Operating System :: POSIX :: Linux",
"Operating System :: MacOS :: MacOS X",
"Operating System :: Microsoft :: Windows :: Windows 10",
"Topic :: Scientific/Engineering :: Bio-Informatics",
"Topic :: Scientific/Engineering :: Image Recognition",
"Topic :: Scientific/Engineering :: Information Analysis",
"Intended Audience :: Science/Research"
]


setup(
name="mesmerize-core",
version="0.0",
description="High level pandas-based API for batch analysis of Calcium Imaging data using CaImAn",
long_description=readme,
classifiers=classifiers,
version=ver,
install_requires=install_requires,
packages=find_packages(),
include_package_data=True,
url="https://github.com/nel-lab/mesmerize-core",
license="Apache",
author="Kushal Kolar, Arjun Putcha",
license="Apache-Software-License",
author="Kushal Kolar, Caitlin Lewis, Arjun Putcha",
author_email="",
description="Mesmerize core backend",
)

0 comments on commit 0f36abc

Please sign in to comment.