preparing packages for release

maxkahan · maxkahan · commit 7736da039f24 · 2024-02-15T04:20:24.000Z
diff --git a/http_client/BUILD b/http_client/BUILD
@@ -4,7 +4,7 @@ files(sources=['tests/data/*'])
 
 python_distribution(
     name='vonage-http-client',
-    dependencies=[':pyproject', 'http_client/src/http_client'],
+    dependencies=[':pyproject', 'http_client/src/http_client', 'utils/src/utils'],
     provides=python_artifact(),
     generate_setup=False,
     repositories=['https://test.pypi.org/legacy/'],
diff --git a/http_client/pyproject.toml b/http_client/pyproject.toml
@@ -1,8 +1,30 @@
 [project]
 name = 'vonage-http-client'
-description = 'An asynchronous HTTP client for making requests to Vonage APIs.'
 version = '0.1.0'
-dependencies = ['vonage-jwt', 'requests']
+description = 'An HTTP client for making requests to Vonage APIs.'
+readme = "README.md"
+authors = [{ name = "Vonage", email = "devrel@vonage.com" }]
+requires-python = ">=3.8"
+dependencies = [
+  "vonage-utils>=0.1.0",
+  "vonage-jwt>=1.1.0",
+  "requests==2.*",
+  "pydantic>=2.6.1",
+  "typing_extensions>=4.9.0",
+]
+classifiers = [
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "License :: OSI Approved :: Apache Software License",
+]
+
+[project.urls]
+homepage = "https://github.com/Vonage/vonage-python-sdk"
 
 [build-system]
 requires = ["setuptools>=61.0", "wheel"]
diff --git a/http_client/src/http_client/http_client.py b/http_client/src/http_client/http_client.py
@@ -16,7 +16,7 @@
 from requests.sessions import Session
 from typing_extensions import Annotated
 
-logger = getLogger('vonage-http-client-v2')
+logger = getLogger('vonage')
 
 
 class HttpClientOptions(BaseModel):
diff --git a/http_client/tests/BUILD b/http_client/tests/BUILD
@@ -1 +1 @@
-python_tests(dependencies=['http_client', 'utils'])
+python_tests(dependencies=['http_client'])
diff --git a/number_insight_v2/BUILD b/number_insight_v2/BUILD
@@ -4,7 +4,11 @@ files(sources=['tests/data/*'])
 
 python_distribution(
     name='vonage-number-insight-v2',
-    dependencies=[':pyproject', 'number_insight_v2/src/number_insight_v2', 'utils'],
+    dependencies=[
+        ':pyproject',
+        'number_insight_v2/src/number_insight_v2',
+        'utils/src/utils',
+    ],
     provides=python_artifact(),
     generate_setup=False,
     repositories=['https://test.pypi.org/legacy/'],
diff --git a/number_insight_v2/pyproject.toml b/number_insight_v2/pyproject.toml
@@ -1,11 +1,15 @@
 [project]
 name = 'vonage-number-insight-v2'
-description = 'Vonage Number Insight v2 package'
 version = '0.1.0'
+description = 'Vonage Number Insight v2 package'
 readme = "README.md"
 authors = [{ name = "Vonage", email = "devrel@vonage.com" }]
-license = "Apache"
-homepage = "https://github.com/Vonage/vonage-python-sdk"
+requires-python = ">=3.8"
+dependencies = [
+  "vonage-http-client>=0.1.0",
+  "vonage-utils>=0.1.0",
+  "pydantic>=2.6.1",
+]
 classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
@@ -14,10 +18,11 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "License :: OSI Approved :: Apache Software License",
 ]
 
-[project.python-requires]
-python_version = ">=3.8"
+[project.urls]
+homepage = "https://github.com/Vonage/vonage-python-sdk"
 
 [build-system]
 requires = ["setuptools>=61.0", "wheel"]
diff --git a/number_insight_v2/src/number_insight_v2/errors.py b/number_insight_v2/src/number_insight_v2/errors.py
@@ -1,4 +1,4 @@
-from errors import VonageError
+from utils.errors import VonageError
 
 
 class NumberInsightV2Error(VonageError):
diff --git a/number_insight_v2/tests/test_number_insight_v2.py b/number_insight_v2/tests/test_number_insight_v2.py
@@ -13,7 +13,7 @@
     NumberInsightV2,
 )
 from testing_utils import build_response
