Update pyproject.toml and setup

Author: jacalata

.gitattributes

@@ -1 +1,2 @@
 tableauserverclient/_version.py export-subst
+tableauserverclient/bin/_version.py export-subst

MANIFEST.in

@@ -4,8 +4,6 @@ include CONTRIBUTORS.md
 include LICENSE
 include LICENSE.versioneer
 include README.md
-include tableauserverclient/_version.py
-include versioneer.py
 recursive-include docs *.md
 recursive-include samples *.py
 recursive-include samples *.txt
@@ -18,5 +16,4 @@ recursive-include test *.png
 recursive-include test *.py
 recursive-include test *.xml
 recursive-include test *.tde
-global-include *.pyi
 global-include *.typed

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=75.0", "versioneer[toml]==0.29", "wheel"]
+requires = ["setuptools>=77.0", "versioneer[toml]==0.29", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -8,7 +8,7 @@ name="tableauserverclient"
 dynamic = ["version"]
 description='A Python module for working with the Tableau Server REST API.'
 authors = [{name="Tableau", email="[email protected]"}]
-license = {file = "LICENSE"}
+license-files = ["LICENSE"]
 readme = "README.md"
 
 dependencies = [
@@ -35,6 +35,12 @@ repository = "https://github.com/tableau/server-client-python"
 test = ["black==24.8", "build", "mypy==1.4", "pytest>=7.0", "pytest-cov", "pytest-subtests",
     "requests-mock>=1.0,<2.0"]
 
+[tool.setuptools.packages.find]
+where = ["tableauserverclient", "tableauserverclient.helpers", "tableauserverclient.models", "tableauserverclient.server", "tableauserverclient.server.endpoint"]
+
+[tool.setuptools.dynamic]
+version = {attr = "versioneer.get_version"}
+
 [tool.black]
 line-length = 120
 target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
@@ -61,5 +67,5 @@ addopts = "--junitxml=./test.junit.xml"
 VCS = "git"
 style = "pep440-pre"
 versionfile_source = "tableauserverclient/bin/_version.py"
-versionfile_build = "tableauserverclient/bin/_version.py"
+versionfile_build = "_version.py"
 tag_prefix = "v"

setup.py

@@ -2,14 +2,7 @@
 from setuptools import setup
 
 setup(
-    version=versioneer.get_version(),
-    cmdclass=versioneer.get_cmdclass(),
-    # not yet sure how to move this to pyproject.toml
-    packages=[
-        "tableauserverclient",
-        "tableauserverclient.helpers",
-        "tableauserverclient.models",
-        "tableauserverclient.server",
-        "tableauserverclient.server.endpoint",
-    ],
+    # This line is required to set the version number when building the wheel
+    # not yet sure how to move this to pyproject.toml - it may require work in versioneer
+    cmdclass=versioneer.get_cmdclass()
 )

tableauserverclient/__init__.py

@@ -139,7 +139,3 @@
     "WeeklyInterval",
     "WorkbookItem",
 ]
-
-from .bin import _version
-
-__version__ = _version.get_versions()["version"]

tableauserverclient/bin/__init__.py

@@ -0,0 +1,3 @@
+# generated during initial setup of versioneer
+from . import _version
+__version__ = _version.get_versions()['version']

tableauserverclient/bin/_version.py

@@ -46,14 +46,13 @@ class VersioneerConfig:
 
 def get_config() -> VersioneerConfig:
     """Create, populate and return the VersioneerConfig() object."""
-    # these strings are filled in when 'setup.py versioneer' creates
-    # _version.py
+    # these strings are filled in from pyproject.toml at file generation time
     cfg = VersioneerConfig()
     cfg.VCS = "git"
     cfg.style = "pep440-pre"
     cfg.tag_prefix = "v"
     cfg.parentdir_prefix = "None"
-    cfg.versionfile_source = "tableauserverclient/_version.py"
+    cfg.versionfile_source = "tableauserverclient/bin/_version.py"
     cfg.verbose = False
     return cfg