Merge pull request #567 from Drakkar-Software/dev

master merge
Drakkar-Software · Sep 12, 2021 · 51ae6ac · 51ae6ac
2 parents 6b21a30 + e29f876
commit 51ae6ac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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

diff --git 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()))
 

diff --git 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):