summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-26 21:39:58 +0000
committerGerrit Code Review <review@openstack.org>2018-10-26 21:39:58 +0000
commit43c85a3953797795c6e03f1b79ac7b68ede2744b (patch)
tree75d532724c7856878e46071a7c797bf63e2ddbb5
parentee881f897074afc99b090fa196b8988b6dbf172f (diff)
parenta6e8fdbe22bd153c78a008b92cd5d1c245bc63e3 (diff)
Merge "Enable using PBR for package library"
-rw-r--r--Dockerfile3
-rw-r--r--setup.cfg28
-rw-r--r--setup.py18
-rw-r--r--test-requirements.txt2
4 files changed, 34 insertions, 17 deletions
diff --git a/Dockerfile b/Dockerfile
index e1ad2d5..279ef5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,9 @@ WORKDIR /opt/promenade
31ENV PORT 9000 31ENV PORT 9000
32EXPOSE $PORT 32EXPOSE $PORT
33 33
34# Setting promenade version for BPR
35ENV PBR_VERSION 0.8.0
36
34ENTRYPOINT ["/opt/promenade/entrypoint.sh"] 37ENTRYPOINT ["/opt/promenade/entrypoint.sh"]
35 38
36RUN set -ex \ 39RUN set -ex \
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..7d63976
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,28 @@
1[metadata]
2name = promenade
3summary = 'Promenade is a tool for bootstrapping a resilient '
4 'Kubernetes cluster and managing its life-cycle via '
5 'Helm charts.
6description-file = README.md
7author = The Airship Authors
8home-page = https://github.com/openstack/airship-promenade
9
10classifier =
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]
20packages =
21 promenade
22data_files =
23 schemas = schemas/*
24 templates = templates/*
25
26[entry_points]
27console_scripts =
28 promenade=promenade.cli:promenade
diff --git a/setup.py b/setup.py
index de6c01c..d306afb 100644
--- a/setup.py
+++ b/setup.py
@@ -17,20 +17,6 @@
17from setuptools import setup 17from setuptools import setup
18 18
19setup( 19setup(
20 setup_requires=['setuptools>=17.1'], 20 setup_requires=['setuptools>=17.1', 'pbr>=2.0.0'],
21 name='promenade', 21 pbr=True
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 },
36) 22)
diff --git a/test-requirements.txt b/test-requirements.txt
index 7c086ef..8325e7c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
1pytest 1pytest
2flake8>=3.3.0 2flake8==2.6.2
3bandit>=1.5 3bandit>=1.5
4yapf==0.24.0 4yapf==0.24.0
5sphinx>=1.6.2 5sphinx>=1.6.2