MAINT: setup.py -> pyproject.toml

bokulich-lab · Jan 7, 2025 · a9e308e · a9e308e
2 parents 0f27373 + 5c96b06
commit a9e308e
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 2,401 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-moshpit/_version.py export-subst
+pyproject.toml export-subst
diff --git a/.github/workflows/ci-dev.yaml b/.github/workflows/ci-dev.yaml
@@ -10,3 +10,4 @@ jobs:
     uses: qiime2/distributions/.github/workflows/lib-ci-dev.yaml@dev
     with:
       distro: metagenome
+      recipe-path: 'conda-recipe'
diff --git a/.gitignore b/.gitignore
@@ -72,3 +72,6 @@ runinfo
 
 # vscode
 .vscode/
+
+# Version file from versioningit
+_version.py
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ test: all
 	pytest
 
 install: all
-	$(PYTHON) setup.py install && \
+	$(PYTHON) -m pip install -v . && \
 	mkdir -p $(PREFIX)/etc/conda/activate.d && \
 	cp hooks/50_activate_mosh_tab_completion.sh $(PREFIX)/etc/conda/activate.d/
 

diff --git a/ci/recipe/meta.yaml → conda-recipe/meta.yaml b/ci/recipe/meta.yaml → conda-recipe/meta.yaml
@@ -1,41 +1,36 @@
-{% set data = load_setup_py_data() %}
-{% set version = data.get('version') or 'placehold' %}
-
 package:
   name: moshpit
-  version: {{ version }}
-
+  version: {{ PLUGIN_VERSION }}
 source:
-  path: ../..
-
+  path: ..
 build:
   script: make install
   entry_points:
     - mosh=moshpit.__main__:mosh
-
 requirements:
   host:
-    - python  {{ python }}
+    - python {{ python }}
+    - pip
     - setuptools
-
+    - versioningit
+    - wheel
   run:
-    - python  {{ python }}
+    - python {{ python }}
     - pip
     - click >=8.1
     - qiime2 {{ qiime2_epoch }}.*
     - q2cli {{ qiime2_epoch }}.*
-
+  build:
+  - setuptools
+  - versioningit
 test:
   requires:
     - qiime2 >={{ qiime2 }}
     - pytest
-
   imports:
     - moshpit
-
   commands:
     - mosh --help
-
 about:
   home: https://bokulich-lab.github.io/moshpit-docs/intro.html
   license: BSD-3-Clause

diff --git a/moshpit/__init__.py b/moshpit/__init__.py
@@ -10,10 +10,10 @@
 import qiime2
 import importlib
 
-from ._version import get_versions
-
-__version__ = get_versions()['version']
-del get_versions
+try:
+    from ._version import __version__
+except ModuleNotFoundError:
+    __version__ = '0.0.0+notfound'
 
 
 def __getattr__(name):
@@ -56,4 +56,3 @@ def find_spec(self, name, path=None, target=None):
 
 
 sys.meta_path += [__QIIMEProxyImport()]
-
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		moshpit/_version.py export-subst
		pyproject.toml export-subst