Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ ENV/
.vscode/
.idea/

# Build/packaging
*.egg-info/
dist/
build/

# Testing
.pytest_cache/
htmlcov/
Expand Down
2 changes: 2 additions & 0 deletions concore_cli/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
__version__ = "1.0.0"

from .cli import cli

__all__ = ['cli']
3 changes: 2 additions & 1 deletion concore_cli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
from .commands.stop import stop_all
from .commands.inspect import inspect_workflow
from .commands.watch import watch_study
from . import __version__

console = Console()
DEFAULT_EXEC_TYPE = 'windows' if os.name == 'nt' else 'posix'

@click.group()
@click.version_option(version='1.0.0', prog_name='concore')
@click.version_option(version=__version__, prog_name='concore')
def cli():
pass

Expand Down
13 changes: 9 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "concore"
version = "1.0.0"
dynamic = ["version"]
description = "Concore workflow management CLI"
readme = "README.md"
requires-python = ">=3.9"
Expand All @@ -17,19 +17,24 @@ dependencies = [
"psutil>=5.8.0",
"numpy>=1.19.0",
"pyzmq>=22.0.0",
"scipy>=1.5.0",
"matplotlib>=3.3.0",
]

[project.optional-dependencies]
dev = [
"pytest>=6.0.0",
"pytest-cov>=2.10.0",
]
demo = [
"scipy>=1.5.0",
"matplotlib>=3.3.0",
]

[project.scripts]
concore = "concore_cli.cli:cli"

[tool.setuptools]
packages = ["concore_cli", "concore_cli.commands"]
py-modules = ["mkconcore"]
py-modules = ["concore", "concoredocker", "concore_base", "mkconcore"]

[tool.setuptools.dynamic]
version = {attr = "concore_cli.__version__"}
3 changes: 0 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
beautifulsoup4
lxml
tensorflow
numpy
pyzmq
scipy
matplotlib
cvxopt
PyGithub
click>=8.0.0
rich>=10.0.0
psutil>=5.8.0
45 changes: 4 additions & 41 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,42 +1,5 @@
from setuptools import setup, find_packages
from setuptools import setup

with open("README.md", "r", encoding="utf-8") as fh:
long_description = fh.read()

setup(
name="concore",
version="1.0.0",
author="ControlCore Project",
description="A command-line interface for concore neuromodulation workflows",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/ControlCore-Project/concore",
packages=find_packages(),
classifiers=[
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
],
python_requires=">=3.9",
install_requires=[
"beautifulsoup4",
"lxml",
"numpy",
"pyzmq",
"scipy",
"matplotlib",
"click>=8.0.0",
"rich>=10.0.0",
"psutil>=5.8.0",
],
entry_points={
"console_scripts": [
"concore=concore_cli.cli:cli",
],
},
)
# All metadata and configuration is in pyproject.toml.
# This file exists only for legacy compatibility.
setup()