diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 51314a0..05afdb4 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -15,12 +15,12 @@ jobs: unit_tests: strategy: matrix: - python-version: [3.7, 3.8, 3.9, '3.10'] + python-version: [3.9, '3.10', '3.11', '3.12'] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -32,7 +32,7 @@ jobs: run: | pytest tests/test_email_utils.py --doctest-modules --junitxml=tests/email-utils-test-results.xml - name: Upload Email test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: email-utils-test-results + name: email-utils-test-results-${{ matrix.python-version }} path: tests/email-utils-test-results.xml diff --git a/.github/workflows/update_docker_images.yml b/.github/workflows/update_docker_images.yml new file mode 100644 index 0000000..c777ec0 --- /dev/null +++ b/.github/workflows/update_docker_images.yml @@ -0,0 +1,11 @@ +name: Publish Updated Docker Image +on: + workflow_dispatch: + +jobs: + + build_and_publish_docker: + uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master + secrets: inherit + with: + include_semver: False \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 59c997f..720b0c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,10 @@ FROM python:3.10-slim LABEL vendor=neon.ai \ ai.neon.name="neon-email-proxy" -ENV OVOS_CONFIG_BASE_FOLDER neon -ENV OVOS_CONFIG_FILENAME diana.yaml -ENV XDG_CONFIG_HOME /config +ENV OVOS_CONFIG_BASE_FOLDER=neon +ENV OVOS_CONFIG_FILENAME=diana.yaml +ENV OVOS_DEFAULT_CONFIG=/opt/neon/diana.yaml +ENV XDG_CONFIG_HOME=/config COPY docker_overlay/ / RUN apt-get update && \ diff --git a/LICENSE.md b/LICENSE.md index 525bb37..0fdcf76 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # 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. +# Copyright 2008-2025 Neongecko.com Inc. # BSD-3 License Redistribution and use in source and binary forms, with or without modification, are permitted provided that the diff --git a/docker_overlay/etc/neon/diana.yaml b/docker_overlay/opt/neon/diana.yaml similarity index 71% rename from docker_overlay/etc/neon/diana.yaml rename to docker_overlay/opt/neon/diana.yaml index 6c79361..9ff87da 100644 --- a/docker_overlay/etc/neon/diana.yaml +++ b/docker_overlay/opt/neon/diana.yaml @@ -5,10 +5,13 @@ logs: - pika warning: - filelock - info: [] + - watchdog + - httpcore + info: + - asyncio debug: [] MQ: - server: api.neon.ai + server: neon-rabbitmq port: 5672 users: mq_handler: diff --git a/neon_email_proxy/__init__.py b/neon_email_proxy/__init__.py index 718d1b0..5694901 100644 --- a/neon_email_proxy/__init__.py +++ b/neon_email_proxy/__init__.py @@ -1,6 +1,6 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. +# Copyright 2008-2025 Neongecko.com Inc. # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo # BSD-3 License diff --git a/neon_email_proxy/__main__.py b/neon_email_proxy/__main__.py index 8e19f98..cf8a2f8 100644 --- a/neon_email_proxy/__main__.py +++ b/neon_email_proxy/__main__.py @@ -1,6 +1,6 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. +# Copyright 2008-2025 Neongecko.com Inc. # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo # BSD-3 License diff --git a/neon_email_proxy/email_connector.py b/neon_email_proxy/email_connector.py index 79d3f01..84fc529 100644 --- a/neon_email_proxy/email_connector.py +++ b/neon_email_proxy/email_connector.py @@ -1,6 +1,6 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. +# Copyright 2008-2025 Neongecko.com Inc. # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo # BSD-3 License diff --git a/neon_email_proxy/email_utils.py b/neon_email_proxy/email_utils.py index 79ed784..9753ffa 100644 --- a/neon_email_proxy/email_utils.py +++ b/neon_email_proxy/email_utils.py @@ -1,6 +1,6 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. +# Copyright 2008-2025 Neongecko.com Inc. # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo # BSD-3 License diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 9e1ddb3..e35c5a1 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ yagmail~=0.11 ovos-utils~=0.0,>=0.0.34 -ovos-config~=0.0,>=0.0.10 -neon_utils~=1.0 -neon_mq_connector~=0.7 \ No newline at end of file +ovos-config~=0.1 +neon_utils[sentry]~=1.0 +neon_mq_connector~=0.7,>=0.7.2a10 \ No newline at end of file diff --git a/setup.py b/setup.py index a813a19..9e9db85 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. +# Copyright 2008-2025 Neongecko.com Inc. # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo # BSD-3 License diff --git a/tests/test_email_utils.py b/tests/test_email_utils.py index 3cc1691..dd2949a 100644 --- a/tests/test_email_utils.py +++ b/tests/test_email_utils.py @@ -1,6 +1,6 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. +# Copyright 2008-2025 Neongecko.com Inc. # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo # BSD-3 License diff --git a/version.py b/version.py index a4d8103..d88321b 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. +# Copyright 2008-2025 Neongecko.com Inc. # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo # BSD-3 License diff --git a/version_bump.py b/version_bump.py index 5a01c55..b107127 100644 --- a/version_bump.py +++ b/version_bump.py @@ -1,6 +1,6 @@ # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework # All trademark and other rights reserved by their respective owners -# Copyright 2008-2022 Neongecko.com Inc. +# Copyright 2008-2025 Neongecko.com Inc. # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds, # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo # BSD-3 License