From 8096fdea0d607030c4534174436f50d5f2cb5704 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Thu, 6 Jan 2022 17:46:01 -0800 Subject: [PATCH 1/9] Build on python:3.8-slim image for smaller images (#10) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b6d1f4..1c94de7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8 +FROM python:3.8-slim ADD . /neon_metrics_service WORKDIR /neon_metrics_service From 5562cc025f681591576954cde96973fbf2439695 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Fri, 7 Jan 2022 01:46:17 +0000 Subject: [PATCH 2/9] Increment Version --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 9c97b46..96b0050 100644 --- a/version.py +++ b/version.py @@ -23,4 +23,4 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "0.1.0" +__version__ = "0.1.1a0" From 05daa8c2c5c0f08584c93873b892023202e1e130 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 7 Jan 2022 16:40:07 -0800 Subject: [PATCH 3/9] Update neon_utils version for k8s compat (#9) Update config references to support RO mounted files --- requirements/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index bef4f6c..83f36f8 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,2 +1,3 @@ -neon_utils~=0.13 +neon_utils~=0.14.3a2 +# TODO: Update to release version neon_mq_connector~=0.3 \ No newline at end of file From 761c08189dcc73b8bc7ca48eac7ebbde8a3a70d3 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Sat, 8 Jan 2022 00:40:24 +0000 Subject: [PATCH 4/9] Increment Version --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 96b0050..163f7fa 100644 --- a/version.py +++ b/version.py @@ -23,4 +23,4 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "0.1.1a0" +__version__ = "0.1.1a1" From 90c15ed365dd7f87873793c08289d903d7389548 Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Fri, 7 Jan 2022 16:42:40 -0800 Subject: [PATCH 5/9] Update license notices for 2022 (#12) --- LICENSE.md | 2 +- neon_metrics_service/__init__.py | 10 ++++++---- neon_metrics_service/__main__.py | 8 +++++--- neon_metrics_service/metrics_connector.py | 8 +++++--- neon_metrics_service/metrics_utils.py | 9 ++++++--- setup.py | 9 ++++++--- tests/test_metrics_utils.py | 9 ++++++--- version.py | 9 ++++++--- version_bump.py | 9 ++++++--- 9 files changed, 47 insertions(+), 26 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index f0537ec..525bb37 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System # All trademark and other rights reserved by their respective owners # Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# BSD-3 License Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/neon_metrics_service/__init__.py b/neon_metrics_service/__init__.py index 8c5ee74..718d1b0 100644 --- a/neon_metrics_service/__init__.py +++ b/neon_metrics_service/__init__.py @@ -1,7 +1,9 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # 1. Redistributions of source code must retain the above copyright notice, @@ -22,4 +24,4 @@ # OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/neon_metrics_service/__main__.py b/neon_metrics_service/__main__.py index 075c5c8..bd27ed8 100644 --- a/neon_metrics_service/__main__.py +++ b/neon_metrics_service/__main__.py @@ -1,7 +1,9 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # 1. Redistributions of source code must retain the above copyright notice, diff --git a/neon_metrics_service/metrics_connector.py b/neon_metrics_service/metrics_connector.py index 784840c..54841f6 100644 --- a/neon_metrics_service/metrics_connector.py +++ b/neon_metrics_service/metrics_connector.py @@ -1,7 +1,9 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # 1. Redistributions of source code must retain the above copyright notice, diff --git a/neon_metrics_service/metrics_utils.py b/neon_metrics_service/metrics_utils.py index f2a7a58..9d1f690 100644 --- a/neon_metrics_service/metrics_utils.py +++ b/neon_metrics_service/metrics_utils.py @@ -1,7 +1,9 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # 1. Redistributions of source code must retain the above copyright notice, @@ -23,6 +25,7 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + import os import time import json diff --git a/setup.py b/setup.py index 25348e7..1c6e4a9 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,9 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # 1. Redistributions of source code must retain the above copyright notice, @@ -23,6 +25,7 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + import setuptools from setuptools import setup from os import getenv, path diff --git a/tests/test_metrics_utils.py b/tests/test_metrics_utils.py index 4c03a68..e47be03 100644 --- a/tests/test_metrics_utils.py +++ b/tests/test_metrics_utils.py @@ -1,7 +1,9 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # 1. Redistributions of source code must retain the above copyright notice, @@ -23,6 +25,7 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + import os import shutil import sys diff --git a/version.py b/version.py index 163f7fa..fa01ac9 100644 --- a/version.py +++ b/version.py @@ -1,7 +1,9 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # 1. Redistributions of source code must retain the above copyright notice, @@ -23,4 +25,5 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + __version__ = "0.1.1a1" diff --git a/version_bump.py b/version_bump.py index c1a48a9..5a01c55 100644 --- a/version_bump.py +++ b/version_bump.py @@ -1,7 +1,9 @@ -# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System +# NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2021 Neongecko.com Inc. -# BSD-3 +# Copyright 2008-2022 Neongecko.com Inc. +# Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, +# Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo +# BSD-3 License # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # 1. Redistributions of source code must retain the above copyright notice, @@ -23,6 +25,7 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + import fileinput from os.path import join, dirname From 22736acac626a5db07b0d16c0ce997eddb61543c Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Sat, 8 Jan 2022 00:42:57 +0000 Subject: [PATCH 6/9] Increment Version --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index fa01ac9..f948c1a 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "0.1.1a1" +__version__ = "0.1.1a2" From fe37b4a48267937b06059373b39576ed26eda2cf Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 13 Apr 2022 18:39:56 -0700 Subject: [PATCH 7/9] Update neon-utils dependency to stable version (#13) Co-authored-by: Daniel McKnight --- requirements/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 83f36f8..16db7a8 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,3 +1,2 @@ -neon_utils~=0.14.3a2 -# TODO: Update to release version +neon_utils~=0.15 neon_mq_connector~=0.3 \ No newline at end of file From b0c57e66205ccc718c43e50b516cf7c4105ba0b8 Mon Sep 17 00:00:00 2001 From: NeonDaniel Date: Thu, 14 Apr 2022 01:40:12 +0000 Subject: [PATCH 8/9] Increment Version --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index f948c1a..b479d57 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "0.1.1a2" +__version__ = "0.1.1a3" From 686b350318f71eb2c3182ed5b75f83cf06d6fd0b Mon Sep 17 00:00:00 2001 From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com> Date: Wed, 13 Apr 2022 18:51:54 -0700 Subject: [PATCH 9/9] v0.1.2 (#14) --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index b479d57..0ee5cdc 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "0.1.1a3" +__version__ = "0.1.2"