Skip to content

Commit 2b2b0c4

Browse files
author
Jongmin Kim
authored
Merge pull request #146 from whdalsrnt/master
build: fix pydantic package version
2 parents 59adffd + e6f8050 commit 2b2b0c4

File tree

2 files changed

+46
-59
lines changed

2 files changed

+46
-59
lines changed

pkg/pip_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ grpcio
33
grpcio-reflection
44
google-api-core
55
grpcio-health-checking
6+
pydantic==1.*
7+
mongoengine
68
fastapi
79
fastapi-utils
810
uvicorn
@@ -21,8 +23,6 @@ python-consul
2123
dnspython
2224
requests
2325
click
24-
pydantic
25-
mongoengine
2626
boto3
2727
unittest-xml-reporting
2828
factory-boy

src/setup.py

Lines changed: 44 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -18,82 +18,69 @@
1818
from setuptools import setup, find_packages
1919

2020
setup(
21-
name='spaceone-core',
22-
version=os.environ.get('PACKAGE_VERSION'),
23-
description='Cloudforet Core Library',
24-
long_description='',
25-
url='https://cloudforet.io/',
26-
author='MEGAZONE Cloud Corp.',
27-
author_email='admin@spaceone.dev',
28-
license='Apache License 2.0',
21+
name="spaceone-core",
22+
version=os.environ.get("PACKAGE_VERSION"),
23+
description="Cloudforet Core Library",
24+
long_description="",
25+
url="https://cloudforet.io/",
26+
author="MEGAZONE Cloud Corp.",
27+
author_email="admin@spaceone.dev",
28+
license="Apache License 2.0",
2929
packages=find_packages(),
3030
install_requires=[
3131
# grpc packages
32-
'protobuf==3.*',
32+
"protobuf==3.*",
3333
# 'grpcio',
34-
'grpcio-reflection',
35-
'google-api-core',
36-
'grpcio-health-checking',
37-
34+
"grpcio-reflection",
35+
"google-api-core",
36+
"grpcio-health-checking",
37+
# model packages
38+
"pydantic=1.*",
39+
"mongoengine",
3840
# fastapi packages
39-
'fastapi',
40-
'fastapi-utils',
41-
'uvicorn',
42-
41+
"fastapi",
42+
"fastapi-utils",
43+
"uvicorn",
4344
# asyncio packages
44-
'asyncio',
45-
45+
"asyncio",
4646
# data parser packages
47-
'PyYAML',
48-
'jsonschema',
49-
47+
"PyYAML",
48+
"jsonschema",
5049
# scheduler packages
51-
'schedule',
52-
'scheduler-cron',
53-
50+
"schedule",
51+
"scheduler-cron",
5452
# cache packages
55-
'redis',
56-
'cachetools',
57-
53+
"redis",
54+
"cachetools",
5855
# crypto(jwt) packages
59-
'pycryptodome',
60-
'jwcrypto',
61-
'python-jose',
62-
56+
"pycryptodome",
57+
"jwcrypto",
58+
"python-jose",
6359
# utils packages
64-
'python-dateutil',
65-
'python-consul',
66-
'dnspython',
67-
60+
"python-dateutil",
61+
"python-consul",
62+
"dnspython",
6863
# HTTP packages
69-
'requests',
70-
64+
"requests",
7165
# CLI packages
72-
'click',
73-
74-
# model packages
75-
'pydantic',
76-
'mongoengine',
77-
66+
"click",
7867
# AWS packages
79-
'boto3',
80-
68+
"boto3",
8169
# test framework packages
82-
'unittest-xml-reporting',
83-
'factory-boy',
84-
'mongomock',
85-
70+
"unittest-xml-reporting",
71+
"factory-boy",
72+
"mongomock",
8673
# tracing packages
87-
'opentelemetry-api',
88-
'opentelemetry-sdk',
89-
'opentelemetry-exporter-otlp-proto-grpc',
90-
'opentelemetry-instrumentation-logging',
91-
'opentelemetry-exporter-prometheus'
74+
"opentelemetry-api",
75+
"opentelemetry-sdk",
76+
"opentelemetry-exporter-otlp-proto-grpc",
77+
"opentelemetry-instrumentation-logging",
78+
"opentelemetry-exporter-prometheus",
9279
],
9380
zip_safe=False,
9481
entry_points={
95-
'console_scripts': [
96-
'spaceone = spaceone.core.command:cli',
82+
"console_scripts": [
83+
"spaceone = spaceone.core.command:cli",
9784
]
9885
},
9986
)

0 commit comments

Comments
 (0)