diff --git a/aws_advanced_python_wrapper/database_dialect.py b/aws_advanced_python_wrapper/database_dialect.py index f04b197b..4d997e7d 100644 --- a/aws_advanced_python_wrapper/database_dialect.py +++ b/aws_advanced_python_wrapper/database_dialect.py @@ -17,7 +17,7 @@ from typing import (TYPE_CHECKING, Callable, ClassVar, Dict, Optional, Protocol, Tuple, runtime_checkable) -from .utils.driver_info import DriverInfo +from aws_advanced_python_wrapper.driver_info import DriverInfo if TYPE_CHECKING: from aws_advanced_python_wrapper.pep249 import Connection diff --git a/aws_advanced_python_wrapper/utils/driver_info.py b/aws_advanced_python_wrapper/driver_info.py similarity index 70% rename from aws_advanced_python_wrapper/utils/driver_info.py rename to aws_advanced_python_wrapper/driver_info.py index b751bb4d..c6c7c77e 100644 --- a/aws_advanced_python_wrapper/utils/driver_info.py +++ b/aws_advanced_python_wrapper/driver_info.py @@ -12,9 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os +from pathlib import Path + import toml +PROJECT_DIR = Path(__file__).parent.parent +PYPROJECT = toml.load(os.path.join(PROJECT_DIR, "pyproject.toml")) + class DriverInfo: - DRIVER_NAME = "Amazon Web Services (AWS) Advanced Python Wrapper" - DRIVER_VERSION = toml.load("pyproject.toml")["tool"]["poetry"]["version"] + DRIVER_NAME = PYPROJECT["tool"]["poetry"]["description"] + DRIVER_VERSION = PYPROJECT["tool"]["poetry"]["version"] diff --git a/pyproject.toml b/pyproject.toml index b91b47b2..f231a3c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,6 +5,22 @@ description = "Amazon Web Services (AWS) Advanced Python Wrapper" authors = ["Amazon Web Services"] readme = "README.md" license = "Apache-2.0" +include = ["CONTRIBUTING.md"] +repository = "https://github.com/awslabs/aws-advanced-python-wrapper" +documentation = "https://github.com/awslabs/aws-advanced-python-wrapper/docs/" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Natural Language :: English", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", +] [tool.poetry.dependencies] python = "^3.8.1" diff --git a/tests/integration/container/utils/rds_test_utility.py b/tests/integration/container/utils/rds_test_utility.py index fd7de040..ba166b57 100644 --- a/tests/integration/container/utils/rds_test_utility.py +++ b/tests/integration/container/utils/rds_test_utility.py @@ -30,8 +30,8 @@ import pytest from botocore.config import Config +from aws_advanced_python_wrapper.driver_info import DriverInfo from aws_advanced_python_wrapper.errors import UnsupportedOperationError -from aws_advanced_python_wrapper.utils.driver_info import DriverInfo from aws_advanced_python_wrapper.utils.log import Logger from aws_advanced_python_wrapper.utils.messages import Messages from .database_engine import DatabaseEngine diff --git a/tests/unit/test_dialect.py b/tests/unit/test_dialect.py index a2555471..4830f291 100644 --- a/tests/unit/test_dialect.py +++ b/tests/unit/test_dialect.py @@ -21,9 +21,9 @@ AuroraMysqlDialect, AuroraPgDialect, DatabaseDialectManager, DialectCode, MultiAzMysqlDialect, MysqlDatabaseDialect, PgDatabaseDialect, RdsMysqlDialect, RdsPgDialect, TargetDriverType, UnknownDatabaseDialect) +from aws_advanced_python_wrapper.driver_info import DriverInfo from aws_advanced_python_wrapper.errors import AwsWrapperError from aws_advanced_python_wrapper.hostinfo import HostInfo -from aws_advanced_python_wrapper.utils.driver_info import DriverInfo from aws_advanced_python_wrapper.utils.properties import (Properties, WrapperProperties)