Skip to content

Commit

Permalink
Merge #1512: Drop Python 3.6 support
Browse files Browse the repository at this point in the history
9f4da21 Document requirement of Python 3.7 or newer (Kristaps Kaupe)
63890ee Drop Python 3.6 support (Kristaps Kaupe)

Pull request description:

  It's EOL since end of 2021 and 3.7+ will be minimum for #1484.

Top commit has no ACKs.

Tree-SHA512: abbb230c54c2657b83c52817d5afeae8d24110553200e54a5789c708958e8405e3fe93b3b84ddceb126dfa474548260bad6b227bd2b03acca914e431bd066dd2
  • Loading branch information
kristapsk committed Aug 5, 2023
2 parents 7731bcf + 9f4da21 commit 3eddd6b
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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).
Expand Down
2 changes: 2 additions & 0 deletions docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions jmbase/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions jmbitcoin/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion jmclient/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion jmdaemon/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion jmqtui/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions setupall.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 <mode>\n"
Expand Down

0 comments on commit 3eddd6b

Please sign in to comment.