Migrate to modern packaging and src layout

.coveragerc

@@ -1,15 +1,4 @@
 # .coveragerc to control coverage.py
 [run]
 omit =
- jmclient/jmclient/jsonrpc.py
+ src/jmclient/jsonrpc.py
- jmclient/jmclient/electruminterface.py
- jmclient/jmclient/btc.py
- jmclient/test/*
- jmclient/setup.py
- jmbitcoin/test/*
- jmbitcoin/setup.py
- jmbase/test/*
- jmbase/setup.py
- jmdaemon/test/*
- jmdaemon/setup.py
- jmdaemon/jmdaemon/socks.py

.github/workflows/unittests.yml

@@ -18,23 +18,21 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-#      - name: Cache venv
+      - name: Cache venv
-#        id: cache-venv
+        id: cache-venv
-#        uses: actions/cache@v3
+        uses: actions/cache@v3
-#        env:
+        env:
-#          cache-name: venv
+          cache-name: venv
-#        with:
+        with:
-#          path: jmvenv
+          path: jmvenv
-#          key: ${{ runner.os }}-${{ matrix.python-version }}-${{ env.cache-name }}-${{ hashFiles('requirements/*.txt', 'install.sh', '*/setup.py') }}
+          key: ${{ runner.os }}-${{ matrix.python-version }}-${{ env.cache-name }}-${{ hashFiles('requirements/*.txt', 'install.sh', '*/setup.py') }}
       - name: Setup joinmarket + virtualenv
-#        if: steps.cache-venv.outputs.cache-hit != 'true'
+        if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
-          sed -i.bak 's/-e //g' requirements/base.txt
-          sed -i.bak 's/-e //g' requirements/gui.txt
           ./install.sh --develop --with-qt
-          ./jmvenv/bin/pip install -r requirements/testing.txt
+          ./jmvenv/bin/python -m pip install --upgrade pip
       - name: Lint with flake8
-        run: ./jmvenv/bin/flake8 -v jmclient jmbase jmbitcoin jmdaemon scripts
+        run: ./jmvenv/bin/flake8 -v src
       - name: Cache bitcoind
         uses: actions/cache@v3
         env:

README.md

@@ -93,7 +93,7 @@ If binaries are built, they will be gpg signed and announced on the Releases pag
 If you haven't chosen the Qt option during installation with `install.sh`, then to run the script `joinmarket-qt.py` from the command line you will need to install two more packages.  Use these 2 commands while the `jmvenv` virtual environment is activated:
 
 ```
-pip install -r requirements/gui.txt
+pip install .[gui]
 ```
 After this, the command `python joinmarket-qt.py` from within the `scripts` subdirectory should work.
 There is a [walkthrough](docs/JOINMARKET-QT-GUIDE.md) for what to do next.

docs/INSTALL.md

@@ -75,7 +75,7 @@ Then build and install a local copy of libsecp256k1 for python-bitcointx:
 
 > *NOTE*: It is very important to have activated the virtual environment before running this step. Otherwise, `pip install` will fail, you may be tempted to re-run it with `sudo pip install` which will cause problems in the future.
 
-    pip install -r requirements/base.txt
+    pip install .[services]
 
 If you have installed this "full" version of the client, you can use it with the command line scripts as explained in the [usage guide](USAGE.md).
 
