From 79a95018f00ad7fe667a869a669a3c5bc2f61c80 Mon Sep 17 00:00:00 2001 From: Tommy Carpenter Date: Mon, 2 Dec 2019 15:04:45 -0500 Subject: [PATCH] Version bump, release ready when dev-b is merged back. Change-Id: I43be2ce9535d454e95c9c9a042bfde0a35031eb6 Signed-off-by: Tommy Carpenter --- src/bindings/rmr-python/Dockerfile-Unit-Test | 15 ++++++++------- src/bindings/rmr-python/docs/release-notes.rst | 2 +- src/bindings/rmr-python/setup.py | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/bindings/rmr-python/Dockerfile-Unit-Test b/src/bindings/rmr-python/Dockerfile-Unit-Test index d9ee412..3f0a4f4 100644 --- a/src/bindings/rmr-python/Dockerfile-Unit-Test +++ b/src/bindings/rmr-python/Dockerfile-Unit-Test @@ -14,14 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # ================================================================================== +# install a well known working rmr FROM python:3.7-alpine - -# the alpine image keeps changing; if it fails try searching: -# https://nexus3.o-ran-sc.org/#browse/search=keyword%3Dalpine3 -# -# copy NNG and rmr out of the CI builder nng -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:5-a3.9 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:5-a3.9 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so +RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git +RUN git clone --branch 1.10.2 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \ + && cd rmr \ + && mkdir build \ + && cd build \ + && cmake .. -DPACK_EXTERNALS=1 \ + && make install COPY rmr/ /tmp/rmr COPY tests/ /tmp/tests diff --git a/src/bindings/rmr-python/docs/release-notes.rst b/src/bindings/rmr-python/docs/release-notes.rst index 7e31581..25ab2ea 100644 --- a/src/bindings/rmr-python/docs/release-notes.rst +++ b/src/bindings/rmr-python/docs/release-notes.rst @@ -7,7 +7,7 @@ The format is based on `Keep a Changelog `__ and this project adheres to `Semantic Versioning `__. -[X.X.X] - xxx +[2.0.0] - 12/2/2019 -------------------- :: diff --git a/src/bindings/rmr-python/setup.py b/src/bindings/rmr-python/setup.py index 5651e6b..ff3b352 100644 --- a/src/bindings/rmr-python/setup.py +++ b/src/bindings/rmr-python/setup.py @@ -32,7 +32,7 @@ def _long_descr(): setup( name="rmr", - version="1.0.0", + version="2.0.0", packages=find_packages(), author="Tommy Carpenter, E. Scott Daniels", description="Python wrapper for RIC RMR", -- 2.16.6