From ce909210ad2012cbe262546aaa657f59c8b88431 Mon Sep 17 00:00:00 2001 From: Tommy Carpenter Date: Wed, 31 Jul 2019 12:44:00 -0400 Subject: [PATCH] Correctly include license info Issue-ID: RICPLT-1855 Change-Id: Ica21a054b4b1797e6d73368954882eb2b07c0ab8 Signed-off-by: Tommy Carpenter --- .gitignore | 1 + src/bindings/rmr-python/Changelog.md | 3 +++ src/bindings/rmr-python/setup.cfg | 2 -- src/bindings/rmr-python/setup.py | 16 +++++++++++++++- 4 files changed, 19 insertions(+), 3 deletions(-) delete mode 100644 src/bindings/rmr-python/setup.cfg diff --git a/.gitignore b/.gitignore index 36d4be9..4795d16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store build/* .build/* *.o diff --git a/src/bindings/rmr-python/Changelog.md b/src/bindings/rmr-python/Changelog.md index 9a890c1..a1c0836 100644 --- a/src/bindings/rmr-python/Changelog.md +++ b/src/bindings/rmr-python/Changelog.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [0.10.3] - 7/31/2019 + * (Correctly) Include license here per Jira RICPLT-1855 + ## [0.10.2] - 7/31/2019 * Include license here per Jira RICPLT-1855 diff --git a/src/bindings/rmr-python/setup.cfg b/src/bindings/rmr-python/setup.cfg deleted file mode 100644 index 498ec14..0000000 --- a/src/bindings/rmr-python/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[metadata] -license_file = LICENSE.txt diff --git a/src/bindings/rmr-python/setup.py b/src/bindings/rmr-python/setup.py index ac0c19d..daa205e 100644 --- a/src/bindings/rmr-python/setup.py +++ b/src/bindings/rmr-python/setup.py @@ -14,14 +14,28 @@ # See the License for the specific language governing permissions and # limitations under the License. # ================================================================================== +from os.path import dirname, abspath, join as path_join from setuptools import setup, find_packages +SETUP_DIR = abspath(dirname(__file__)) + + +def _long_descr(): + """Yields the content of documentation files for the long description""" + doc_path = path_join(SETUP_DIR, "README.md") + with open(doc_path) as f: + return f.read() + + setup( name="rmr", - version="0.10.2", + version="0.10.3", packages=find_packages(), author="Tommy Carpenter", description="Python wrapper for RIC RMR", url="https://gerrit.o-ran-sc.org/r/admin/repos/ric-plt/lib/rmr", + license="Apache 2.0", + data_files=[("", ["LICENSE.txt"])], install_requires=[], + long_description=_long_descr(), ) -- 2.16.6