From ad6c412802a22ea6a21d0533f778ae1d0520da04 Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Wed, 28 Apr 2021 02:12:15 -0600
Subject: [PATCH] Add support for Python 3.6 (thanks sose)

---
 README.md        |  4 ++--
 requirements.txt | 39 ++++++++++++++++++++++-----------------
 run_linux.sh     |  5 ++++-
 update_linux.sh  |  5 ++++-
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 925eef4..1dc9257 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ and trade with villagers to get emeralds. He can eat, sleep, and flee from
 threats.
 
 ## Requirements
-- Python >= 3.8
+- Python >= 3.6
 - pip
 - virtualenv
 - git
@@ -20,7 +20,7 @@ Assuming Debian / Ubuntu based distro:
 
 ```
 $ sudo apt update
-$ sudo apt install build-essential python3 python3-dev python3-pip python3-virtualenv virtualenv git wget unzip
+$ sudo apt install build-essential python3 python3-dev python3-pip virtualenv git wget unzip
 
 $ git clone https://git.tannercollin.com/tanner/minecraft-bot.git
 $ cd minecraft-bot/
diff --git a/requirements.txt b/requirements.txt
index 4b10814..6c09de4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,40 +1,45 @@
-appdirs==1.4.3
+appdirs==1.4.4
 astar==0.93
 CacheControl==0.12.6
-certifi==2019.11.28
+certifi==2020.12.5
 cffi==1.14.5
-chardet==3.0.4
+chardet==4.0.0
 click==7.1.2
-colorama==0.4.3
-contextlib2==0.6.0
+colorama==0.4.4
+contextlib2==0.6.0.post1
 cryptography==3.4.7
-distlib==0.3.0
-distro==1.4.0
+distlib==0.3.1
+distro==1.5.0
 Flask==1.1.2
 Flask-Cors==3.0.10
-html5lib==1.0.1
-idna==2.8
+html5lib==1.1
+idna==2.10
+importlib-metadata==4.0.1
 ipaddr==2.2.0
 itsdangerous==1.1.0
 Jinja2==2.11.3
 lockfile==0.12.2
 MarkupSafe==1.1.1
 minecraft-data==2.82.2
-msgpack==0.6.2
+msgpack==1.0.2
 munch==2.5.0
 mutf8==1.0.3
-packaging==20.3
-pep517==0.8.2
+packaging==20.9
+pep517==0.10.0
+pkg-resources==0.0.0
 progress==1.5
 pycparser==2.20
 git+https://github.com/ammaraskar/pyCraft.git@2813d02ae7fb8182c3e5227a73de2240b09878d9
 PyNBT==3.1.0
-pyparsing==2.4.6
+pyparsing==2.4.7
 pytoml==0.1.21
-requests==2.22.0
+requests==2.25.1
 retrying==1.3.3
-six==1.14.0
-urllib3==1.25.8
-watchdog==2.0.2
+six==1.15.0
+toml==0.10.2
+typing-extensions==3.7.4.3
+urllib3==1.26.4
+watchdog==2.0.3
 webencodings==0.5.1
 Werkzeug==1.0.1
+zipp==3.4.1
diff --git a/run_linux.sh b/run_linux.sh
index e52cfb0..c4c8424 100755
--- a/run_linux.sh
+++ b/run_linux.sh
@@ -11,7 +11,7 @@ fi
 if ! command -v virtualenv &> /dev/null
 then
 	echo "virtualenv could not be found, please install with:"
-	echo "sudo apt install python3-virtualenv"
+	echo "sudo apt install virtualenv"
 	exit
 fi
 
@@ -58,6 +58,9 @@ then
 	rm mcdata.zip
 fi
 
+# https://github.com/pypa/virtualenv/issues/1029
+PS1=${PS1:-}
+
 # create virtual environment
 
 if [ ! -d "env" ] 
diff --git a/update_linux.sh b/update_linux.sh
index dad7254..6f63886 100755
--- a/update_linux.sh
+++ b/update_linux.sh
@@ -11,7 +11,7 @@ fi
 if ! command -v virtualenv &> /dev/null
 then
 	echo "virtualenv could not be found, please install with:"
-	echo "sudo apt install python3-virtualenv"
+	echo "sudo apt install virtualenv"
 	exit
 fi
 
@@ -71,6 +71,9 @@ git pull --rebase
 git stash pop || true
 
 
+# https://github.com/pypa/virtualenv/issues/1029
+PS1=${PS1:-}
+
 # create virtual environment
 
 echo "Installing Python requirements..."