From 0c4c68dbc7072e3485b4045c66885d67c132b58f Mon Sep 17 00:00:00 2001 From: Guillaume De Saint Martin Date: Fri, 10 Sep 2021 00:53:08 +0200 Subject: [PATCH 1/3] [TelegramAPI] fix telegram api docs url --- Services/Services_bases/telegram_api_service/telegram_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Services/Services_bases/telegram_api_service/telegram_api.py b/Services/Services_bases/telegram_api_service/telegram_api.py index 2618abfd2..4b6bb52e1 100644 --- a/Services/Services_bases/telegram_api_service/telegram_api.py +++ b/Services/Services_bases/telegram_api_service/telegram_api.py @@ -69,7 +69,7 @@ def get_read_only_info(self): @classmethod def get_help_page(cls) -> str: - return f"{constants.OCTOBOT_WEBSITE_URL}/guides/#telegram-api" + return f"{constants.OCTOBOT_DOCS_URL}/interfaces/telegram-interface/telegram-api" @staticmethod def is_setup_correctly(config): From be239c47fb637392cd4bb9e7d5c3ecb9da73f9cb Mon Sep 17 00:00:00 2001 From: Herklos Date: Sat, 11 Sep 2021 13:53:36 +0200 Subject: [PATCH 2/3] [WebInterface] Handle None updater --- Services/Interfaces/web_interface/api/metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Services/Interfaces/web_interface/api/metadata.py b/Services/Interfaces/web_interface/api/metadata.py index c272913f6..4e144b2b1 100644 --- a/Services/Interfaces/web_interface/api/metadata.py +++ b/Services/Interfaces/web_interface/api/metadata.py @@ -31,7 +31,7 @@ def version(): def upgrade_version(): async def fetch_upgrade_version(): updater = octobot_api.get_updater() - return await updater.get_latest_version() if await updater.should_be_updated() else None + return await updater.get_latest_version() if updater and await updater.should_be_updated() else None return json.dumps(interfaces.run_in_bot_async_executor(fetch_upgrade_version())) From e29f87650931326e06097f1abd23aab854cabc4c Mon Sep 17 00:00:00 2001 From: Herklos Date: Sun, 12 Sep 2021 15:07:11 +0200 Subject: [PATCH 3/3] [CRON] Fix credentials --- .github/workflows/cron.yml | 5 +++++ .github/workflows/main.yml | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index b2ce8dd0c..cedef5c2e 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -33,6 +33,9 @@ jobs: python start.py tentacles --install --location "../any_platform.zip" --all - name: Compile project + env: + BINANCE_API_KEY: ${{ secrets.BINANCE_API_KEY }} + BINANCE_API_SECRET: ${{ secrets.BINANCE_API_SECRET }} run: | cd OctoBot python setup.py build_ext --inplace @@ -41,6 +44,8 @@ jobs: - name: Pytests env: CYTHON_IGNORE: True + BINANCE_API_KEY: ${{ secrets.BINANCE_API_KEY }} + BINANCE_API_SECRET: ${{ secrets.BINANCE_API_SECRET }} run: | cd OctoBot pytest --cov=. --cov-config=.coveragerc --durations=0 -rw tentacles/Trading/Exchange diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9997f5545..b4e052dc4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,16 +90,11 @@ jobs: if: matrix.type == 'cython' env: CYTHON_IGNORE: True - BINANCE_API_KEY: ${{ secrets.BINANCE_API_KEY }} - BINANCE_API_SECRET: ${{ secrets.BINANCE_API_SECRET }} run: | cd OctoBot pytest --cov=. --cov-config=.coveragerc --durations=0 -rw --ignore=tentacles/Trading/Exchange tentacles - name: Pytests - env: - BINANCE_API_KEY: ${{ secrets.BINANCE_API_KEY }} - BINANCE_API_SECRET: ${{ secrets.BINANCE_API_SECRET }} if: matrix.type != 'cython' run: | cd OctoBot