Browse Source

Enable shipyard to use PBR

This PS enables shipyard to use PBR as rest
of the other OpenStack project.

Currently if shipyard is used as a requirement in another
project, the dependencies for shipyard doesn't get installed.
This PS fixes this bug.

Change-Id: I34d452649a886af9d865d4ad51eeab70399fe395
Nishant Kumar 5 months ago
parent
commit
a79733b4d8

+ 3
- 0
images/airflow/Dockerfile View File

@@ -97,6 +97,9 @@ COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/
97 97
 # Change permissions
98 98
 RUN chown -R airflow: ${AIRFLOW_HOME}
99 99
 
100
+# Setting the version explicitly for PBR
101
+ENV PBR_VERSION 0.1a1
102
+
100 103
 # Shipyard
101 104
 #
102 105
 # Shipyard provides core functionality used by the airflow plugins/operators

+ 4
- 0
images/shipyard/Dockerfile View File

@@ -55,10 +55,14 @@ RUN pip3 install -r /home/shipyard/api_requirements.txt
55 55
 COPY ${ctx_base}/shipyard_client/requirements.txt /home/shipyard/client_requirements.txt
56 56
 RUN pip3 install -r /home/shipyard/client_requirements.txt
57 57
 
58
+# Setting the version explicitly for PBR
59
+ENV PBR_VERSION 0.1a1
60
+
58 61
 # Shipyard source and installation
59 62
 COPY ${ctx_base}/shipyard_client /home/shipyard/shipyard_client/
60 63
 RUN cd /home/shipyard/shipyard_client \
61 64
     && python3 setup.py install
65
+
62 66
 COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/
63 67
 RUN cd /home/shipyard/shipyard \
64 68
     && python3 setup.py install

+ 30
- 0
src/bin/shipyard_airflow/setup.cfg View File

@@ -0,0 +1,30 @@
1
+[metadata]
2
+name = shipyard_airflow
3
+summary = Directed acyclic graph controller for Kubernetes and OpenStack control plane life cycle management
4
+description-file = README.md
5
+author = The Airship Authors
6
+home-page = https://airship-shipyard.readthedocs.io/
7
+
8
+classifier =
9
+    Intended Audience :: Information Technology
10
+    Intended Audience :: System Administrators
11
+    License :: OSI Approved :: Apache Software License
12
+    Operating System :: POSIX :: Linux
13
+    Programming Language :: Python
14
+    Programming Language :: Python :: 3
15
+    Programming Language :: Python :: 3.5
16
+    Programming Language :: Python :: 3.6
17
+
18
+[files]
19
+packages =
20
+    shipyard_airflow
21
+
22
+[entry_points]
23
+oslo.config.opts =
24
+    shipyard_api = shipyard_airflow.conf.opts:list_opts
25
+
26
+oslo.policy.policies =
27
+    shipyard_api = shipyard_airflow.policy:list_policies
28
+
29
+console_scripts =
30
+    upgrade_db = shipyard_airflow.shipyard_upgrade_db:upgrade_db

+ 2
- 27
src/bin/shipyard_airflow/setup.py View File

@@ -15,30 +15,5 @@
15 15
 import setuptools
16 16
 
17 17
 setuptools.setup(
18
-    name='shipyard_api',
19
-    version='0.1a1',
20
-    description=('Directed acyclic graph controller for Kubernetes and '
21
-                 'OpenStack control plane life cycle management'),
22
-    url='https://github.com/openstack/airship-shipyard',
23
-    author='The Airship Authors',
24
-    license='Apache 2.0',
25
-    packages=setuptools.find_packages(),
26
-    entry_points={
27
-        'oslo.config.opts':
28
-            'shipyard_api = shipyard_airflow.conf.opts:list_opts',
29
-        'oslo.policy.policies':
30
-            'shipyard_api = shipyard_airflow.policy:list_policies',
31
-        'console_scripts':
32
-            'upgrade_db = shipyard_airflow.shipyard_upgrade_db:upgrade_db',
33
-    },
34
-    classifiers=[
35
-        'Intended Audience :: Information Technology',
36
-        'Intended Audience :: System Administrators',
37
-        'License :: OSI Approved :: Apache Software License',
38
-        'Operating System :: POSIX :: Linux',
39
-        'Programming Language :: Python',
40
-        'Programming Language :: Python :: 3',
41
-        'Programming Language :: Python :: 3.5',
42
-        'Programming Language :: Python :: 3.6',
43
-    ],
44
-)
18
+    setup_requires=['pbr>=2.0.0'],
19
+    pbr=True)

+ 24
- 0
src/bin/shipyard_client/setup.cfg View File

@@ -0,0 +1,24 @@
1
+[metadata]
2
+name = shipyard_client
3
+summary = CLI for shipyard
4
+description-file = README.md
5
+author = The Airship Authors
6
+home-page = https://airship-shipyard.readthedocs.io/
7
+
8
+classifier =
9
+    Intended Audience :: Information Technology
10
+    Intended Audience :: System Administrators
11
+    License :: OSI Approved :: Apache Software License
12
+    Operating System :: POSIX :: Linux
13
+    Programming Language :: Python
14
+    Programming Language :: Python :: 3
15
+    Programming Language :: Python :: 3.5
16
+    Programming Language :: Python :: 3.6
17
+
18
+[files]
19
+packages =
20
+    shipyard_client
21
+
22
+[entry_points]
23
+console_scripts =
24
+    shipyard = shipyard_client.cli.commands:shipyard

+ 2
- 22
src/bin/shipyard_client/setup.py View File

@@ -15,25 +15,5 @@
15 15
 import setuptools
16 16
 
17 17
 setuptools.setup(
18
-    name='shipyard_client',
19
-    version='0.1a1',
20
-    description='CLI for Shipyard',
21
-    url='https://github.com/openstack/airship-shipyard',
22
-    author='The Airship Authors',
23
-    license='Apache 2.0',
24
-    packages=setuptools.find_packages(),
25
-    entry_points={
26
-        'console_scripts':
27
-        'shipyard = shipyard_client.cli.commands:shipyard'
28
-    },
29
-    classifiers=[
30
-        'Intended Audience :: Information Technology',
31
-        'Intended Audience :: System Administrators',
32
-        'License :: OSI Approved :: Apache Software License',
33
-        'Operating System :: POSIX :: Linux',
34
-        'Programming Language :: Python',
35
-        'Programming Language :: Python :: 3',
36
-        'Programming Language :: Python :: 3.5',
37
-        'Programming Language :: Python :: 3.6',
38
-    ],
39
-)
18
+    setup_requires=['pbr>=2.0.0'],
19
+    pbr=True)

Loading…
Cancel
Save