From 76137469419a954bc61ff494b60140441b9f4a6c Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 9 Sep 2022 22:36:59 +0200 Subject: [PATCH 1/2] Hotfix v3.15.1 --- CHANGELOG.md | 8 +++++++- install | 3 ++- setup.py | 2 +- wo/core/variables.py | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57185cf..0c7191a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Releases -### v3.15.1 - [Unreleased] +### v3.15.2 - [Unreleased] + +### v3.15.1 - 2022-09-09 + +#### Fixed + +- Hotfix outdated python distro package cause issues on some servers ### v3.15.0 - 2022-09-09 diff --git a/install b/install index e8b2438..edeee09 100755 --- a/install +++ b/install @@ -9,7 +9,7 @@ # ------------------------------------------------------------------------- # wget -qO wo wops.cc && sudo -E bash wo # ------------------------------------------------------------------------- -# Version 3.15.0 - 2022-09-09 +# Version 3.15.1 - 2022-09-09 # ------------------------------------------------------------------------- # CONTENTS @@ -452,6 +452,7 @@ wo_install() { python3 -m pip uninstall setuptools -y python3 -m pip install -I setuptools==57.5.0 python3 -m pip install -U pip wheel + python3 -m pip install -U distro if [ "$wo_linux_distro" = "Debian" ] || [ "$wo_linux_distro" = "Raspbian" ]; then if [ "$wo_distro_codename" = "stretch" ]; then python3 -m pip install git+https://salsa.debian.org/apt-team/python-apt.git@1.4.y#egg=python-apt diff --git a/setup.py b/setup.py index ad2e311..e0c0e59 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.15.0', + version='3.15.1', 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 8fd8669..ca3e844 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.15.0" + wo_version = "3.15.1" # WordOps packages versions wo_wp_cli = "2.6.0" wo_adminer = "4.8.1" From 7d3934978b6ca7f9dce0cde7605865686c2efcf5 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 9 Sep 2022 22:53:21 +0200 Subject: [PATCH 2/2] Update requirements --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6717c83..8ddf642 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,6 @@ psutil>=5.7.3 sh>=1.14.1 SQLAlchemy>=1.3.20 requests>=2.24.0 -distro>=1.5.0 +distro>=1.7.0 argcomplete>=1.12.0 colorlog>=4.6.2 diff --git a/setup.py b/setup.py index e0c0e59..2a08904 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ setup(name='wordops', 'sh >= 1.14.1', 'SQLAlchemy >= 1.3.20', 'requests >= 2.24.0', - 'distro >= 1.5.0', + 'distro >= 1.7.0', 'argcomplete >= 1.12.0', 'colorlog >= 4.6.2', ],