Skip to content

Commit ae47ee2

Browse files
committed
No longer using setuptools and importlib as direct dependencies
1 parent c60f4ea commit ae47ee2

5 files changed

Lines changed: 8 additions & 12 deletions

File tree

arango/client.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
from json import dumps, loads
44
from typing import Any, Callable, Optional, Sequence, Union
55

6-
import importlib_metadata
7-
6+
from arango import version
87
from arango.connection import (
98
BasicConnection,
109
Connection,
@@ -175,8 +174,7 @@ def version(self) -> str:
175174
:return: Client version.
176175
:rtype: str
177176
"""
178-
version: str = importlib_metadata.version("python-arango")
179-
return version
177+
return version.__version__
180178

181179
@property
182180
def request_timeout(self) -> Any:

arango/request.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from typing import Any, MutableMapping, Optional
44

5+
from arango import version
56
from arango.typings import DriverFlags, Fields, Headers, Params
67

78

@@ -12,7 +13,7 @@ def normalize_headers(
1213
if driver_flags is not None:
1314
for flag in driver_flags:
1415
flags = flags + flag + ";"
15-
driver_version = "8.2.5"
16+
driver_version = version.__version__
1617
driver_header = "python-arango/" + driver_version + " (" + flags + ")"
1718
normalized_headers: Headers = {
1819
"charset": "utf-8",

docs/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
requests_toolbelt
2-
importlib_metadata
32
PyJWT
43
sphinx_rtd_theme

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ dependencies = [
3939
"requests",
4040
"requests_toolbelt",
4141
"PyJWT",
42-
"setuptools>=42",
43-
"importlib_metadata>=4.7.1",
4442
"packaging>=23.1",
4543
]
4644

tests/test_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import pickle
33
from typing import Union
44

5-
import importlib_metadata
65
import pytest
76
from requests import Session
87

8+
from arango import version
99
from arango.client import ArangoClient
1010
from arango.database import StandardDatabase
1111
from arango.exceptions import ArangoClientError, ServerConnectionError
@@ -23,7 +23,7 @@ def test_client_attributes(url):
2323
http_client = DefaultHTTPClient()
2424

2525
client = ArangoClient(hosts=url, http_client=http_client)
26-
assert client.version == importlib_metadata.version("python-arango")
26+
assert client.version == version.__version__
2727
assert client.hosts == [url]
2828

2929
assert repr(client) == f"<ArangoClient {url}>"
@@ -38,7 +38,7 @@ def test_client_attributes(url):
3838
serializer=json.dumps,
3939
deserializer=json.loads,
4040
)
41-
assert client.version == importlib_metadata.version("python-arango")
41+
assert client.version == version.__version__
4242
assert client.hosts == client_hosts
4343
assert repr(client) == client_repr
4444
assert isinstance(client._host_resolver, FallbackHostResolver)
@@ -50,7 +50,7 @@ def test_client_attributes(url):
5050
serializer=json.dumps,
5151
deserializer=json.loads,
5252
)
53-
assert client.version == importlib_metadata.version("python-arango")
53+
assert client.version == version.__version__
5454
assert client.hosts == client_hosts
5555
assert repr(client) == client_repr
5656
assert isinstance(client._host_resolver, RandomHostResolver)

0 commit comments

Comments
 (0)