From 5b582d6c144615002b5108f1d5cf94f1b70e6029 Mon Sep 17 00:00:00 2001 From: Tommy Carpenter Date: Tue, 17 Mar 2020 17:41:42 -0400 Subject: [PATCH] Switch to py38, latest go builder Issue-ID: RIC-228 Change-Id: I33910f9573e50b43eb1941c3178d2402ea88f0b9 Signed-off-by: Tommy Carpenter --- Dockerfile-Unit-Test | 2 +- docs/release-notes.rst | 8 ++++++++ examples/Dockerfile-Ping | 6 +++--- examples/Dockerfile-Pong | 6 +++--- setup.py | 3 +-- tox.ini | 8 ++++---- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test index 4ebb3a7..e19c08a 100644 --- a/Dockerfile-Unit-Test +++ b/Dockerfile-Unit-Test @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ================================================================================== -FROM python:3.7-alpine +FROM python:3.8-alpine # sdl uses hiredis which needs gcc RUN apk update && apk add gcc musl-dev diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 3fdad34..8491cf4 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -14,6 +14,14 @@ and this project adheres to `Semantic Versioning `__. :depth: 3 :local: +[0.4.1] - 3/17/2020 +------------------- +:: + + * Switch tox to use py38 + * switch to latest builders + + [0.4.0] - 3/13/2020 ------------------- :: diff --git a/examples/Dockerfile-Ping b/examples/Dockerfile-Ping index 38dd323..5aef402 100644 --- a/examples/Dockerfile-Ping +++ b/examples/Dockerfile-Ping @@ -14,13 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # ================================================================================== -FROM python:3.7-alpine +FROM python:3.8-alpine # RMR setup RUN mkdir -p /opt/route/ COPY test_route.rt /opt/route/test_route.rt -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so +COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so +COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64 ENV RMR_SEED_RT /opt/route/test_route.rt diff --git a/examples/Dockerfile-Pong b/examples/Dockerfile-Pong index b2fd65d..462a717 100644 --- a/examples/Dockerfile-Pong +++ b/examples/Dockerfile-Pong @@ -14,13 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # ================================================================================== -FROM python:3.7-alpine +FROM python:3.8-alpine # RMR setup RUN mkdir -p /opt/route/ COPY test_route.rt /opt/route/test_route.rt -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so +COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so +COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64 ENV RMR_SEED_RT /opt/route/test_route.rt diff --git a/setup.py b/setup.py index 89872cd..8f57312 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def _long_descr(): setup( name="ricxappframe", - version="0.4.0", + version="0.4.1", packages=find_packages(exclude=["tests.*", "tests"]), author="Tommy Carpenter", description="Xapp framework for python", @@ -42,7 +42,6 @@ setup( "Development Status :: 4 - Beta", "Intended Audience :: Telecommunications Industry", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "License :: OSI Approved :: Apache Software License", "Operating System :: POSIX :: Linux", "Topic :: Communications", diff --git a/tox.ini b/tox.ini index d7290d3..bfcc647 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ envlist = code,flake8,docs,docs-linkcheck minversion = 2.0 [testenv:code] -basepython = python3.7 +basepython = python3.8 deps= pytest coverage @@ -34,7 +34,7 @@ commands = coverage xml -i [testenv:flake8] -basepython = python3.7 +basepython = python3.8 skip_install = true deps = flake8 commands = flake8 setup.py ricxappframe tests @@ -46,7 +46,7 @@ extend-ignore = E501,E741,E731 [testenv:docs] whitelist_externals = echo skipsdist = true -basepython = python3.7 +basepython = python3.8 deps = sphinx sphinx-rtd-theme @@ -59,7 +59,7 @@ commands = [testenv:docs-linkcheck] skipsdist = true -basepython = python3.7 +basepython = python3.8 deps = sphinx sphinx-rtd-theme sphinxcontrib-httpdomain -- 2.16.6