Skip to content

Commit fa9c21d

Browse files
Update pyproject.toml
Fixup packaging to use pyproject.toml Update update
1 parent 60db50e commit fa9c21d

File tree

4 files changed

+61
-64
lines changed

4 files changed

+61
-64
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ on:
77
- main
88

99
jobs:
10-
pre-commit:
11-
name: Lint
12-
runs-on: ubuntu-latest
13-
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-python@v5
16-
with:
17-
python-version: '3.11'
18-
- uses: pre-commit/[email protected]
10+
# pre-commit:
11+
# name: Lint
12+
# runs-on: ubuntu-latest
13+
# steps:
14+
# - uses: actions/checkout@v4
15+
# - uses: actions/setup-python@v5
16+
# with:
17+
# python-version: '3.11'
18+
# - uses: pre-commit/[email protected]
1919
test:
2020
name: Test
2121
runs-on: ubuntu-latest
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install dependencies
3030
run: |
3131
python -m pip install --upgrade pip
32-
python -m pip install '.[dev]'
32+
python -m pip install '.[dev,analysis]'
3333
3434
- name: Run tests
3535
run: |
@@ -42,3 +42,22 @@ jobs:
4242
# # This is a quick workaround for doing a proper "parallel" setup:
4343
# # https://github.com/coverallsapp/github-action
4444
# fail-on-error: false
45+
46+
packaging:
47+
name: Packaging
48+
runs-on: ubuntu-latest
49+
steps:
50+
- uses: actions/checkout@v4
51+
- uses: actions/setup-python@v5
52+
with:
53+
python-version: '3.11'
54+
- name: Install dependencies
55+
run: |
56+
python -m pip install --upgrade pip
57+
python -m pip install build twine validate-pyproject[all]
58+
- name: Check and install package
59+
run: |
60+
validate-pyproject pyproject.toml
61+
python -m build
62+
python -m twine check --strict dist/*
63+
python -m pip install dist/*.whl

pyproject.toml

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,51 @@
1-
[build-system]
2-
requires = [
3-
"setuptools>=42",
4-
"setuptools_scm",
5-
"wheel",
6-
]
7-
build-backend = "setuptools.build_meta"
8-
91
[project]
102
name = "sc2ts"
11-
description = "Infer ARGs in tskit format for SARS-Cov2"
3+
description = "Infer ARGs for SARS-Cov2 in tskit format"
124
readme = "README.md"
135
license = {file = "LICENSE"}
146
authors = [
15-
{name = "FIXME", email = "FIXME"},
7+
{name = "Jerome Kelleher", email = "[email protected]"},
168
]
9+
requires-python = ">=3.9"
1710
dependencies = [
1811
"tsinfer",
1912
"pyfaidx",
13+
"tskit>=0.5.3",
14+
"tszip",
15+
"tsinfer>=0.3.0",
16+
"pandas",
17+
"numba",
18+
"tqdm",
19+
"scipy",
20+
"click",
21+
"zarr<2.18",
2022
]
23+
dynamic = ["version"]
2124

2225
[project.optional-dependencies]
2326
dev = [
27+
"msprime",
2428
"pytest",
2529
"pytest-coverage",
2630
]
31+
analysis = [
32+
"matplotlib",
33+
"scikit-learn",
34+
"pandas",
35+
"IPython",
36+
"networkx",
37+
]
38+
39+
[build-system]
40+
requires = [
41+
"setuptools>=42",
42+
"setuptools_scm",
43+
"wheel",
44+
]
45+
build-backend = "setuptools.build_meta"
46+
47+
[tool.setuptools]
48+
packages = ["sc2ts"]
2749

2850
[tool.setuptools_scm]
2951
write_to = "sc2ts/_version.py"

setup.cfg

Lines changed: 0 additions & 35 deletions
This file was deleted.

setup.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)