summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorengn33r <engn33r@users.noreply.github.com>2021-08-12 23:59:16 -0400
committerengn33r <engn33r@users.noreply.github.com>2021-08-12 23:59:16 -0400
commitb8fc65ed8dc892c322b6ea1f8e1e8d5406f11612 (patch)
tree68a7259526868942e8501aa83b7ebdd9c46ba35f
parentf3551963bf7b88e5ec7ecddabe64522fb094540c (diff)
downloadwebsocket-client-1.2.1.tar.gz
1.2.1v1.2.1
-rw-r--r--ChangeLog4
-rw-r--r--docs/source/conf.py2
-rw-r--r--setup.py2
-rw-r--r--websocket/__init__.py2
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8289299..968557e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
ChangeLog
============
+- 1.2.1
+ - Fix python-socks dependency issue mentioned in #728
+ - Replace echo.websocket.org with a local websockets echo server for unit tests (4951de2)
+
- 1.2.0
- Fix #697, #665: Transition from LGPL 2.1 license to Apache 2.0 license
- Revert #417 and reimplement SOCKS proxy support with python-socks instead of PySocks (fbcbd43)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7b74248..a5c4c57 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -34,7 +34,7 @@ copyright = '2021'
author = 'liris'
# The full version, including alpha/beta/rc tags
-release = '1.2.0'
+release = '1.2.1'
# -- General configuration ---------------------------------------------------
diff --git a/setup.py b/setup.py
index d82b35f..6fa1c9c 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ import sys
from setuptools import setup
import pkg_resources
-VERSION = "1.2.0"
+VERSION = "1.2.1"
install_requires = []
tests_require = []
diff --git a/websocket/__init__.py b/websocket/__init__.py
index acde53d..a9fa463 100644
--- a/websocket/__init__.py
+++ b/websocket/__init__.py
@@ -23,4 +23,4 @@ from ._exceptions import *
from ._logging import *
from ._socket import *
-__version__ = "1.2.0"
+__version__ = "1.2.1"