summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2017-12-19 15:54:33 +0800
committerBin Yang <bin.yang@windriver.com>2017-12-19 15:56:59 +0800
commit7330272e07e7bc3b72bf17cc4eb69ea9584697de (patch)
tree723f0291be74f3822e73f6d3c32b1dd0129bf91e
parentb9e844e1545719c8b247031686dd98012735041d (diff)
Add pbr as building tool
PBR is a library that helps to build python project through configuration files simplifying the deployment for them. This change adds support for it. Change-Id: I77ac639d9ba2df7122cb6a9cec68ae7551bac89e Issue-ID: MULTICLOUD-83 Signed-off-by: Victor Morales <victor.morales@intel.com> Signed-off-by: Bin Yang <bin.yang@windriver.com>
-rw-r--r--newton/.gitignore8
-rw-r--r--newton/newton/wsgi.py4
-rw-r--r--newton/requirements.txt2
-rw-r--r--newton/setup.cfg24
-rw-r--r--newton/setup.py21
-rw-r--r--version.properties2
6 files changed, 59 insertions, 2 deletions
diff --git a/newton/.gitignore b/newton/.gitignore
index e86d02b0..d0dc4903 100644
--- a/newton/.gitignore
+++ b/newton/.gitignore
@@ -8,4 +8,10 @@ logs/*.log
.tox
.coverage
htmlcov/
-
+AUTHORS
+ChangeLog
+nohup.out
+openstack_multicloud.egg-info/
+.eggs/
+build/
+test-reports/
diff --git a/newton/newton/wsgi.py b/newton/newton/wsgi.py
index 3ecaed9e..285b8e06 100644
--- a/newton/newton/wsgi.py
+++ b/newton/newton/wsgi.py
@@ -17,3 +17,7 @@ from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "newton.settings")
application = get_wsgi_application()
+
+
+def get_application():
+ return application
diff --git a/newton/requirements.txt b/newton/requirements.txt
index 13ced9ef..71654d76 100644
--- a/newton/requirements.txt
+++ b/newton/requirements.txt
@@ -1,3 +1,5 @@
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
+
# rest framework
Django==1.9.6 # BSD
djangorestframework==3.3.3 # BSD
diff --git a/newton/setup.cfg b/newton/setup.cfg
new file mode 100644
index 00000000..d5b74b07
--- /dev/null
+++ b/newton/setup.cfg
@@ -0,0 +1,24 @@
+[metadata]
+name = openstack-multicloud
+summary = Python Application Layer for OpenStack API usage
+author = ONAP
+license = Apache-2
+classifier =
+ Environment :: ONAP
+ Intended Audience :: Information Technology
+ Intended Audience :: System Administrators
+ License :: OSI Approved :: Apache Software License
+ Operating System :: POSIX :: Linux
+ Programming Language :: Python
+ Programming Language :: Python :: 2
+ Programming Language :: Python :: 2.7
+ Programming Language :: Python :: 3
+ Programming Language :: Python :: 3.5
+
+[files]
+packages =
+ newton
+
+[entry_points]
+wsgi_scripts =
+ multicloud-api = newton.wsgi:get_application
diff --git a/newton/setup.py b/newton/setup.py
new file mode 100644
index 00000000..0e04baae
--- /dev/null
+++ b/newton/setup.py
@@ -0,0 +1,21 @@
+# Copyright (c) 2017 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
+
+setuptools.setup(
+ setup_requires=['pbr'],
+ pbr=True)
diff --git a/version.properties b/version.properties
index 75fe7208..601b82fd 100644
--- a/version.properties
+++ b/version.properties
@@ -14,7 +14,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=2
+minor=1
patch=0
base_version=${major}.${minor}.${patch}