Fix installing on 64-bit OSs, fix alembic branch

Author: kizniche

CHANGELOG.md

@@ -4,6 +4,7 @@ Following the upgrade, you will need to reboot to complete the upgrade.
 
 ### Bugfixes
 
+ - Fix installation on 64-bit OSs
  - Fix missing netcat and wget install dependencies ([#1124](https://github.com/kizniche/mycodo/issues/1124))
  - Fix inability to safe user settings
  - Fix install issue due to outdated apt repository

alembic_db/alembic/versions/b354722c9b8b_update_function_actions.py

@@ -1,7 +1,7 @@
 """update function actions
 
 Revision ID: b354722c9b8b
-Revises: 0187ea22dc4b
+Revises: 56a3f39af852
 Create Date: 2022-02-13 20:06:50.915088
 
 """
@@ -15,7 +15,7 @@
 
 # revision identifiers, used by Alembic.
 revision = 'b354722c9b8b'
-down_revision = '0187ea22dc4b'
+down_revision = '56a3f39af852'
 branch_labels = None
 depends_on = None
 

install/requirements.txt

@@ -27,7 +27,7 @@ pyro5==5.13.1
 pyserial==3.5
 python-dateutil==2.8.2
 requests==2.27.1
-setuptools==60.9.3  # Also set version in upgrade_commands.sh
+setuptools==60.10.0  # Also set version in upgrade_commands.sh
 SQLAlchemy==1.4.31
 Werkzeug==2.0.3
 WTForms==3.0.1

mycodo/outputs/grove_motor_driver_v1_0.py

@@ -87,7 +87,7 @@
     ],
 
     'dependencies_module': [
-        ('pip-pypi', 'smbus2', 'smbus2')
+        ('pip-pypi', 'smbus2', 'smbus2==0.4.1')
     ],
 
     'interfaces': ['I2C'],

mycodo/outputs/grove_motor_driver_v1_3.py

@@ -88,7 +88,7 @@
     ],
 
     'dependencies_module': [
-        ('pip-pypi', 'smbus2', 'smbus2')
+        ('pip-pypi', 'smbus2', 'smbus2==0.4.1')
     ],
 
     'interfaces': ['I2C'],

mycodo/scripts/upgrade_commands.sh

@@ -19,11 +19,11 @@ MCB2835_URL="http://www.airspayce.com/mikem/bcm2835/bcm2835-1.50.tar.gz"
 WIRINGPI_URL="https://project-downloads.drogon.net/wiringpi-latest.deb"
 INFLUXDB_VERSION="1.8.10"
 VIRTUALENV_VERSION="20.7.0"
-SETUPTOOLS_VERSION="60.9.3"  # Also set version in install/requirements.txt
+SETUPTOOLS_VERSION="60.10.0"  # Also set version in install/requirements.txt
 
 # Required apt packages. This has been tested with Raspbian for the
 # Raspberry Pi and Ubuntu, it should work with most Debian-based systems.
-APT_PKGS="gawk gcc g++ git libffi-dev libi2c-dev logrotate moreutils nginx sqlite3 wget python3 python3-pip python3-dev python3-setuptools python3-smbus python3-pylint-common rng-tools netcat"
+APT_PKGS="gawk gcc g++ git libffi-dev libi2c-dev logrotate moreutils nginx sqlite3 wget python3 python3-pip python3-dev python3-setuptools rng-tools netcat"
 
 PYTHON_BINARY_SYS_LOC="$(python3 -c "import os; print(os.environ['_'])")"
 
@@ -212,7 +212,7 @@ case "${1:-''}" in
             printf "#### Virtualenv doesn't exist. Creating...\n"
             python3 -m pip install virtualenv==${VIRTUALENV_VERSION}
             rm -rf "${MYCODO_PATH}"/env
-            python3 -m virtualenv --system-site-packages -p "${PYTHON_BINARY_SYS_LOC}" "${MYCODO_PATH}"/env
+            python3 -m virtualenv -p "${PYTHON_BINARY_SYS_LOC}" "${MYCODO_PATH}"/env
         else
             printf "#### Virtualenv already exists, skipping creation\n"
         fi