From 35548328e04754ecd4854eb43a08f66694172b0c Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sun, 29 Jan 2023 14:13:52 +0100 Subject: [PATCH 1/2] Fix SQLAlchemy --- install | 2 ++ requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/install b/install index 21c2bba..6e80a36 100755 --- a/install +++ b/install @@ -446,6 +446,7 @@ wo_install() { python3 -m pip install -I setuptools==57.5.0 python3 -m pip install -U pip wheel python3 -m pip uninstall psutil -y + python3 -m pip uninstall SQLAlchemy -y else rm -rf /opt/wo python3 -m venv /opt/wo @@ -511,6 +512,7 @@ wo_travis_install() { python3 -m pip install -I setuptools==57.5.0 python3 -m pip install -U pip wheel python3 -m pip uninstall psutil -y + python3 -m pip uninstall SQLAlchemy -y else rm -rf /opt/wo python3 -m venv /opt/wo diff --git a/requirements.txt b/requirements.txt index 4bed5cd..982fe99 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pynginxconfig>=0.3.4 PyMySQL>=0.10.1 psutil>=5.9.4 sh>=1.14.3 -SQLAlchemy>=1.3.20 +SQLAlchemy>=1.4.46 requests>=2.28.1 distro>=1.7.0 argcomplete>=1.12.0 diff --git a/setup.py b/setup.py index 7292f1b..6b6e8b1 100644 --- a/setup.py +++ b/setup.py @@ -67,7 +67,7 @@ setup(name='wordops', 'PyMySQL >= 0.10.1', 'psutil >= 5.9.4', 'sh >= 1.14.3', - 'SQLAlchemy >= 1.3.20', + 'SQLAlchemy == 1.4.46', 'requests >= 2.28.1', 'distro >= 1.7.0', 'argcomplete >= 1.12.0', From 92ec949e511e667cea4cfc8c6a6da98759f41f38 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sun, 29 Jan 2023 14:19:39 +0100 Subject: [PATCH 2/2] Bump WordOps release --- CHANGELOG.md | 6 ++++++ install | 2 +- setup.py | 2 +- wo/core/variables.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d99e293..68c5bb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### v3.17.0 - [Unreleased] +### v3.16.3 - 2023-01-29 + +#### Fixed + +- SQLAlchemy version locked + ### v3.16.2 - 2023-01-21 #### Changed diff --git a/install b/install index 6e80a36..70494cd 100755 --- a/install +++ b/install @@ -9,7 +9,7 @@ # ------------------------------------------------------------------------- # wget -qO wo wops.cc && sudo -E bash wo # ------------------------------------------------------------------------- -# Version 3.16.2 - 2023-01-21 +# Version 3.16.3 - 2023-01-29 # ------------------------------------------------------------------------- # CONTENTS diff --git a/setup.py b/setup.py index 6b6e8b1..3bb861a 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ if os.geteuid() == 0: os.makedirs('/var/lib/wo/tmp/') setup(name='wordops', - version='3.16.2', + version='3.16.3', description='An essential toolset that eases server administration', long_description=LONG, long_description_content_type='text/markdown', diff --git a/wo/core/variables.py b/wo/core/variables.py index d2953cf..0e0ae60 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -15,7 +15,7 @@ class WOVar(): """Intialization of core variables""" # WordOps version - wo_version = "3.16.2" + wo_version = "3.16.3" # WordOps packages versions wo_wp_cli = "2.7.1" wo_adminer = "4.8.1"