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 #168

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
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: taxa
plugin_name: q2_taxa
plugin_scripts: null
project_author_email: [email protected]
project_author_name: Matthew Ryan Dillon
project_description: Taxonomic analysis and visualization.
project_name: q2-taxa
project_urls_homepage: https://qiime2.org
project_urls_repository: https://github.com/qiime2/q2-taxa
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
q2_taxa/_version.py export-subst
pyproject.toml export-subst
1 change: 1 addition & 0 deletions .github/workflows/ci-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ jobs:
uses: qiime2/distributions/.github/workflows/lib-ci-dev.yaml@dev
with:
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 @@ -23,7 +23,7 @@ q2_taxa/assets/barplot/dist:
viz-barplot: q2_taxa/assets/barplot/dist

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

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

This file was deleted.

38 changes: 38 additions & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package:
name: q2-taxa
version: {{ PLUGIN_VERSION }}
source:
path: ..
build:
script: make install
requirements:
build:
- nodejs
- setuptools
- versioningit
host:
- python {{ python }}
- setuptools
- versioningit
- wheel
run:
- python {{ python }}
- pandas {{ pandas }}
- qiime2 {{ qiime2_epoch }}.*
- q2templates {{ qiime2_epoch }}.*
- q2-types {{ qiime2_epoch }}.*
test:
commands:
- py.test --pyargs q2_taxa
requires:
- qiime2 >={{ qiime2 }}
- q2templates >={{ q2templates }}
- q2-types >={{ q2_types }}
- pytest
imports:
- q2_taxa
- qiime2.plugins.taxa
about:
home: https://qiime2.org
license: BSD-3-Clause
license_family: BSD
50 changes: 50 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[project]
name = "q2-taxa"
authors = [
{ name = "Matthew Ryan Dillon", email = "[email protected]" }
]
description = "Taxonomic analysis and visualization."
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-taxa"

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

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

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

[tool.setuptools.package-data]
q2_taxa = ["**/*"]
7 changes: 4 additions & 3 deletions q2_taxa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@

from ._method import collapse, filter_table, filter_seqs
from ._visualizer import barplot
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__ = ['barplot', 'collapse', 'filter_table', 'filter_seqs']
Loading
Loading