Skip to content

Commit

Permalink
setup.py -> pyproject.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
lizgehret authored Dec 19, 2024
2 parents c26af33 + ca6bd2e commit 4f48fa0
Show file tree
Hide file tree
Showing 14 changed files with 124 additions and 2,453 deletions.
12 changes: 12 additions & 0 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: dfb0404
_src_path: https://github.com/qiime2/q2-setup-template.git
module_name: composition
plugin_name: q2_composition
plugin_scripts: q2_composition/assets/run_ancombc.R
project_author_email: [email protected]
project_author_name: Jamie Morton
project_description: Compositional statistics plugin for QIIME2.
project_name: q2-composition
project_urls_homepage: https://qiime2.org
project_urls_repository: https://github.com/qiime2/q2-composition
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
q2_composition/_version.py export-subst
pyproject.toml export-subst
3 changes: 2 additions & 1 deletion .github/workflows/ci-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ jobs:
ci:
uses: qiime2/distributions/.github/workflows/lib-ci-dev.yaml@dev
with:
distro: amplicon
distro: amplicon
recipe-path: 'conda-recipe'
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,7 @@ input.map.txt
output.summary.txt

.DS_Store

# Version file from versioningit
_version.py

2 changes: 0 additions & 2 deletions MANIFEST.in

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test-cov: all
py.test --cov=q2_composition

install: all
$(PYTHON) setup.py install
$(PYTHON) -m pip install -v .

dev: all
pip install -e .
Expand Down
53 changes: 0 additions & 53 deletions ci/recipe/meta.yaml

This file was deleted.

47 changes: 47 additions & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package:
name: q2-composition
version: {{ PLUGIN_VERSION }}
source:
path: ..
build:
script: make install
requirements:
host:
- python {{ python }}
- setuptools
- versioningit
- wheel
run:
- python {{ python }}
- scikit-bio {{ scikit_bio }}
- biom-format {{ biom_format }}
- scipy {{ scipy }}
- pandas {{ pandas }}
- formulaic
- bioconductor-phyloseq
- bioconductor-ancombc
- r-tidyverse
- r-optparse
- r-frictionless
- qiime2 {{ qiime2_epoch }}.*
- q2templates {{ qiime2_epoch }}.*
- q2-types {{ qiime2_epoch }}.*
- altair
build:
- setuptools
- versioningit
test:
requires:
- qiime2 >={{ qiime2 }}
- q2templates >={{ q2templates }}
- q2-types >={{ q2_types }}
- pytest
imports:
- q2_composition
- qiime2.plugins.composition
commands:
- py.test --pyargs q2_composition
about:
home: https://qiime2.org
license: BSD-3-Clause
license_family: BSD
53 changes: 53 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
[project]
name = "q2-composition"
authors = [
{ name = "Jamie Morton", email = "[email protected]" }
]
description = "Compositional statistics plugin for QIIME2."
readme = {file = "README.md", content-type = "text/markdown"}
license = {file = "LICENSE"}
dynamic = ["version"]

[project.urls]
Homepage = "https://qiime2.org"
Repository = "https://github.com/qiime2/q2-composition"

[project.entry-points.'qiime2.plugins']
"q2-composition" = "q2_composition.plugin_setup:plugin"

[build-system]
requires = [
"setuptools",
"versioningit",
"wheel"
]
build-backend = "setuptools.build_meta"

[tool.versioningit.vcs]
method = "git-archive"
describe-subst = "$Format:%(describe)$"
default-tag = "0.0.1"

[tool.versioningit.next-version]
method = "minor"

[tool.versioningit.format]
distance = "{base_version}+{distance}.{vcs}{rev}"
dirty = "{base_version}+{distance}.{vcs}{rev}.dirty"
distance-dirty = "{base_version}+{distance}.{vcs}{rev}.dirty"

[tool.versioningit.write]
file = "q2-composition/_version.py"

[tool.setuptools]
include-package-data = true
script-files = [
"q2_composition/assets/run_ancombc.R"
]

[tool.setuptools.packages.find]
where = ["."]
include = ["q2_composition*"]

[tool.setuptools.package-data]
q2_composition = ["**/*"]
7 changes: 4 additions & 3 deletions q2_composition/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# The full license is in the file LICENSE, distributed with this software.
# ----------------------------------------------------------------------------

from ._version import get_versions

from ._format import (FrictionlessCSVFileFormat,
DataPackageSchemaFileFormat,
Expand All @@ -19,8 +18,10 @@
from ._dataloaf_tabulate import tabulate
from ._diff_abundance_plots import da_barplot

__version__ = get_versions()['version']
del get_versions
try:
from ._version import __version__
except ModuleNotFoundError:
__version__ = '0.0.0+notfound'

__all__ = ['FrictionlessCSVFileFormat', 'DataPackageSchemaFileFormat',
'DataLoafPackageDirFmt', 'DifferentialAbundance', 'add_pseudocount',
Expand Down
Loading

0 comments on commit 4f48fa0

Please sign in to comment.