-from utils import remove_none_values
+from utils.utils import remove_none_values
 
 path = abspath(__file__)
 
diff --git a/pants.toml b/pants.toml
@@ -31,6 +31,7 @@ filter = [
   'vonage/src',
   'http_client/src',
   'number_insight_v2/src',
+  'utils/src',
   'testing_utils',
 ]
 
diff --git a/testing_utils/BUILD b/testing_utils/BUILD
@@ -1 +1 @@
-python_sources()
+python_sources(name='testing_utils')
diff --git a/utils/BUILD b/utils/BUILD
@@ -2,7 +2,7 @@ resource(name='pyproject', source='pyproject.toml')
 
 python_distribution(
     name='vonage-utils',
-    dependencies=[':pyproject'],
+    dependencies=[':pyproject', 'utils/src/utils'],
     provides=python_artifact(),
     generate_setup=False,
     repositories=['https://test.pypi.org/legacy/'],
diff --git a/utils/pyproject.toml b/utils/pyproject.toml
@@ -18,7 +18,6 @@ classifiers = [
 
 [project.urls]
 homepage = "https://github.com/Vonage/vonage-python-sdk"
-documentation = "https://developer.vonage.com"
 
 [build-system]
 requires = ["setuptools>=61.0", "wheel"]
diff --git a/utils/src/utils/BUILD b/utils/src/utils/BUILD
@@ -1 +1 @@
-python_sources()
+python_sources(name='utils')
diff --git a/utils/src/utils/utils.py b/utils/src/utils/utils.py
@@ -1,7 +1,7 @@
 from re import search
 from typing import Union
 
-from errors import InvalidPhoneNumberError, InvalidPhoneNumberTypeError
+from utils.errors import InvalidPhoneNumberError, InvalidPhoneNumberTypeError
 
 
 def format_phone_number(number: Union[str, int]) -> str:
diff --git a/utils/tests/BUILD b/utils/tests/BUILD
@@ -1 +1 @@
-python_tests(dependencies=['utils'])
+python_tests(dependencies=['utils/src/utils'])
diff --git a/utils/tests/test_format_phone_number.py b/utils/tests/test_format_phone_number.py
@@ -1,7 +1,7 @@
-from errors import InvalidPhoneNumberError, InvalidPhoneNumberTypeError
 from pytest import raises
+from utils.errors import InvalidPhoneNumberError, InvalidPhoneNumberTypeError
 
-from utils import format_phone_number
+from utils.utils import format_phone_number
 
 
 def test_format_phone_numbers():
diff --git a/vonage/pyproject.toml b/vonage/pyproject.toml
@@ -1,8 +1,28 @@
 [project]
 name = 'vonage'
-description = 'Python Server SDK for using Vonage APIs'
 version = '4.0.1a0'
+description = 'Python Server SDK for using Vonage APIs'
+readme = "README.md"
+authors = [{ name = "Vonage", email = "devrel@vonage.com" }]
+requires-python = ">=3.8"
+dependencies = [
+  "vonage-utils>=0.1.0",
+  "vonage-http-client>=0.1.0",
+  "vonage-number-insight-v2>=0.1.0",
+]
+classifiers = [
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "License :: OSI Approved :: Apache Software License",
+]
 
+[project.urls]
+homepage = "https://github.com/Vonage/vonage-python-sdk"
 
 [build-system]
 requires = ["setuptools>=61.0", "wheel"]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-python_tests(dependencies=['http_client', 'utils'])`
	`1`	`+python_tests(dependencies=['http_client'])`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from errors import VonageError`
	`1`	`+from utils.errors import VonageError`
`2`	`2`
`3`	`3`
`4`	`4`	`class NumberInsightV2Error(VonageError):`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`NumberInsightV2,`
`14`	`14`	`)`
`15`	`15`	`from testing_utils import build_response`
`16`		`-from utils import remove_none_values`
	`16`	`+from utils.utils import remove_none_values`
`17`	`17`
`18`	`18`	`path = abspath(__file__)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ filter = [`
`31`	`31`	`'vonage/src',`
`32`	`32`	`'http_client/src',`
`33`	`33`	`'number_insight_v2/src',`
	`34`	`+ 'utils/src',`
`34`	`35`	`'testing_utils',`
`35`	`36`	`]`
`36`	`37`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-python_sources()`
	`1`	`+python_sources(name='testing_utils')`