Merge branch 'main' into 57-change-the-flashloan_tokens-flag-type-to-…

…list

CHANGELOG.md

@@ -2,9 +2,22 @@
 
 ## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD)
 
-[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.2...HEAD)
+[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.3...HEAD)
 
 - Cleanup of Unused Top-Level Files [\#47](https://github.com/bancorprotocol/fastlane-bot/issues/47)
+
+Closed issues
+
+- Installation Issue with pyyaml==5.4.1 and Brownie [\#30](https://github.com/bancorprotocol/fastlane-bot/issues/30)
+
+Merged pull requests
+
+- Creates a bash install script to handle the conda vs pip installation… [\#51](https://github.com/bancorprotocol/fastlane-bot/pull/51) ([mikewcasale](https://github.com/mikewcasale))
+
+## [v2.7.3](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.3) (2023-08-07)
+
+[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.2...v2.7.3)
+
 - Removes unused files. [\#48](https://github.com/bancorprotocol/fastlane-bot/pull/48) ([mikewcasale](https://github.com/mikewcasale))
 
 Closed issues

apple-silicon-install.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Check if conda is installed
+if ! command -v conda &> /dev/null
+then
+    echo "conda could not be found"
+    exit
+fi
+
+# Prompt user to confirm if the desired conda environment is activated
+read -p "Is your desired conda environment activated? (Y/N): " answer
+case ${answer:0:1} in
+    y|Y )
+        echo "Proceeding with package installation..."
+    ;;
+    * )
+        echo "Please create and/or activate the desired conda environment, and then rerun."
+        exit
+    ;;
+esac
+
+# Install specific packages with conda
+conda install -y pyyaml==5.4.1 scipy osqp
+
+# Check if pip is installed
+if ! command -v pip &> /dev/null
+then
+    echo "pip could not be found"
+    exit
+fi
+
+# Install remaining packages from requirements.txt with pip
+if [ -f requirements.txt ]; then
+    pip install -r requirements.txt --ignore-installed
+else
+    echo "requirements.txt not found in the current directory"
+    exit 1
+fi
+
+# Run setup.py to configure brownie
+if [ -f setup.py ]; then
+    python setup.py install
+else
+    echo "setup.py not found in the current directory"
+    exit 1
+fi
+
+echo "All packages installed successfully"

fastlane_bot/__init__.py

@@ -1,7 +1,7 @@
 from .bot import CarbonBot as Bot, __VERSION__, __DATE__
 from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider
 
-__version__ = '2.7.3'
+__version__ = '2.7.4'