@@ -122,7 +122,7 @@ If you have installed this "full" version of the client, you can use it with the
 
 7) Setup joinmarket-qt
     ```
-    pip install -r requirements/gui.txt
+    pip install .[gui]
     ```
 8) Start joinmarket-qt
     ```
@@ -165,10 +165,9 @@ Unzip the `joinmarket-clientserver-x.x.x` (where `x.x.x` is the release number)
 
 Using the command prompt in Administrator mode, go to that directory and run the commands:
 
-`pip install -r requirements\base.txt`
+`pip install joinmarket[services]`
-`pip install -r requirements\gui.txt`
 
-(the latter is needed for Joinmarket-Qt).
+(replace `services` with `gui` for Joinmarket-Qt).
 
 The final step is to manually add the libsodium dependency, as mentioned. Do the following:
 

docs/JSON-RPC-API-using-jmwalletd.md

@@ -28,7 +28,7 @@ On initially creating, unlocking or recovering a wallet, a new access and refres
 
 Tokens are signed with HS256 (HMAC with SHA-256), a symmetric keyed hashing algorithm that uses one secret key. Signature keys (differentiated between access and refresh tokens) are generated from random bytes upon the following events, implying that any previously issued token is invalidated.
 
-- starting Joinmarket wallet deamon
+- starting Joinmarket wallet daemon
 - creating, unlocking or recovering a wallet if RPC API is already serving another wallet
 - locking wallet
 

docs/TESTING.md

@@ -7,7 +7,7 @@ Work in your `jmvenv` virtual environment as for all Joinmarket work. Make sure
 
 Install the test requirements:
 
-    (jmvenv)$ pip install -r requirements/testing.txt
+    (jmvenv)$ pip install .[test]
 
 #### Running the test suite.
 

install.sh

@@ -434,16 +434,17 @@ CookieAuthentication 1
 
 joinmarket_install ()
 {
-    reqs=( 'base.txt' )
+    reqs='services'
 
     if [[ ${with_qt} == "1" ]]; then
-        reqs+=( 'gui.txt' )
+        reqs='gui'
+    fi
+    if [[ ${develop} == "1" ]]; then
+        reqs+=',test'
     fi
 
-    for req in "${reqs[@]}"; do
+    if [ "$with_jmvenv" == 1 ]; then pip_command=pip; else pip_command=pip3; fi
-        if [ "$with_jmvenv" == 1 ]; then pip_command=pip; else pip_command=pip3; fi
+    $pip_command install -e ".[${reqs}]" || return 1
-        $pip_command install -r "requirements/${req}" || return 1
-    done
 
     if [[ ${with_qt} == "1" ]]; then
         if [[ -d ~/.local/share/icons ]] && [[ -d ~/.local/share/applications ]]; then
@@ -462,7 +463,9 @@ parse_flags ()
     while :; do
         case $1 in
             --develop)
-                # no-op for backwards compatibility
+                # editable install is currently always on
+                # option solely triggers test dependencies installation for now
+                develop='1'
                 ;;
             --disable-os-deps-check)
                 use_os_deps_check='0'

jmbase/setup.py

@@ -1,16 +0,0 @@
-from setuptools import setup
-
-
-setup(name='joinmarketbase',
-      version='0.9.11dev',
-      description='Joinmarket client library for Bitcoin coinjoins',
-      url='https://github.com/JoinMarket-Org/joinmarket-clientserver/tree/master/jmbase',
-      author='',
-      author_email='',
-      license='GPL',
-      packages=['jmbase'],
-      install_requires=['twisted==22.4.0', 'service-identity==21.1.0',
-                        'chromalog==1.0.5', 'pyaes==1.6.1',
-                        'txtorcon==22.0.0'],
-      python_requires='>=3.7',
-      zip_safe=False)

jmbitcoin/setup.py

@@ -1,14 +0,0 @@
-from setuptools import setup
-
-
-setup(name='joinmarketbitcoin',
-      version='0.9.11dev',
-      description='Joinmarket client library for Bitcoin coinjoins',
-      url='https://github.com/JoinMarket-Org/joinmarket-clientserver/tree/master/jmbitcoin',
-      author='',
-      author_email='',
-      license='GPL',
-      packages=['jmbitcoin'],
-      python_requires='>=3.7',
-      install_requires=['python-bitcointx==1.1.3'],
-      zip_safe=False)

jmclient/setup.py

@@ -1,17 +0,0 @@
-from setuptools import setup
-
-
-setup(name='joinmarketclient',
-      version='0.9.11dev',
-      description='Joinmarket client library for Bitcoin coinjoins',
-      url='https://github.com/JoinMarket-Org/joinmarket-clientserver/tree/master/jmclient',
-      author='',
-      author_email='',
-      license='GPL',
-      packages=['jmclient'],
-      install_requires=['joinmarketbase==0.9.11dev', 'mnemonic==0.20',
-                        '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.7',
-      zip_safe=False)

jmdaemon/setup.py

@@ -1,17 +0,0 @@
-from setuptools import setup
-
-
-setup(name='joinmarketdaemon',
-      version='0.9.11dev',
-      description='Joinmarket client library for Bitcoin coinjoins',
-      url='https://github.com/JoinMarket-Org/joinmarket-clientserver/tree/master/jmdaemon',
-      author='',
-      author_email='',
-      license='GPL',
-      packages=['jmdaemon'],
-      install_requires=['cryptography==3.3.2; platform_machine != "aarch64" and platform_machine != "amd64" and platform_machine != "x86_64"',
-                        '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.11dev'],
-      python_requires='>=3.7',
-      zip_safe=False)

jmqtui/setup.py

@@ -1,19 +0,0 @@
-from setuptools import setup
-
-setup(name='joinmarketui',
-      version='0.9.11dev',
-      description='Joinmarket client library for Bitcoin coinjoins',
-      url='https://github.com/JoinMarket-Org/joinmarket-clientserver/tree/master/jmqtui',
-      author='',
-      author_email='',
-      license='GPL',
-      packages=['jmqtui'],
-      install_requires=['PyQt5!=5.15.0,!=5.15.1,!=5.15.2,!=6.0'],
-      python_requires='>=3.7',
-      zip_safe=False)
-
-# The following command should be executed whenever `open_wallet_dialog.ui` is updated.
-# We have commented out this command so that we wouldn't require every user of JoinMarket-qt
-# to install the correct version of pyside2-uic.
-#import os
-#os.system('pyside2-uic jmqtui/open_wallet_dialog.ui -o jmqtui/open_wallet_dialog.py')

pyproject.toml

@@ -0,0 +1,81 @@
+[build-system]
+requires = ["setuptools>=64", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "joinmarket"
+version = "0.9.11dev"
+description = "Joinmarket client library for Bitcoin coinjoins"
+readme = "README.md"
+requires-python = ">=3.7"
+license = {file = "LICENSE"}
+dependencies = [
+    "chromalog==1.0.5",
+    "pyaes==1.6.1",
+    "service-identity==21.1.0",
+    "txtorcon==22.0.0",
+    "twisted==22.4.0",
+]
+
+[project.optional-dependencies]
+jmbitcoin = [
+    "python-bitcointx==1.1.3",
+]
+jmclient = [
+    "argon2_cffi==21.3.0",
+    "autobahn==20.12.3",
+    "bencoder.pyx==3.0.1",
+    "klein==20.6.0",
+    "mnemonic==0.20",
+    "pyjwt==2.4.0",
+    "werkzeug==2.2.3",
+]
+jmdaemon = [
+    "libnacl==1.8.0",
+    "pyopenssl==23.2.0",
+    'cryptography==3.3.2; platform_machine != "aarch64" and platform_machine != "amd64" and platform_machine != "x86_64"',
+    'cryptography==41.0.2; platform_machine == "aarch64" or platform_machine == "amd64" or platform_machine == "x86_64"',
+]
+jmqtui = [
+    "PyQt5!=5.15.0,!=5.15.1,!=5.15.2,!=6.0",
+    "PySide2!=5.15.0,!=5.15.1,!=5.15.2,!=6.0", # https://bugreports.qt.io/browse/QTBUG-88688
+    "qrcode[pil]==7.3.1",
+    'pywin32; platform_system == "Windows"',
+    "qt5reactor==0.6.3",
+]
+client = [
+    "joinmarket[jmclient]",
+    "joinmarket[jmbitcoin]",
+]
+daemon = [
+    "joinmarket[jmdaemon]",
+]
+services = [
+    "joinmarket[client]",
+    "joinmarket[daemon]",
+]
+test = [
+    "joinmarket[services]",
+    "coverage==5.2.1",
+    "flake8",
+    "freezegun",
+    "mock",
+    "pexpect",
+    "pytest-cov>=2.4.0,<2.6",
+    "pytest==6.2.5",
+    "python-coveralls",
+]
+gui = [
+    "joinmarket[services]",
+    "joinmarket[jmqtui]",
+]
+
+[project.urls]
+repository = "https://github.com/JoinMarket-Org/joinmarket-clientserver.git"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+exclude = ["*.test"]
+
+[tool.pytest.ini_options]
+testpaths = ["test"]

requirements/base.txt

@@ -1,4 +0,0 @@
--e ./jmbase
--e ./jmbitcoin
--e ./jmclient
--e ./jmdaemon

requirements/gui.txt

@@ -1,9 +0,0 @@
--r base.txt
-pywin32; platform_system == "Windows"
-# https://bugreports.qt.io/browse/QTBUG-88688
-PySide2!=5.15.0,!=5.15.1,!=5.15.2,!=6.0
-PyQt5!=5.15.0,!=5.15.1,!=5.15.2,!=6.0
-qrcode[pil]==7.3.1
-https://github.com/sunu/qt5reactor/archive/58410aaead2185e9917ae9cac9c50fe7b70e4a60.zip#egg=qt5reactor
-
--e ./jmqtui

requirements/testing.txt

@@ -1,11 +0,0 @@
--r base.txt
-# matplotlib
-# numpy
-pexpect
-coverage==5.2.1
-pytest==6.2.5
-pytest-cov>=2.4.0,<2.6
-python-coveralls
-mock
-flake8
-freezegun

setup.cfg

@@ -1,13 +1,10 @@
-# content of pytest.ini
-[tool:pytest]
-testpaths = jmbitcoin jmclient jmbase jmdaemon test
-
 [flake8]
 exclude =
     # defaults
     .svn,CVS,.bzr,.hg,.git,__pycache__,.tox,
     # lots of "unused imports"
     __init__.py
+    jmqtui
 
 max-line-length = 79
 

setupall.py

@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-import sys, os, subprocess
-
-"""A script to install in one of 3 modes:
-(a) daemon - installs jmbase, jmdaemon
-(b) client-only - installs jmbase, jmclient
-(c) client-bitcoin - installs jmbase, jmclient, jmbitcoin
-(d) all - installs jmbase, jmclient, jmbitcoin, jmdaemon
-(e) develop - installs jmbase, jmclient, jmbitcoin, jmdaemon linked to the source directoy
-
-Note that b and c are distinct mainly due to the fact that
-the latter requires the secp256k1 (libsecp256k1 via the secp256k1-py binding),
-which is something that would be an annoyance if you don't need it (wallets).
-While only (a) has a similarly annoying dependency on libnacl as the binding
-to libsodium.
-All modes require and install twisted.
-"""
-
-if sys.version_info < (3, 7):
-    raise RuntimeError("This package requres Python 3.7+")
-
-def help():
-    print("Usage: python setupall.py <mode>\n"
-          "Mode is one of:\n"
-          "`--all` - for the full joinmarket package with secp256k1\n"
-          "`--daemon` - for joinmarketd\n"
-          "`--client-only` - for client not using joinmarket's own bitcoin code\n"
-          "`--client-bitcoin` - using joinmarket bitcoin code, installs secp256k1\n"
-          "`--develop` - uses the local code for all packages (does not install to site-packages)."
-          )
-    sys.exit(2)
-
-if len(sys.argv) != 2:
-    help()
-
-curdir = os.getcwd()
-
-mode = sys.argv[1]
-
-packages = {"--all": ["jmbase", "jmbitcoin", "jmclient", "jmdaemon"],
-            "--daemon": ["jmbase", "jmdaemon"],
-            "--client-only": ["jmbase", "jmclient"],
-            "--client-bitcoin": ["jmbase", "jmbitcoin", "jmclient"],
-            "--develop": ["jmbase", "jmbitcoin", "jmclient", "jmdaemon"]}
-if mode not in packages:
-    help()
-
-for x in packages[mode]:
-    dirtorun = os.path.join(curdir, x)
-
-    cmd = ['pip', 'install', '--upgrade']
-    if mode == "--develop":
-        cmd.append('-e')
-    cmd.append('.')
-
-    p = subprocess.Popen(cmd, cwd=dirtorun)
-    p.wait()

src/jmqtui/_compile.py

@@ -0,0 +1,7 @@
+import os
+
+# The following command should be executed whenever `open_wallet_dialog.ui` is updated.
+# `gui-dev` dependencies must be installed prior to execution.
+
+def compile_ui():
+    os.system('pyside2-uic jmqtui/open_wallet_dialog.ui -o jmqtui/open_wallet_dialog.py')