Skip to content

Commit 1915ab9

Browse files
committed
conda support
1 parent 30e4ba6 commit 1915ab9

File tree

11 files changed

+564
-428
lines changed

11 files changed

+564
-428
lines changed

BUILD_DEPLOY_GUIDE.md

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,36 @@ password = pypi-your-full-token
2424
chmod 600 ~/.pypirc
2525
```
2626

27-
## Build & Upload
27+
## PIP Upload
2828

2929
```bash
3030
rm -rf dist/ build/ *.egg-info/
3131
python setup.py sdist bdist_wheel
3232
twine upload dist/*
33+
```
34+
35+
## Conda Upload
36+
37+
```bash
38+
# Create build environment
39+
conda create -n conda-build-env conda-build anaconda-client -y python=3.11
40+
conda activate conda-build-env
41+
42+
# Build conda package (from local source)
43+
44+
conda build conda-recipe/ --output-folder dist/
45+
46+
# Login and upload
47+
anaconda login
48+
anaconda upload dist/noarch/taskvine-report-tool-*.conda
49+
```
50+
51+
## Python Version Requirement
52+
53+
This package is restricted to Python >=3.7,<3.12
54+
55+
```bash
56+
conda create -n taskvine-env python=3.11
57+
conda activate taskvine-env
58+
conda install -c jinzhou5042 taskvine-report-tool
3359
```

LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

conda-recipe/.conda-build-ignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
logs/
2+
__pycache__/
3+
*.log
4+
imgs/
5+

conda-recipe/LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2024 Collaborative Computing Lab (CCL), University of Notre Dame
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

conda-recipe/meta.yaml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{% set name = "taskvine-report-tool" %}
2+
{% set version = "3.2.7.1" %}
3+
4+
package:
5+
name: {{ name|lower }}
6+
version: {{ version }}
7+
8+
source:
9+
path: ../
10+
11+
build:
12+
noarch: python
13+
script: "{{ PYTHON }} -m pip install . -vv"
14+
number: 0
15+
entry_points:
16+
- vine_parse = taskvine_report.cli.parse:main
17+
- vine_report = taskvine_report.cli.report:main
18+
19+
requirements:
20+
host:
21+
- python >=3.7,<3.12
22+
- pip
23+
- setuptools
24+
- python-graphviz
25+
- tqdm
26+
- bitarray
27+
- pandas
28+
- cloudpickle
29+
- rich
30+
- flask
31+
- pytz
32+
run:
33+
- python >=3.7,<3.12
34+
- flask
35+
- pandas
36+
- cloudpickle
37+
- rich
38+
- tqdm
39+
- bitarray
40+
- pytz
41+
- python-graphviz
42+
43+
test:
44+
imports:
45+
- taskvine_report
46+
- taskvine_report.cli
47+
- taskvine_report.routes
48+
- taskvine_report.src
49+
commands:
50+
- vine_parse --help
51+
- vine_report --help
52+
53+
about:
54+
home: https://github.com/cooperative-computing-lab/taskvine-report-tool
55+
license: MIT
56+
license_family: MIT
57+
license_file: LICENSE
58+
summary: "Visualization and analysis tool for TaskVine execution logs"
59+
description: |
60+
TaskVine Report Tool provides visualization and analysis capabilities
61+
for TaskVine execution logs, enabling users to monitor and analyze
62+
distributed computing workflows.
63+
doc_url: https://ccl.cse.nd.edu/software/taskvine/
64+
dev_url: https://github.com/cooperative-computing-lab/taskvine-report-tool
65+
66+
extra:
67+
recipe-maintainers:
68+
- jzhou24

setup.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,26 @@
55
Traditional setup.py configuration for reliable PyPI packaging.
66
"""
77

8-
from setuptools import setup, find_packages
8+
from setuptools import setup
99
import os
10-
import sys
10+
import re
1111

12-
# Add the package directory to path to import version
13-
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'taskvine_report'))
14-
from taskvine_report import __version__
12+
def get_version():
13+
"""Read version from __init__.py without importing the package"""
14+
init_path = os.path.join(os.path.dirname(__file__), 'taskvine_report', '__init__.py')
15+
with open(init_path, 'r', encoding='utf-8') as f:
16+
content = f.read()
17+
version_match = re.search(r'^__version__ = [\'"]([^\'"]*)[\'"]', content, re.M)
18+
if version_match:
19+
return version_match.group(1)
20+
raise RuntimeError('Unable to find version string.')
1521

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

1925
setup(
2026
name="taskvine-report-tool",
21-
version=__version__,
27+
version=get_version(),
2228
author="Collaborative Computing Lab (CCL), University of Notre Dame",
2329
author_email="[email protected]",
2430
description="Visualization and analysis tool for TaskVine execution logs",
@@ -47,7 +53,7 @@
4753
"Topic :: System :: Distributed Computing",
4854
"Topic :: System :: Monitoring",
4955
],
50-
python_requires=">=3.7",
56+
python_requires=">=3.7,<3.12",
5157
install_requires=[
5258
"flask>=2.0.0",
5359
"pandas>=1.3.0",

taskvine_report/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Visualization and analysis tool for TaskVine execution logs.
55
"""
66

7-
__version__ = "3.2.7.0"
7+
__version__ = "3.2.7.1"
88
__author__ = "Collaborative Computing Lab (CCL), University of Notre Dame"
99
__email__ = "[email protected]"
1010

0 commit comments

Comments
 (0)