From e6f8050d998969cd8a5a9782417f1130e35318ee Mon Sep 17 00:00:00 2001 From: Jongmin Kim Date: Tue, 21 May 2024 23:09:16 +0900 Subject: [PATCH] build: fix pydantic package version Signed-off-by: Jongmin Kim --- pkg/pip_requirements.txt | 4 +- src/setup.py | 101 +++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 59 deletions(-) diff --git a/pkg/pip_requirements.txt b/pkg/pip_requirements.txt index 9d90377..e4cc6e3 100644 --- a/pkg/pip_requirements.txt +++ b/pkg/pip_requirements.txt @@ -3,6 +3,8 @@ grpcio grpcio-reflection google-api-core grpcio-health-checking +pydantic==1.* +mongoengine fastapi fastapi-utils uvicorn @@ -21,8 +23,6 @@ python-consul dnspython requests click -pydantic -mongoengine boto3 unittest-xml-reporting factory-boy diff --git a/src/setup.py b/src/setup.py index 8c8db8a..e8a342a 100644 --- a/src/setup.py +++ b/src/setup.py @@ -18,82 +18,69 @@ from setuptools import setup, find_packages setup( - name='spaceone-core', - version=os.environ.get('PACKAGE_VERSION'), - description='Cloudforet Core Library', - long_description='', - url='https://cloudforet.io/', - author='MEGAZONE Cloud Corp.', - author_email='admin@spaceone.dev', - license='Apache License 2.0', + name="spaceone-core", + version=os.environ.get("PACKAGE_VERSION"), + description="Cloudforet Core Library", + long_description="", + url="https://cloudforet.io/", + author="MEGAZONE Cloud Corp.", + author_email="admin@spaceone.dev", + license="Apache License 2.0", packages=find_packages(), install_requires=[ # grpc packages - 'protobuf==3.*', + "protobuf==3.*", # 'grpcio', - 'grpcio-reflection', - 'google-api-core', - 'grpcio-health-checking', - + "grpcio-reflection", + "google-api-core", + "grpcio-health-checking", + # model packages + "pydantic=1.*", + "mongoengine", # fastapi packages - 'fastapi', - 'fastapi-utils', - 'uvicorn', - + "fastapi", + "fastapi-utils", + "uvicorn", # asyncio packages - 'asyncio', - + "asyncio", # data parser packages - 'PyYAML', - 'jsonschema', - + "PyYAML", + "jsonschema", # scheduler packages - 'schedule', - 'scheduler-cron', - + "schedule", + "scheduler-cron", # cache packages - 'redis', - 'cachetools', - + "redis", + "cachetools", # crypto(jwt) packages - 'pycryptodome', - 'jwcrypto', - 'python-jose', - + "pycryptodome", + "jwcrypto", + "python-jose", # utils packages - 'python-dateutil', - 'python-consul', - 'dnspython', - + "python-dateutil", + "python-consul", + "dnspython", # HTTP packages - 'requests', - + "requests", # CLI packages - 'click', - - # model packages - 'pydantic', - 'mongoengine', - + "click", # AWS packages - 'boto3', - + "boto3", # test framework packages - 'unittest-xml-reporting', - 'factory-boy', - 'mongomock', - + "unittest-xml-reporting", + "factory-boy", + "mongomock", # tracing packages - 'opentelemetry-api', - 'opentelemetry-sdk', - 'opentelemetry-exporter-otlp-proto-grpc', - 'opentelemetry-instrumentation-logging', - 'opentelemetry-exporter-prometheus' + "opentelemetry-api", + "opentelemetry-sdk", + "opentelemetry-exporter-otlp-proto-grpc", + "opentelemetry-instrumentation-logging", + "opentelemetry-exporter-prometheus", ], zip_safe=False, entry_points={ - 'console_scripts': [ - 'spaceone = spaceone.core.command:cli', + "console_scripts": [ + "spaceone = spaceone.core.command:cli", ] }, )