Skip to content

Commit

Permalink
Merge pull request #104 from Sooyoung98/master
Browse files Browse the repository at this point in the history
Changed parts of code related to Docker and Release
  • Loading branch information
Sooyoung98 authored Jan 6, 2024
2 parents 201c78f + dfc30b6 commit 8c8bf59
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-slim
FROM cloudforet/python-core:1

ENV PYTHONUNBUFFERED 1
ENV SPACEONE_PORT 50051
Expand Down
3 changes: 0 additions & 3 deletions pkg/pip_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
spaceone-core
spaceone-api
spaceone-tester
google-api-python-client
schematics
MarkupSafe>=2.0.0rc2
Expand Down
36 changes: 16 additions & 20 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,29 @@

from setuptools import setup, find_packages

with open('VERSION', 'r') as f:
with open("VERSION", "r") as f:
VERSION = f.read().strip()
f.close()

setup(
name='plugin-google-cloud-services',
name="plugin-google-cloud-services",
version=VERSION,
description='Google cloud service inventory collector',
long_description='',
url='https://www.spaceone.dev/',
author='MEGAZONE SpaceONE Team',
author_email='[email protected]',
license='Apache License 2.0',
description="Google cloud service inventory collector",
long_description="",
url="https://www.spaceone.dev/",
author="MEGAZONE SpaceONE Team",
author_email="[email protected]",
license="Apache License 2.0",
packages=find_packages(),
install_requires=[
'spaceone-core',
'spaceone-api',
'spaceone-tester',
'schematics',
'google-api-python-client',
'MarkupSafe>=2.0.0rc2',
'google-cloud-storage',
'requests',
'beautifulsoup4'
"spaceone-api",
"schematics",
"google-api-python-client",
"MarkupSafe>=2.0.0rc2",
"google-cloud-storage",
"requests",
"beautifulsoup4",
],
package_data={
'spaceone': ['inventory/model/*/*/widget/*.yml']
},
package_data={"spaceone": ["inventory/model/*/*/widget/*.yml"]},
zip_safe=False,
)

0 comments on commit 8c8bf59

Please sign in to comment.