From dc467ceadb3cb3117ad928b168f3b5ebd947ca43 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 14 Sep 2021 21:00:33 +0200 Subject: [PATCH 1/8] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0799eb4..a85bd99 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cement==2.10.12 -pystache>=0.5.4 +pystache>=0.5.0 pynginxconfig>=0.3.4 PyMySQL>=0.10.1 psutil>=5.7.3 @@ -8,4 +8,4 @@ SQLAlchemy>=1.3.20 requests>=2.24.0 distro>=1.5.0 argcomplete>=1.12.0 -colorlog>=4.6.2 \ No newline at end of file +colorlog>=4.6.2 From 8a518f770fee91fdd319bc5630d1fa71ffdb10aa Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 14 Sep 2021 21:01:30 +0200 Subject: [PATCH 2/8] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 340893f..72c8134 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ setup(name='wordops', # "Sphinx >= 1.0", # Required to function 'cement == 2.10.12', - 'pystache >= 0.5.4', + 'pystache >= 0.5.0', 'pynginxconfig >= 0.3.4', 'PyMySQL >= 0.10.1', 'psutil >= 5.7.3', From 38cf9d37b07450b8ceff826e89aff86e4497da84 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 15 Sep 2021 14:24:06 +0200 Subject: [PATCH 3/8] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a85bd99..6717c83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ cement==2.10.12 -pystache>=0.5.0 pynginxconfig>=0.3.4 PyMySQL>=0.10.1 psutil>=5.7.3 From 7c3c612defe3f9845a843463a757b668e7ef35af Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 15 Sep 2021 14:24:20 +0200 Subject: [PATCH 4/8] Update setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 72c8134..a002283 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,6 @@ setup(name='wordops', # "Sphinx >= 1.0", # Required to function 'cement == 2.10.12', - 'pystache >= 0.5.0', 'pynginxconfig >= 0.3.4', 'PyMySQL >= 0.10.1', 'psutil >= 5.7.3', From 18a5e2a4061e17b4a8eacbf6ef1a609113c39afe Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 15 Sep 2021 17:34:08 +0200 Subject: [PATCH 5/8] Update install --- install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install b/install index 1c52d8d..ea12bd1 100755 --- a/install +++ b/install @@ -440,7 +440,9 @@ wo_install() { cd || exit 1 if [ -d /opt/wo/lib/python3."$python_ver"/site-packages/apt ]; then source /opt/wo/bin/activate - python3 -m pip install -U pip setuptools wheel + python3 -m pip uninstall setuptools + python3 -m pip install -I setuptools==57.5.0 + python3 -m pip install -U pip wheel else rm -rf /opt/wo python3 -m venv /opt/wo From f9f1bf5b907eca41b7292a1ae77d6c3e393a9f01 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 15 Sep 2021 17:34:37 +0200 Subject: [PATCH 6/8] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a002283..340893f 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ setup(name='wordops', # "Sphinx >= 1.0", # Required to function 'cement == 2.10.12', + 'pystache >= 0.5.4', 'pynginxconfig >= 0.3.4', 'PyMySQL >= 0.10.1', 'psutil >= 5.7.3', From 593478352a266010ad0b334a7c60c30fb653470c Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 15 Sep 2021 17:34:55 +0200 Subject: [PATCH 7/8] Update requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 6717c83..7373c0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ cement==2.10.12 +pystache>=0.5.4 pynginxconfig>=0.3.4 PyMySQL>=0.10.1 psutil>=5.7.3 From dab449c8dcd26b2ffb35332e868a8037b8332180 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 15 Sep 2021 17:42:21 +0200 Subject: [PATCH 8/8] Fix setuptools version --- install | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/install b/install index ea12bd1..9a6aec1 100755 --- a/install +++ b/install @@ -447,7 +447,9 @@ wo_install() { rm -rf /opt/wo python3 -m venv /opt/wo source /opt/wo/bin/activate - python3 -m pip install -U pip setuptools wheel + python3 -m pip uninstall setuptools + python3 -m pip install -I setuptools==57.5.0 + python3 -m pip install -U pip wheel 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 @@ -497,12 +499,16 @@ wo_travis_install() { if [ -f ./setup.py ]; then if [ -d /opt/wo/lib/python3."$python_ver"/site-packages/apt ]; then source /opt/wo/bin/activate - python3 -m pip install -U pip setuptools wheel + python3 -m pip uninstall setuptools + python3 -m pip install -I setuptools==57.5.0 + python3 -m pip install -U pip wheel else rm -rf /opt/wo python3 -m venv /opt/wo source /opt/wo/bin/activate - python3 -m pip install -U pip setuptools wheel + python3 -m pip uninstall setuptools + python3 -m pip install -I setuptools==57.5.0 + python3 -m pip install -U pip wheel 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