Skip to content

Commit 58ba0bc

Browse files
authored
Upgrade to v0.2.0
2 parents 63f44c1 + 5891973 commit 58ba0bc

5 files changed

Lines changed: 8 additions & 16 deletions

File tree

feClient/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "0.1.5"
1+
__version__ = "0.2.0"
22
__doc__ = """
33
Python client for Fusion Explorer API v{}
44
Copyright (C) 2021 Fusion Solutions KFT <contact@fusionsolutions.io>

feClient/__main__.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
SEC_ENV_NAME = "FECLI_SECKEY"
1212
CACHEPATH_ENV_NAME = "FECLI_CACHE_PATH"
1313
DISCACHE_ENV_NAME = "FECLI_CACHE_DISABLE"
14-
CONVERTHEX_ENV_NAME = "FECLI_CONVERT_HEX"
1514
STORAGE_FILE = os.getenv(CACHEPATH_ENV_NAME, "{}/feclicache.json".format(tempfile.gettempdir()))
1615

1716
__doc__ = """Fusion Explorer command line interface v{version}
@@ -25,9 +24,6 @@
2524
For unset:
2625
unset {PUB_ENV_NAME} {SEC_ENV_NAME}
2726
28-
All numbers will be converted into decimal string, but you can use {CONVERTHEX_ENV_NAME} enviroment if you want in hexadecimal:
29-
export {CONVERTHEX_ENV_NAME}="1"
30-
3127
Available bitmasks:
3228
{bitmasks}
3329
@@ -184,7 +180,6 @@ def main() -> None:
184180
with Client(
185181
os.getenv(PUB_ENV_NAME, None),
186182
os.getenv(SEC_ENV_NAME, None),
187-
convertNumbers="hex" if os.getenv(CONVERTHEX_ENV_NAME, "0") == "1" else "str",
188183
disableCompression=disableCompression,
189184
log=Logger("Client")
190185
) as c:
@@ -229,7 +224,6 @@ def main() -> None:
229224
STORAGE_FILE=STORAGE_FILE,
230225
DISCACHE_ENV_NAME=DISCACHE_ENV_NAME,
231226
CACHEPATH_ENV_NAME=CACHEPATH_ENV_NAME,
232-
CONVERTHEX_ENV_NAME=CONVERTHEX_ENV_NAME,
233227
selfName=selfName,
234228
bitmasks="\n".join([" {0:<{pad}} {1}".format(*x, pad=optimalBitmaskIDColumnLength) for x in bitmaskLines]),
235229
)]

feClient/client.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ class Client(_Client):
1818
pubkey:bytes
1919
seckey:bytes
2020
def __init__(self, projectPublicKey:Optional[Union[str, bytes]]=None, projectSecretKey:Optional[Union[str, bytes]]=None,
21-
timeWindow:int=60, convertNumbers:Optional[str]=None, retryCount:int=10, retryDelay:Union[int, float]=5,
22-
connectTimeout:Union[int, float]=15, transferTimeout:Union[int, float]=320, disableCompression:bool=False,
23-
log:Optional[T_Logger]=None, signal:Optional[T_Signal]=None, target:Tuple[str, int]=("api.fusionexplorer.io", 443),
24-
httpHost:Optional[str]=None, ssl:bool=True) -> None:
21+
timeWindow:int=60, retryCount:int=10, retryDelay:Union[int, float]=5, connectTimeout:Union[int, float]=15,
22+
transferTimeout:Union[int, float]=320, disableCompression:bool=False, log:Optional[T_Logger]=None,
23+
signal:Optional[T_Signal]=None, target:Tuple[str, int]=("api.fusionexplorer.io", 443), httpHost:Optional[str]=None,
24+
ssl:bool=True) -> None:
2525
super().__init__(
2626
protocol = "TCPv4:HTTP:JSONRPC-P",
2727
target = target,
@@ -33,7 +33,6 @@ def __init__(self, projectPublicKey:Optional[Union[str, bytes]]=None, projectSec
3333
httpHost = httpHost,
3434
disableCompression = disableCompression,
3535
useBulkRequest = True,
36-
convertNumbers = convertNumbers,
3736
log = log or Logger("FusionExplorer"),
3837
signal = signal,
3938
)
@@ -103,7 +102,6 @@ def clone(self, **kwargs:Any) -> Client:
103102
"projectPublicKey": self.pubkey,
104103
"projectSecretKey": self.seckey,
105104
"timeWindow": self.timeWindow,
106-
"convertNumbers": self.convertNumbers,
107105
"retryDelay": self.retryDelay,
108106
"retryCount": self.retryCount,
109107
"connectTimeout": self.connectTimeout,

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
python-fsrpcclient~=0.4.0
1+
python-fsrpcclient~=0.5.0

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
setup(
1111
name = "python-feclient",
12-
version = "0.1.5",
12+
version = "0.2.0",
1313
description = "Client for Fusion Explorer",
1414
keywords = "explorer client fusion solutions fusionsolutions fusionexplorer",
1515
author = "Andor `iFA` Rajci - Fusions Solutions KFT",
@@ -22,7 +22,7 @@
2222
zip_safe = False,
2323
scripts = ["feClient/fexplorer-cli"],
2424
python_requires = ">=3.8.0",
25-
install_requires = ["python-fsrpcclient~=0.4.0"],
25+
install_requires = ["python-fsrpcclient~=0.5.0"],
2626
test_suite = "feClient.test",
2727
package_data = { "":["py.typed"] },
2828
classifiers = [ # https://pypi.org/pypi?%3Aaction=list_classifiers

0 commit comments

Comments
 (0)