Merge pull request #3 from peterk87/fix/pypi-install-issue

Fix PyPI installation issue

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1 (2023-11-28)
+
+* Fix issue with PyPI installation
+
 ## 1.0.0 (2023-05-19)
 
 * Added support for [Bcftools][] and [Clair3][] VCFs

pyproject.toml

@@ -1,6 +1,10 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
 [project]
 name = "xlavir"
-version = "1.0.0"
+dynamic = ["version"]
 description = "Excel report from viral sequencing analysis output"
 authors = [
     { name = "Peter Kruczkiewicz", email = "[email protected]" }
@@ -47,6 +51,9 @@ dependencies = [
     'pysam',
 ]
 
+[project.scripts]
+xlavir = "xlavir.cli:app"
+
 [project.optional-dependencies]
 dev = [
     "twine",
@@ -60,8 +67,14 @@ test = [
     "pytest-runner",
 ]
 
-[tool.setuptools]
-py-modules = ["xlavir"]
+[tool.hatch.build.targets.wheel]
+only-include = [
+  "xlavir",
+]
+
+[tool.hatch.version]
+path = "xlavir/__about__.py"
+
 
 [tool.pytest.ini_options]
 minversion = "6.0"
@@ -83,13 +96,7 @@ module = [
     "pandas",
 ]
 
-[project.scripts]
-xlavir = "xlavir.cli:app"
-
 [project.urls]
 "Homepage" = "https://github.com/CFIA-NCFAD/xlavir"
 "Repository" = "https://github.com/CFIA-NCFAD/xlavir.git"
 "Bug Tracker" = "https://github.com/CFIA-NCFAD/xlavir/issues"
-
-[build-system]
-requires = ["setuptools", "wheel"]

xlavir/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.0.1"

xlavir/__init__.py

@@ -1,5 +0,0 @@
-"""Top-level package for xlavir."""
-
-import importlib.metadata
-
-__version__ = importlib.metadata.version(__package__ or __name__)

xlavir/cli.py

@@ -9,7 +9,7 @@
 from rich.logging import RichHandler
 import pandas as pd
 
-from xlavir import __version__
+from xlavir.__about__ import __version__
 from xlavir.images import get_images_for_sheets
 from xlavir.io.excel_sheet_dataframe import ExcelSheetDataFrame, SheetName
 from xlavir.qc import QualityRequirements

xlavir/io/xl.py

@@ -15,7 +15,7 @@
 from xlavir.io.excel_sheet_dataframe import ExcelSheetDataFrame, SheetName
 from xlavir.qc import QualityRequirements
 from xlavir.util import get_col_widths, get_row_heights
-from xlavir import __version__
+from xlavir.__about__ import __version__
 
 logger = logging.getLogger(__name__)