From 45f18cf0e657c77ffad1fdb9174ea41bffd04ead Mon Sep 17 00:00:00 2001
From: Peter van Arkel <mail@peterva.net>
Date: Mon, 7 Jun 2021 11:49:03 +0200
Subject: [PATCH] fix requirements.txt and a strange import

---
 Makefile         | 17 +++++++++++++++++
 jeeves.py        |  1 -
 requirements.txt | 22 +++++++++++++---------
 setup.py         |  0
 4 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 setup.py

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..595fdeb
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+init:
+    pip install -r requirements.txt
+
+install:
+	cp jeevesbot/env.py.dist jeevesbot/env.py
+
+clearlog:
+	rm jeeves.log
+
+clean:
+	rm jeeves.log
+	rm jeevesbot/env.py
+	rm -rf jeevesbot/__pycache/
+	rm -rf __pycache/
+
+lint: 
+	pylint jeeves.py jeevesbot/
\ No newline at end of file
diff --git a/jeeves.py b/jeeves.py
index 67e2cd8..aba8a14 100644
--- a/jeeves.py
+++ b/jeeves.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from types import resolve_bases
 import discord
 from discord.ext import commands
 import logging
diff --git a/requirements.txt b/requirements.txt
index 0a5b11f..1e68491 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,13 @@
-aiohttp           3.7.4.post0
-async-timeout     3.0.1
-dice              3.1.2
-discord.py        1.7.1
-docopt            0.6.2
-multidict         5.1.0
-pyparsing         2.4.7
-typing-extensions 3.7.4.3
-yarl              1.6.3
\ No newline at end of file
+# nonspecific versions
+aiohttp
+async-timeout
+dice
+discord.py
+docopt
+multidict
+pyparsing
+typing-extensions
+pylint
+
+# needs this version, otherwise TypeErrors will break stuff
+yarl==1.5.1
\ No newline at end of file
diff --git a/setup.py b/setup.py
deleted file mode 100644
index e69de29..0000000