Browse Source

Merge "Enable using PBR for package library"

Zuul 5 months ago
parent
commit
43c85a3953
4 changed files with 34 additions and 17 deletions
  1. 3
    0
      Dockerfile
  2. 28
    0
      setup.cfg
  3. 2
    16
      setup.py
  4. 1
    1
      test-requirements.txt

+ 3
- 0
Dockerfile View File

@@ -31,6 +31,9 @@ WORKDIR /opt/promenade
31 31
 ENV PORT 9000
32 32
 EXPOSE $PORT
33 33
 
34
+# Setting promenade version for BPR
35
+ENV PBR_VERSION 0.8.0
36
+
34 37
 ENTRYPOINT ["/opt/promenade/entrypoint.sh"]
35 38
 
36 39
 RUN set -ex \

+ 28
- 0
setup.cfg View File

@@ -0,0 +1,28 @@
1
+[metadata]
2
+name = promenade
3
+summary = 'Promenade is a tool for bootstrapping a resilient '
4
+          'Kubernetes cluster and managing its life-cycle via '
5
+          'Helm charts.
6
+description-file = README.md
7
+author = The Airship Authors
8
+home-page = https://github.com/openstack/airship-promenade
9
+
10
+classifier =
11
+    Intended Audience :: Information Technology
12
+    Intended Audience :: System Administrators
13
+    License :: OSI Approved :: Apache Software License
14
+    Operating System :: POSIX :: Linux
15
+    Programming Language :: Python :: 3
16
+    Programming Language :: Python :: 3.5
17
+    Programming Language :: Python :: 3.6
18
+
19
+[files]
20
+packages =
21
+    promenade
22
+data_files =
23
+    schemas = schemas/*
24
+    templates = templates/*
25
+
26
+[entry_points]
27
+console_scripts =
28
+    promenade=promenade.cli:promenade

+ 2
- 16
setup.py View File

@@ -17,20 +17,6 @@
17 17
 from setuptools import setup
18 18
 
19 19
 setup(
20
-    setup_requires=['setuptools>=17.1'],
21
-    name='promenade',
22
-    version='0.8.0',
23
-    packages=['promenade'],
24
-    description=('Promenade is a tool for bootstrapping a resilient '
25
-                 'Kubernetes cluster and managing its life-cycle via Helm charts.'),
26
-    url='https://github.com/openstack/airship-promenade',
27
-    author='The Airship Authors',
28
-    license='Apache 2.0',
29
-    package_data={
30
-        'schemas': 'schemas/*',
31
-        'templates': 'templates/*',
32
-    },
33
-    entry_points={
34
-        'console_scripts': 'promenade=promenade.cli:promenade',
35
-    },
20
+    setup_requires=['setuptools>=17.1', 'pbr>=2.0.0'],
21
+    pbr=True
36 22
 )

+ 1
- 1
test-requirements.txt View File

@@ -1,5 +1,5 @@
1 1
 pytest
2
-flake8>=3.3.0
2
+flake8==2.6.2
3 3
 bandit>=1.5
4 4
 yapf==0.24.0
5 5
 sphinx>=1.6.2

Loading…
Cancel
Save