From 63890eef66f5587ac2c7aa97a525bf5aece37618 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Thu, 27 Jul 2023 15:09:03 +0300 Subject: [PATCH 1/2] Drop Python 3.6 support --- jmbase/setup.py | 4 ++-- jmbitcoin/setup.py | 4 ++-- jmclient/setup.py | 2 +- jmdaemon/setup.py | 2 +- jmqtui/setup.py | 2 +- setupall.py | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jmbase/setup.py b/jmbase/setup.py index 3b0e773d8..7608a3845 100644 --- a/jmbase/setup.py +++ b/jmbase/setup.py @@ -10,6 +10,6 @@ license='GPL', packages=['jmbase'], install_requires=['twisted==22.4.0', 'service-identity==21.1.0', - 'chromalog==1.0.5', 'pyaes==1.6.1'], - python_requires='>=3.6', + 'chromalog==1.0.5'], + python_requires='>=3.7', zip_safe=False) diff --git a/jmbitcoin/setup.py b/jmbitcoin/setup.py index 4292046c5..c71f6f0ee 100644 --- a/jmbitcoin/setup.py +++ b/jmbitcoin/setup.py @@ -9,6 +9,6 @@ author_email='', license='GPL', packages=['jmbitcoin'], - python_requires='>=3.6', - install_requires=['python-bitcointx==1.1.3'], + python_requires='>=3.7', + install_requires=['python-bitcointx==1.1.3', 'pyaes==1.6.1'], zip_safe=False) diff --git a/jmclient/setup.py b/jmclient/setup.py index 1458bbf5c..f00ef8320 100644 --- a/jmclient/setup.py +++ b/jmclient/setup.py @@ -13,5 +13,5 @@ 'argon2_cffi==21.3.0', 'bencoder.pyx==3.0.1', 'klein==20.6.0', 'pyjwt==2.4.0', 'autobahn==20.12.3', 'werkzeug==2.2.3'], - python_requires='>=3.6', + python_requires='>=3.7', zip_safe=False) diff --git a/jmdaemon/setup.py b/jmdaemon/setup.py index 2e2555801..923c51f72 100644 --- a/jmdaemon/setup.py +++ b/jmdaemon/setup.py @@ -14,5 +14,5 @@ 'cryptography==41.0.2; platform_machine == "aarch64" or platform_machine == "amd64" or platform_machine == "x86_64"', 'pyopenssl==23.2.0', 'libnacl==1.8.0', 'joinmarketbase==0.9.10dev'], - python_requires='>=3.6', + python_requires='>=3.7', zip_safe=False) diff --git a/jmqtui/setup.py b/jmqtui/setup.py index 1f32beda5..19a0be5ad 100644 --- a/jmqtui/setup.py +++ b/jmqtui/setup.py @@ -9,7 +9,7 @@ license='GPL', packages=['jmqtui'], install_requires=['PyQt5!=5.15.0,!=5.15.1,!=5.15.2,!=6.0'], - python_requires='>=3.6', + python_requires='>=3.7', zip_safe=False) # The following command should be executed whenever `open_wallet_dialog.ui` is updated. diff --git a/setupall.py b/setupall.py index c4db920e1..a31b2ef4c 100644 --- a/setupall.py +++ b/setupall.py @@ -17,8 +17,8 @@ All modes require and install twisted. """ -if sys.version_info < (3, 6): - raise RuntimeError("This package requres Python 3.6+") +if sys.version_info < (3, 7): + raise RuntimeError("This package requres Python 3.7+") def help(): print("Usage: python setupall.py \n" From 9f4da2117231d195ec4d6b4bb5a164c74177efd1 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Tue, 1 Aug 2023 10:46:32 +0300 Subject: [PATCH 2/2] Document requirement of Python 3.7 or newer --- README.md | 4 ++-- docs/INSTALL.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf6089354..8c2ed7768 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,8 @@ Download the latest [release](https://github.com/Joinmarket-Org/joinmarket-clien Make sure to validate the signature on the tar/zip file provided with the [release](https://github.com/Joinmarket-Org/joinmarket-clientserver/releases) (or check the signature in git if you install that way using `git log --show-signature`). +JoinMarket requires Python 3.7 or newer installed. + (**macOS users**: Make sure that you have Homebrew and Apple's Command Line Tools installed.) ./install.sh @@ -47,8 +49,6 @@ Follow instructions on screen; provide sudo password when prompted, then when fi You can optionally install a Qt GUI application, you will be prompted to choose this during installation. -Do note, Python 2 is no longer supported as it has reached its end of life. - You should now be able to run the scripts like `python wallet-tool.py` etc., just as you did in the previous Joinmarket version. Alternative to this "quickstart": follow the [install guide](docs/INSTALL.md). diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 902312c74..5bbb2bba5 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -4,6 +4,8 @@ * [Installation on Windows](#installation-on-windows) * [Alternative/custom installation](#alternativecustom-installation) +JoinMarket requires Python 3.7 or newer. + ### Notes on upgrading, binaries and compatibility (You can ignore this whole section if starting from scratch).