From 74caea4e922a249deec2ae33b89a7c3471cd693b Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sun, 21 Aug 2022 14:09:02 +0200
Subject: [PATCH 1/3] Update websockets dependency

---
 CHANGELOG.md | 2 ++
 setup.py     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dd46b4..60cfd94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Next version
 
+- update websockets dependency
+
 ## 1.1.5 (2020-01-26)
 
 - more stability (I think)
diff --git a/setup.py b/setup.py
index ebbea69..8de8af1 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ setup(
         name="yaboli",
         version="1.1.5",
         packages=["yaboli"],
-        install_requires=["websockets==7.0"],
+        install_requires=["websockets >=10.3, <11"],
 )
 
 # When updating the version, also:

From 37c4ba703a89d44d89185ac37888b0060e5637d3 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sun, 21 Aug 2022 14:24:05 +0200
Subject: [PATCH 2/3] Switch to pyproject.toml style setuptools config

---
 .gitignore                 | 14 +++-----------
 CHANGELOG.md               |  1 +
 examples/echo/.gitignore   | 12 ------------
 setup.py => pyproject.toml | 16 +++++++++-------
 4 files changed, 13 insertions(+), 30 deletions(-)
 rename setup.py => pyproject.toml (78%)

diff --git a/.gitignore b/.gitignore
index 1d164cd..7ce48d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,4 @@
-# python stuff
 __pycache__/
-
-# venv stuff
-bin/
-include/
-lib/
-lib64
-pyvenv.cfg
-
-# mypy stuff
-.mypy_cache/
+*.egg-info/
+/.mypy_cache/
+/.venv/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60cfd94..8df3702 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Next version
 
 - update websockets dependency
+- switch to pyproject.toml style setuptools config
 
 ## 1.1.5 (2020-01-26)
 
diff --git a/examples/echo/.gitignore b/examples/echo/.gitignore
index f69b963..da78a19 100644
--- a/examples/echo/.gitignore
+++ b/examples/echo/.gitignore
@@ -1,15 +1,3 @@
-# python stuff
-__pycache__/
-
-# venv stuff
-bin/
-include/
-lib/
-lib64
-pyvenv.cfg
-
-# bot stuff
-#
 # These files are ignored because they may contain sensitive information you
 # wouldn't want in your repo. If you need to have a config file in your repo,
 # store a bot.conf.default with default settings.
diff --git a/setup.py b/pyproject.toml
similarity index 78%
rename from setup.py
rename to pyproject.toml
index 8de8af1..dbb7c7e 100644
--- a/setup.py
+++ b/pyproject.toml
@@ -1,11 +1,13 @@
-from setuptools import setup
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
 
-setup(
-        name="yaboli",
-        version="1.1.5",
-        packages=["yaboli"],
-        install_requires=["websockets >=10.3, <11"],
-)
+[project]
+name = "yaboli"
+version = "1.1.5"
+dependencies = [
+	"websockets >=10.3, <11"
+]
 
 # When updating the version, also:
 # - update the README.md installation instructions

From eba398e5d31ff9da05befb1e98459843b8513023 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sun, 21 Aug 2022 14:26:04 +0200
Subject: [PATCH 3/3] Bump version to 1.2.0

---
 CHANGELOG.md   | 2 ++
 README.md      | 2 +-
 pyproject.toml | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8df3702..e0f1801 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Next version
 
+## 1.2.0 (2022-08-21)
+
 - update websockets dependency
 - switch to pyproject.toml style setuptools config
 
diff --git a/README.md b/README.md
index b02a6a8..2cd4eb1 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Ensure that you have at least Python 3.7 installed.
 
 To install yaboli or update your installation to the latest version, run:
 ```
-$ pip install git+https://github.com/Garmelon/yaboli@v1.1.5
+$ pip install git+https://github.com/Garmelon/yaboli@v1.2.0
 ```
 
 The use of [venv](https://docs.python.org/3/library/venv.html) is recommended.
diff --git a/pyproject.toml b/pyproject.toml
index dbb7c7e..79ad530 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yaboli"
-version = "1.1.5"
+version = "1.2.0"
 dependencies = [
 	"websockets >=10.3, <11"
 ]