Skip to content

Commit e373cf4

Browse files
authored
Update versioneer (#1547)
* update versioneer, exclude from linter
1 parent 28952e4 commit e373cf4

File tree

6 files changed

+304
-2023
lines changed

6 files changed

+304
-2023
lines changed

pyproject.toml

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools>=68.0", "versioneer>=0.29", "wheel"]
2+
requires = ["setuptools>=75.0", "versioneer[toml]==0.29", "wheel"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
@@ -16,7 +16,7 @@ dependencies = [
1616
'packaging>=23.1', # latest as at 7/31/23
1717
'requests>=2.32', # latest as at 7/31/23
1818
'urllib3>=2.2.2,<3',
19-
'typing_extensions>=4.0.1',
19+
'typing_extensions>=4.0',
2020
]
2121
requires-python = ">=3.9"
2222
classifiers = [
@@ -38,6 +38,7 @@ test = ["black==24.8", "build", "mypy==1.4", "pytest>=7.0", "pytest-cov", "pytes
3838
[tool.black]
3939
line-length = 120
4040
target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
41+
force-exclude = "tableauserverclient/bin/*"
4142

4243
[tool.mypy]
4344
check_untyped_defs = false
@@ -50,7 +51,15 @@ show_error_codes = true
5051
ignore_missing_imports = true # defusedxml library has no types
5152
no_implicit_reexport = true
5253
implicit_optional = true
54+
exclude = ['/bin/']
5355

5456
[tool.pytest.ini_options]
5557
testpaths = ["test"]
5658
addopts = "--junitxml=./test.junit.xml"
59+
60+
[tool.versioneer]
61+
VCS = "git"
62+
style = "pep440-pre"
63+
versionfile_source = "tableauserverclient/bin/_version.py"
64+
versionfile_build = "tableauserverclient/bin/_version.py"
65+
tag_prefix = "v"

setup.cfg

-10
This file was deleted.

setup.py

-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
import versioneer
22
from setuptools import setup
33

4-
"""
5-
once versioneer 0.25 gets released, we can move this from setup.cfg to pyproject.toml
6-
[tool.versioneer]
7-
VCS = "git"
8-
style = "pep440-pre"
9-
versionfile_source = "tableauserverclient/_version.py"
10-
versionfile_build = "tableauserverclient/_version.py"
11-
tag_prefix = "v"
12-
"""
134
setup(
145
version=versioneer.get_version(),
156
cmdclass=versioneer.get_cmdclass(),

tableauserverclient/__init__.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from tableauserverclient._version import get_versions
1+
from tableauserverclient.bin._version import get_versions
22
from tableauserverclient.namespace import NEW_NAMESPACE as DEFAULT_NAMESPACE
33
from tableauserverclient.models import (
44
BackgroundJobItem,
@@ -133,3 +133,7 @@
133133
"WeeklyInterval",
134134
"WorkbookItem",
135135
]
136+
137+
from .bin import _version
138+
139+
__version__ = _version.get_versions()["version"]

0 commit comments

Comments
 (0)