Skip to content

Commit

Permalink
setup.py -> pyproject.toml (#62)
Browse files Browse the repository at this point in the history
* Transition from setup.py & friends to pyproject.toml

* update entrypoints
  • Loading branch information
q2d2 authored Dec 19, 2024
1 parent cca17f6 commit 7adbe8f
Show file tree
Hide file tree
Showing 14 changed files with 105 additions and 2,456 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: q2galaxy
plugin_name: q2galaxy
plugin_scripts: null
project_author_email: developers@qiime2.org
project_author_name: null
project_description: null
project_name: q2galaxy
project_urls_homepage: null
project_urls_repository: https://github.com/qiime2/q2galaxy
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
q2galaxy/_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'
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,7 @@ __tmp*/
docker/qiime2-*-conda.yml
docker/tools/
docker/qiime2_tool_conf.xml

# 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 @@ -41,7 +41,7 @@ serve: tools
./rendered/tools/

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

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

This file was deleted.

32 changes: 32 additions & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package:
name: q2galaxy
version: {{ PLUGIN_VERSION }}
source:
path: ..
build:
script: make install
entry_points:
- q2galaxy=q2galaxy.__main__:root
requirements:
host:
- python {{ python }}
- setuptools
- versioningit
- wheel
run:
- python {{ python }}
- qiime2 {{ qiime2_epoch }}.*
- click
- lxml
build:
- setuptools
- versioningit
test:
requires:
- qiime2 >={{ qiime2 }}
imports:
- q2galaxy
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 = "q2galaxy"
authors = [
{ name = "None", email = "developers@qiime2.org" }
]
description = "None"
readme = {file = "README.md", content-type = "text/markdown"}
license = {file = "LICENSE"}
dynamic = ["version"]

[project.urls]
Homepage = "https://github.com/qiime2/q2galaxy"
Repository = "https://github.com/qiime2/q2galaxy"

[project.scripts]
"q2galaxy" = "q2galaxy.__main__:root"

[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 = "q2galaxy/_version.py"

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

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

[tool.setuptools.package-data]
q2galaxy = ["**/*"]
7 changes: 4 additions & 3 deletions q2galaxy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
__all__ = ['template_action', 'template_plugin', 'template_builtins',
'template_all']

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

0 comments on commit 7adbe8f

Please sign in to comment.