Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1512: Drop Python 3.6 support

9f4da21172 Document requirement of Python 3.7 or newer (Kristaps Kaupe)
63890eef66 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
master
Kristaps Kaupe 2 years ago
parent
commit
3eddd6bcff
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 4
      README.md
  2. 2
      docs/INSTALL.md
  3. 4
      jmbase/setup.py
  4. 4
      jmbitcoin/setup.py
  5. 2
      jmclient/setup.py
  6. 2
      jmdaemon/setup.py
  7. 2
      jmqtui/setup.py
  8. 4
      setupall.py

4
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).

2
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).

4
jmbase/setup.py

@ -10,6 +10,6 @@ setup(name='joinmarketbase',
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
jmbitcoin/setup.py

@ -9,6 +9,6 @@ setup(name='joinmarketbitcoin',
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
jmclient/setup.py

@ -13,5 +13,5 @@ setup(name='joinmarketclient',
'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
jmdaemon/setup.py

@ -14,5 +14,5 @@ setup(name='joinmarketdaemon',
'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
jmqtui/setup.py

@ -9,7 +9,7 @@ setup(name='joinmarketui',
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.

4
setupall.py

@ -17,8 +17,8 @@ to libsodium.
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"

Loading…
Cancel
Save