Merge pull request #2165 from Drakkar-Software/dev

Master merge
Drakkar-Software · Dec 27, 2022 · bbac437 · bbac437
2 parents 2d1b30c + 4705e9e
commit bbac437
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -176,12 +176,9 @@ jobs:
         python -m cibuildwheel --output-dir wheelhouse
       env:
         # build for python 3.8
-        CIBW_BUILD: cp38-*
-        CIBW_SKIP: "*-manylinux_i686" # temporary skip i386 wheels
+        CIBW_BUILD: cp38-manylinux_x86_64
         CIBW_BUILD_VERBOSITY_LINUX: 0
-        CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-        CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-#        CIBW_ARCHS_LINUX: 'auto aarch64'
+        CIBW_ARCHS_LINUX: 'native' # 'aarch64' https://cibuildwheel.readthedocs.io/en/stable/options/#archs
         CIBW_BEFORE_BUILD_LINUX: >
           python -m pip install --upgrade pip
           pip install  --prefer-binary auditwheel -r dev_requirements.txt -r requirements.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *It is strongly advised to perform an update of your tentacles after updating OctoBot. (start.py tentacles --install --all)*
 
+## [0.4.30] - 2022-12-27
+### Fixed
+- profile download error
+
 ## [0.4.29] - 2022-12-26
 ### Fixed
 - pip install on Unix

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# OctoBot [0.4.29](https://octobot.click/gh-changelog)
+# OctoBot [0.4.30](https://octobot.click/gh-changelog)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg)](https://octobot.click/gh-pypi)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e07fb190156d4efb8e7d07aaa5eff2e1)](https://app.codacy.com/gh/Drakkar-Software/OctoBot?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot&utm_campaign=Badge_Grade_Dashboard)[![Downloads](https://pepy.tech/badge/octobot/month)](https://pepy.tech/project/octobot)
 [![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg)](https://octobot.click/gh-dockerhub)

diff --git a/octobot/__init__.py b/octobot/__init__.py
@@ -16,5 +16,5 @@
 
 PROJECT_NAME = "OctoBot"
 AUTHOR = "Drakkar-Software"
-VERSION = "0.4.29"  # major.minor.revision
+VERSION = "0.4.30"  # major.minor.revision
 LONG_VERSION = f"{VERSION}"
diff --git a/octobot/cli.py b/octobot/cli.py
@@ -279,15 +279,15 @@ def start_octobot(args):
         # add args to config
         update_config_with_args(args, config, logger)
 
-        # patch setup with forced values
-        community_auth = _handle_forced_startup_config(logger, config, is_first_startup)
-
         # show terms
         _log_terms_if_unaccepted(config, logger)
 
         # tries to load, install or repair tentacles
         _load_or_create_tentacles(config, logger)
 
+        # patch setup with forced values
+        community_auth = _handle_forced_startup_config(logger, config, is_first_startup)
+
         # Can now perform config health check (some checks require a loaded profile)
         configuration_manager.config_health_check(config, args.backtesting)
 

diff --git a/octobot/commands.py b/octobot/commands.py
@@ -163,9 +163,11 @@ def download_missing_env_profiles(config, profile_urls):
         )
         for download_url in profile_urls:
             if download_url not in installed_profiles_urls:
-                downloaded_profiles.append(
-                    profiles.download_and_install_profile(download_url)
-                )
+                installed_profile = profiles.download_and_install_profile(download_url)
+                if installed_profile is not None:
+                    downloaded_profiles.append(
+                        installed_profile
+                    )
     if downloaded_profiles:
         # reload profiles to load downloaded ones
         config.load_profiles()

diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,7 @@
 cython==0.29.32
 
 # Drakkar-Software requirements
-OctoBot-Commons==1.8.1
+OctoBot-Commons==1.8.2
 OctoBot-Trading==2.3.1
 OctoBot-Evaluators==1.8.0
 OctoBot-Tentacles-Manager==2.8.1