Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

setup.py -> pyproject.toml #367

Closed
wants to merge 1 commit into from
Closed
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
11 changes: 11 additions & 0 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 1cc2227
_src_path: https://github.com/qiime2/q2-setup-template.git
module_name: diversity
plugin_name: q2_diversity
project_author_email: [email protected]
project_author_name: Greg Caporaso
project_description: Core diversity analyses.
project_name: q2-diversity
project_urls_homepage: https://qiime2.org
project_urls_repository: https://github.com/qiime2/q2-diversity
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
q2_diversity/_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'
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 @@ -37,7 +37,7 @@ viz-alpha-group-significance: q2_diversity/_alpha/alpha_group_significance_asset
viz-alpha-rarefaction: q2_diversity/_alpha/alpha_rarefaction_assets/dist

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

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

This file was deleted.

60 changes: 60 additions & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package:
name: q2-diversity
version: {{ PLUGIN_VERSION }}
source:
path: ..
build:
script: make install
requirements:
build:
- nodejs
- setuptools
- versioningit
host:
- python {{ python }}
- setuptools
- versioningit
- wheel
run:
- python {{ python }}
- numpy
- scipy {{ scipy }}
- pandas {{ pandas }}
- statsmodels
- seaborn
- ipywidgets
- scikit-bio {{ scikit_bio }}
- scikit-learn {{ scikit_learn }}
- psutil
- natsort
- biom-format {{ biom_format }}
- qiime2 {{ qiime2_epoch }}.*
- q2templates {{ qiime2_epoch }}.*
- q2-types {{ qiime2_epoch }}.*
- q2-feature-table {{ qiime2_epoch }}.*
- q2-metadata {{ qiime2_epoch }}.*
- q2-emperor {{ qiime2_epoch }}.*
- q2-diversity-lib {{ qiime2_epoch }}.*
- r-base {{ r_base }}
- r-vegan >=2.5_3
- umap-learn
- numba
test:
requires:
- qiime2 >={{ qiime2 }}
- q2templates >={{ q2templates }}
- q2-types >={{ q2_types }}
- q2-feature-table >={{ q2_feature_table }}
- q2-metadata >={{ q2_metadata }}
- q2-emperor >={{ q2_emperor }}
- q2-diversity-lib >={{ q2_diversity_lib }}
- pytest
imports:
- q2_diversity
- qiime2.plugins.diversity
commands:
- py.test --pyargs q2_diversity
about:
home: https://qiime2.org
license: BSD-3-Clause
license_family: BSD
49 changes: 49 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
[project]
name = "q2-diversity"
authors = [
{ name = "Greg Caporaso", email = "[email protected]" }
]
description = "Core diversity analyses."
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-diversity"

[project.entry-points.'qiime2.plugins']
"q2-diversity" = "q2_diversity.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-diversity/_version.py"

[tool.setuptools]
include-package-data = true

[tool.setuptools.packages.find]
where = ["q2_diversity"]

[tool.setuptools.package-data]
q2_diversity = ["**/*"]
7 changes: 4 additions & 3 deletions q2_diversity/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
from ._procrustes import procrustes_analysis, partial_procrustes
from ._core_metrics import core_metrics_phylogenetic, core_metrics
from ._filter import filter_distance_matrix, filter_alpha_diversity
from ._version import get_versions

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


__all__ = ['beta', 'beta_phylogenetic', 'alpha', 'alpha_phylogenetic',
Expand Down
Loading
Loading