Convert from setup.py to pyproject.toml

tests/basicswap/common.py

@@ -14,7 +14,7 @@ from urllib.request import urlopen
 from .util import read_json_api
 from basicswap.rpc import callrpc
 from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
-from bin.basicswap_prepare import downloadPIVXParams
+from basicswap.bin.prepare import downloadPIVXParams
 
 
 TEST_HTTP_HOST = os.getenv('TEST_HTTP_HOST', '127.0.0.1')  # Set to 0.0.0.0 when used in docker

tests/basicswap/common_xmr.py

@@ -35,7 +35,7 @@ from tests.basicswap.common import (
 from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
 
 import basicswap.config as cfg
-import bin.basicswap_run as runSystem
+import basicswap.bin.run as runSystem
 
 TEST_PATH = os.path.expanduser(os.getenv('TEST_PATH', '~/test_basicswap1'))
 
@@ -104,7 +104,7 @@ def run_prepare(node_id, datadir_path, bins_path, with_coins, mnemonic_in=None,
 
     os.environ['DCR_RPC_PWD'] = 'dcr_pwd'
 
-    import bin.basicswap_prepare as prepareSystem
+    import basicswap.bin.prepare as prepareSystem
     # Hack: Reload module to set env vars as the basicswap_prepare module is initialised if imported from elsewhere earlier
     from importlib import reload
     prepareSystem = reload(prepareSystem)

tests/basicswap/extended/test_dash.py

@@ -68,7 +68,7 @@ from tests.basicswap.common import (
     PREFIX_SECRET_KEY_REGTEST,
     waitForRPC,
 )
-from bin.basicswap_run import startDaemon
+from basicswap.bin.run import startDaemon
 
 
 logger = logging.getLogger()

tests/basicswap/extended/test_dcr.py

@@ -55,7 +55,7 @@ from tests.basicswap.test_xmr import BaseTest, test_delay_event
 from basicswap.interface.dcr import DCRInterface
 from basicswap.interface.dcr.messages import CTransaction, CTxIn, COutPoint
 from basicswap.interface.dcr.script import OP_CHECKSEQUENCEVERIFY, push_script_data
-from bin.basicswap_run import startDaemon
+from basicswap.bin.run import startDaemon
 
 logger = logging.getLogger()
 

tests/basicswap/extended/test_firo.py

@@ -43,7 +43,7 @@ from basicswap.interface.contrib.firo_test_framework.mininode import (
     CTransaction,
     set_regtest,
 )
-from bin.basicswap_run import startDaemon
+from basicswap.bin.run import startDaemon
 from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
 from tests.basicswap.test_xmr import BaseTest, test_delay_event, callnoderpc
 

tests/basicswap/extended/test_nav.py

@@ -58,7 +58,7 @@ from basicswap.interface.contrib.nav_test_framework.script import (
     OP_CHECKSEQUENCEVERIFY
 )
 
-from bin.basicswap_run import startDaemon
+from basicswap.bin.run import startDaemon
 from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
 from tests.basicswap.test_xmr import test_delay_event, callnoderpc
 from basicswap.contrib.mnemonic import Mnemonic

tests/basicswap/extended/test_network.py

@@ -58,7 +58,7 @@ from tests.basicswap.common import (
     waitForRPC,
 )
 
-from bin.basicswap_run import startDaemon
+from basicswap.bin.run import startDaemon
 
 
 logger = logging.getLogger()

tests/basicswap/extended/test_nmc.py

@@ -64,7 +64,7 @@ from tests.basicswap.common import (
     PREFIX_SECRET_KEY_REGTEST,
     waitForRPC,
 )
-from bin.basicswap_run import startDaemon
+from basicswap.bin.run import startDaemon
 
 
 logger = logging.getLogger()

tests/basicswap/extended/test_pivx.py

@@ -68,8 +68,8 @@ from tests.basicswap.common import (
     PREFIX_SECRET_KEY_REGTEST,
     waitForRPC,
 )
-from bin.basicswap_run import startDaemon
-from bin.basicswap_prepare import downloadPIVXParams
+from basicswap.bin.run import startDaemon
+from basicswap.bin.prepare import downloadPIVXParams
 
 
 logger = logging.getLogger()

tests/basicswap/extended/test_prepare.py

@@ -39,7 +39,7 @@ def start_prepare(args, env_pairs=[]):
     for pair in env_pairs:
         os.environ[pair[0]] = pair[1]
         print(pair[0], os.environ[pair[0]])
-    import bin.basicswap_prepare as prepareSystemThread
+    import basicswap.bin.prepare as prepareSystemThread
     with patch.object(sys, 'argv', args):
         prepareSystemThread.main()
     del prepareSystemThread
@@ -49,7 +49,7 @@ def start_run(args, env_pairs=[]):
     for pair in env_pairs:
         os.environ[pair[0]] = pair[1]
         print(pair[0], os.environ[pair[0]])
-    import bin.basicswap_run as runSystemThread
+    import basicswap.bin.run as runSystemThread
     with patch.object(sys, 'argv', args):
         runSystemThread.main()
     del runSystemThread
@@ -81,7 +81,7 @@ class Test(unittest.TestCase):
         config_path = os.path.join(test_path_plain, cfg.CONFIG_FILENAME)
         self.assertTrue(os.path.exists(config_path))
 
-        import bin.basicswap_prepare as prepareSystem
+        import basicswap.bin.prepare as prepareSystem
         try:
             logging.info('Test no overwrite')
             testargs = ['basicswap-prepare', '-datadir=' + test_path_plain, '-withcoin=litecoin']

tests/basicswap/extended/test_wallet_init.py

@@ -34,7 +34,7 @@ from tests.basicswap.util import (
 from tests.basicswap.common_xmr import (
     run_prepare,
 )
-import bin.basicswap_run as runSystem
+import basicswap.bin.run as runSystem
 
 TEST_PATH = os.path.expanduser(os.getenv('TEST_PATH', '~/test_basicswap1'))
 

tests/basicswap/extended/test_wallet_restore.py

@@ -44,7 +44,7 @@ from basicswap.rpc import (
     callrpc,
 )
 from tests.basicswap.mnemonics import mnemonics
-import bin.basicswap_run as runSystem
+import basicswap.bin.run as runSystem
 from tests.basicswap.common import (
     BTC_BASE_RPC_PORT,
     LTC_BASE_RPC_PORT,

tests/basicswap/extended/test_wow.py

@@ -20,7 +20,7 @@ from tests.basicswap.common import (
     stopDaemons,
 )
 from tests.basicswap.test_xmr import BaseTest
-from bin.basicswap_run import startXmrDaemon, startXmrWalletDaemon
+from basicswap.bin.run import startXmrDaemon, startXmrWalletDaemon
 
 from tests.basicswap.extended.test_dcr import (
     run_test_ads_success_path,

tests/basicswap/extended/test_xmr_persistent.py

@@ -50,7 +50,7 @@ from tests.basicswap.common_xmr import (
     XMR_BASE_RPC_PORT,
 )
 from basicswap.interface.dcr.rpc import callrpc as callrpc_dcr
-import bin.basicswap_run as runSystem
+import basicswap.bin.run as runSystem
 
 
 test_path = os.path.expanduser(os.getenv('TEST_PATH', '/tmp/test_persistent'))

tests/basicswap/test_reload.py

@@ -39,7 +39,7 @@ from tests.basicswap.common import (
 from tests.basicswap.common_xmr import (
     prepare_nodes,
 )
-import bin.basicswap_run as runSystem
+import basicswap.bin.run as runSystem
 
 TEST_PATH = os.path.expanduser(os.getenv('TEST_PATH', '~/test_basicswap1'))
 delay_event = threading.Event()

tests/basicswap/test_xmr.py

@@ -91,7 +91,7 @@ from tests.basicswap.common import (
 from basicswap.db_util import (
     remove_expired_data,
 )
-from bin.basicswap_run import startDaemon, startXmrDaemon, startXmrWalletDaemon
+from basicswap.bin.run import startDaemon, startXmrDaemon, startXmrWalletDaemon
 
 
 logger = logging.getLogger()