commit eaf9a86e3be0863df6133c94b8fb636fe273f8dd
parent b5de1f4036c3d555acd49906e08d1048c0593e41
Author: Justin-Hoffman <[email protected]>
Date: Mon, 16 Dec 2024 21:59:37 -0700
Add a pyproject.toml file. (#516)
* Add a pyproject.toml file.
Remove setup.py
* version with setuptools_scm
Diffstat:
4 files changed, 55 insertions(+), 81 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ share/python-wheels/
.installed.cfg
*.egg
MANIFEST
+nam/_version.py
# PyInstaller
# Usually these files are written by a python script from a template
diff --git a/nam/_version.py b/nam/_version.py
@@ -1 +0,0 @@
-__version__ = "0.11.1"
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,54 @@
+[build-system]
+requires = ["setuptools>=61", "wheel", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "neural-amp-modeler"
+description = "Neural Amp Modeler"
+authors = [
+ {name = "Steven Atkinson", email = "[email protected]"},
+]
+readme = "README.md"
+license = {file = "LICENSE"}
+requires-python = ">=3.8"
+dependencies = [
+ "auraloss==0.3.0",
+ "matplotlib",
+ "pydantic>=2.0.0",
+ "pytorch_lightning",
+ "scipy",
+ "sounddevice",
+ "tensorboard",
+ "torch",
+ "tqdm",
+ "wavio>=0.0.5",
+]
+dynamic = ["version"]
+
+[project.optional-dependencies]
+# Optional features
+transformers-compat = [
+ "transformers>=4", # Issue-294
+ "numpy<2", # For older PyTorch versions; user must know when to include
+]
+
+test = [
+ "pytest",
+ "pytest-mock",
+ "requests",
+]
+
+[project.urls]
+homepage = "https://github.com/sdatkinson/"
+
+[project.scripts]
+nam = "nam.cli:nam_gui"
+nam-full = "nam.cli:nam_full"
+
+[tool.setuptools_scm]
+version_scheme = "guess-next-dev"
+local_scheme = "no-local-version"
+write_to = "nam/_version.py"
+
+[tool.setuptools]
+packages = ["nam", "nam.train", "nam.train.gui", "nam.train.gui._resources", "nam.models", "nam.models._resources" ]
diff --git a/setup.py b/setup.py
@@ -1,80 +0,0 @@
-# File: setup.py
-# Created Date: 2020-04-08
-# Author: Steven Atkinson ([email protected])
-
-from distutils.util import convert_path
-from setuptools import setup, find_packages
-
-
-def get_additional_requirements():
- additional_requirements = []
- # Issue 294
- try:
- import transformers
-
- # This may not be unnecessarily straict a requirement, but I'd rather
- # fix this promptly than leave a chance that it wouldn't be fixed
- # properly.
- additional_requirements.append("transformers>=4")
- except ModuleNotFoundError:
- pass
-
- # Issue 494
- def get_numpy_requirement() -> str:
- need_numpy_1 = True # Until proven otherwise
- try:
- import torch
-
- version_split = torch.__version__.split(".")
- major = int(version_split[0])
- if major >= 2:
- minor = int(version_split[1])
- if minor >= 3: # Hooray, PyTorch 2.3+!
- need_numpy_1 = False
- except ModuleNotFoundError:
- # Until I see PyTorch 2.3 come out:
- pass
- return "numpy<2" if need_numpy_1 else "numpy"
-
- additional_requirements.append(get_numpy_requirement())
-
- return additional_requirements
-
-
-main_ns = {}
-ver_path = convert_path("nam/_version.py")
-with open(ver_path) as ver_file:
- exec(ver_file.read(), main_ns)
-
-requirements = [
- "auraloss==0.3.0",
- "matplotlib",
- "pydantic>=2.0.0",
- "pytorch_lightning",
- "scipy",
- "sounddevice",
- "tensorboard",
- "torch",
- "transformers>=4", # Issue-294
- "tqdm",
- "wavio>=0.0.5", # Breaking change with older versions
-]
-requirements.extend(get_additional_requirements())
-
-setup(
- name="neural-amp-modeler",
- version=main_ns["__version__"],
- description="Neural amp modeler",
- author="Steven Atkinson",
- author_email="[email protected]",
- url="https://github.com/sdatkinson/",
- install_requires=requirements,
- packages=find_packages(),
- include_package_data=True,
- entry_points={
- "console_scripts": [
- "nam = nam.cli:nam_gui", # GUI trainer
- "nam-full = nam.cli:nam_full", # Full-featured trainer
- ]
- },
-)
