diff --git a/jumpscale/clients/stellar/balance.py b/jumpscale/clients/stellar/balance.py index e5cdb37937..e5b25b348e 100644 --- a/jumpscale/clients/stellar/balance.py +++ b/jumpscale/clients/stellar/balance.py @@ -15,6 +15,8 @@ def from_horizon_response(response_balance): if response_balance["asset_type"] == "native": asset_code = "XLM" asset_issuer = None + elif response_balance["asset_type"] == "liquidity_pool_shares": + return None else: asset_code = response_balance["asset_code"] asset_issuer = response_balance["asset_issuer"] diff --git a/jumpscale/clients/stellar/stellar.py b/jumpscale/clients/stellar/stellar.py index 2817bd73d1..2519b61f25 100644 --- a/jumpscale/clients/stellar/stellar.py +++ b/jumpscale/clients/stellar/stellar.py @@ -91,7 +91,9 @@ def _get_free_balances(self, address=None): balances = AccountBalances(address) response = self._get_horizon_server().accounts().account_id(address).call() for response_balance in response["balances"]: - balances.add_balance(Balance.from_horizon_response(response_balance)) + balance = Balance.from_horizon_response(response_balance) + if balance is not None: + balances.add_balance(balance) return balances def load_account(self): diff --git a/jumpscale/packages/admin/frontend/components/legal/License.vue b/jumpscale/packages/admin/frontend/components/legal/License.vue index 8634fd940d..e626481f41 100644 --- a/jumpscale/packages/admin/frontend/components/legal/License.vue +++ b/jumpscale/packages/admin/frontend/components/legal/License.vue @@ -4,7 +4,7 @@ diff --git a/jumpscale/packages/admin/frontend/components/legal/Terms.vue b/jumpscale/packages/admin/frontend/components/legal/Terms.vue index 0627049259..f255b267dc 100644 --- a/jumpscale/packages/admin/frontend/components/legal/Terms.vue +++ b/jumpscale/packages/admin/frontend/components/legal/Terms.vue @@ -1,7 +1,6 @@ - diff --git a/jumpscale/packages/admin/frontend/index.html b/jumpscale/packages/admin/frontend/index.html index fd0c14c7ab..cb03b9e15b 100644 --- a/jumpscale/packages/admin/frontend/index.html +++ b/jumpscale/packages/admin/frontend/index.html @@ -1,42 +1,48 @@ - - - - - - - 3Bot Admin - - - + + + + + + + + 3Bot Admin + - -
- - - - - - - - - - - - - - - + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/jumpscale/packages/chatflows/frontend/index.html b/jumpscale/packages/chatflows/frontend/index.html index 59f2cae538..d1ed31353b 100644 --- a/jumpscale/packages/chatflows/frontend/index.html +++ b/jumpscale/packages/chatflows/frontend/index.html @@ -1,121 +1,125 @@ - - - - - - - -
- - - - - - - - - - - - + + + + + + + + + + + - + } + }) + + const app = httpVueLoader('/chatflows/static/App.vue') + const router = new VueRouter({ + routes: [ + { path: '/', component: app }, + ] + }) + new Vue({ + el: '#app', + components: { + App: app, + }, + router, + vuetify + }) + + + diff --git a/jumpscale/packages/marketplace/frontend/components/License.vue b/jumpscale/packages/marketplace/frontend/components/License.vue index d958e14aff..b12869cf19 100644 --- a/jumpscale/packages/marketplace/frontend/components/License.vue +++ b/jumpscale/packages/marketplace/frontend/components/License.vue @@ -4,7 +4,7 @@ diff --git a/jumpscale/packages/marketplace/frontend/components/Terms.vue b/jumpscale/packages/marketplace/frontend/components/Terms.vue index 0627049259..f255b267dc 100644 --- a/jumpscale/packages/marketplace/frontend/components/Terms.vue +++ b/jumpscale/packages/marketplace/frontend/components/Terms.vue @@ -1,7 +1,6 @@ - diff --git a/jumpscale/packages/marketplace/frontend/index.html b/jumpscale/packages/marketplace/frontend/index.html index f11a6d8fb7..3d6d5ff561 100644 --- a/jumpscale/packages/marketplace/frontend/index.html +++ b/jumpscale/packages/marketplace/frontend/index.html @@ -16,10 +16,10 @@
- + + - diff --git a/jumpscale/packages/tfgrid_solutions/scripts/threebot/entrypoint.sh b/jumpscale/packages/tfgrid_solutions/scripts/threebot/entrypoint.sh index 6900db7bab..0b850f0e06 100644 --- a/jumpscale/packages/tfgrid_solutions/scripts/threebot/entrypoint.sh +++ b/jumpscale/packages/tfgrid_solutions/scripts/threebot/entrypoint.sh @@ -17,13 +17,13 @@ cd ${SDK_PATH} git fetch --all poetry_install=false -if ! git diff --quiet `git branch --show-current` origin/$SDK_VERSION -- poetry.lock; then +if ! git diff --quiet `git describe --tags --abbrev=0` $SDK_VERSION -- poetry.lock; then # They are differnet poetry_install=true fi -git reset --hard origin/${SDK_VERSION} +git reset --hard $SDK_VERSION git checkout $SDK_VERSION if $poetry_install; then diff --git a/jumpscale/packages/tfgrid_solutions/scripts/threebot/minimal_entrypoint.py b/jumpscale/packages/tfgrid_solutions/scripts/threebot/minimal_entrypoint.py index c689813f30..93bb78a092 100644 --- a/jumpscale/packages/tfgrid_solutions/scripts/threebot/minimal_entrypoint.py +++ b/jumpscale/packages/tfgrid_solutions/scripts/threebot/minimal_entrypoint.py @@ -78,6 +78,8 @@ VDC_INSTANCE_NAME = vdc.instance_name os.environ.putenv("VDC_INSTANCE_NAME", VDC_INSTANCE_NAME) +sdk_path = j.tools.git.find_git_path(j.packages.admin.__file__) +latest_release = j.tools.git.get_latest_remote_tag(sdk_path) VDC_VARS = { "VDC_PASSWORD_HASH": VDC_PASSWORD_HASH, "EXPLORER_URL": EXPLORER_URL, @@ -94,7 +96,7 @@ "PROVISIONING_WALLET_SECRET": os.environ.get("PROVISIONING_WALLET_SECRET"), "PREPAID_WALLET_SECRET": os.environ.get("PREPAID_WALLET_SECRET"), "VDC_INSTANCE_NAME": VDC_INSTANCE_NAME, - "SDK_VERSION": os.environ.get("SDK_VERSION", "development"), + "SDK_VERSION": os.environ.get("SDK_VERSION", latest_release), "BACKUP_CONFIG": BACKUP_CONFIG, "THREEBOT_PRIVATE_KEY": THREEBOT_PRIVATE_KEY, "S3_URL": S3_URL, diff --git a/jumpscale/packages/threebot_deployer/bottle/utils.py b/jumpscale/packages/threebot_deployer/bottle/utils.py index b43ac3a947..47b7a529c3 100644 --- a/jumpscale/packages/threebot_deployer/bottle/utils.py +++ b/jumpscale/packages/threebot_deployer/bottle/utils.py @@ -59,6 +59,8 @@ def build_solution_info(workloads, threebot): continue if not workload_result: continue + sdk_path = j.tools.git.find_git_path(j.packages.admin.__file__) + release = j.tools.git.get_latest_remote_tag(sdk_path) solution_info.update( { "ipv4": workload_result["ipv4"], @@ -70,7 +72,7 @@ def build_solution_info(workloads, threebot): "node": workload.info.node_id, "compute_pool": workload.info.pool_id, "network": workload.network_connection[0].network_id, - "branch": workload.environment.get("SDK_VERSION"), + "release": release, "public_key": workload.environment.get("SSHKEY"), } ) @@ -428,7 +430,7 @@ def redeploy_threebot_solution( j.logger.debug(f"backup token {backup_token} created for tname {backup_model.tname}") environment_vars = { - "SDK_VERSION": new_solution_info["branch"], + "SDK_VERSION": new_solution_info["release"], "INSTANCE_NAME": new_solution_info["name"], "THREEBOT_NAME": owner, "DOMAIN": domain, diff --git a/jumpscale/packages/threebot_deployer/chats/threebot.py b/jumpscale/packages/threebot_deployer/chats/threebot.py index 43d6b11041..ac86d2fdde 100644 --- a/jumpscale/packages/threebot_deployer/chats/threebot.py +++ b/jumpscale/packages/threebot_deployer/chats/threebot.py @@ -369,7 +369,7 @@ def _deploy(self): else: default_identity = "main" environment_vars = { - "SDK_VERSION": self.branch, + "SDK_VERSION": self._branch or self.release, "INSTANCE_NAME": self.solution_name, "THREEBOT_NAME": self.threebot_name, "DOMAIN": self.domain, diff --git a/jumpscale/packages/threebot_deployer/frontend/components/License.vue b/jumpscale/packages/threebot_deployer/frontend/components/License.vue index d53c0df8bd..1e6545eb57 100644 --- a/jumpscale/packages/threebot_deployer/frontend/components/License.vue +++ b/jumpscale/packages/threebot_deployer/frontend/components/License.vue @@ -4,7 +4,7 @@ diff --git a/jumpscale/packages/threebot_deployer/frontend/components/Terms.vue b/jumpscale/packages/threebot_deployer/frontend/components/Terms.vue index 83338e6aae..f255b267dc 100644 --- a/jumpscale/packages/threebot_deployer/frontend/components/Terms.vue +++ b/jumpscale/packages/threebot_deployer/frontend/components/Terms.vue @@ -1,6 +1,6 @@ diff --git a/jumpscale/packages/threebot_deployer/frontend/index.html b/jumpscale/packages/threebot_deployer/frontend/index.html index fbef4586c3..5c51aa0bf0 100644 --- a/jumpscale/packages/threebot_deployer/frontend/index.html +++ b/jumpscale/packages/threebot_deployer/frontend/index.html @@ -16,10 +16,10 @@
- + + - diff --git a/jumpscale/packages/vdc/frontend/components/License.vue b/jumpscale/packages/vdc/frontend/components/License.vue index d53c0df8bd..1e6545eb57 100644 --- a/jumpscale/packages/vdc/frontend/components/License.vue +++ b/jumpscale/packages/vdc/frontend/components/License.vue @@ -4,7 +4,7 @@ diff --git a/jumpscale/packages/vdc/frontend/components/Terms.vue b/jumpscale/packages/vdc/frontend/components/Terms.vue index 83338e6aae..f255b267dc 100644 --- a/jumpscale/packages/vdc/frontend/components/Terms.vue +++ b/jumpscale/packages/vdc/frontend/components/Terms.vue @@ -1,6 +1,6 @@ diff --git a/jumpscale/packages/vdc/frontend/index.html b/jumpscale/packages/vdc/frontend/index.html index 15a7704bcc..4e062a87bc 100644 --- a/jumpscale/packages/vdc/frontend/index.html +++ b/jumpscale/packages/vdc/frontend/index.html @@ -16,10 +16,10 @@
- + + - diff --git a/jumpscale/packages/vdc_dashboard/bottle/api/deployments.py b/jumpscale/packages/vdc_dashboard/bottle/api/deployments.py index 244f3dbf61..3444e47ec1 100644 --- a/jumpscale/packages/vdc_dashboard/bottle/api/deployments.py +++ b/jumpscale/packages/vdc_dashboard/bottle/api/deployments.py @@ -404,13 +404,13 @@ def accept(): @app.route("/api/update", method="GET") @package_authorized("vdc_dashboard") def update(): - branch_param = request.params.get("branch") - if branch_param: - branch = branch_param + ref_param = request.params.get("ref") + sdk_path = j.tools.git.find_git_path(j.packages.admin.__file__) + if ref_param: + ref = ref_param else: - branch = os.environ.get("SDK_VERSION", "development") - sdk_path = "/sandbox/code/github/threefoldtech/js-sdk" - cmd = f"bash jumpscale/packages/vdc_dashboard/scripts/update.sh {branch}" + ref = j.tools.git.get_latest_remote_tag(sdk_path) + cmd = f"bash jumpscale/packages/vdc_dashboard/scripts/update.sh {ref}" rc, out, err = j.sals.process.execute(cmd, cwd=sdk_path, showout=True, timeout=1200) if rc: return HTTPResponse( @@ -431,15 +431,10 @@ def update(): @app.route("/api/check_update", method="GET") @package_authorized("vdc_dashboard") def check_update(): - vdc_dashboard_path = j.packages.vdc_dashboard.__file__ - sdk_repo_path = j.tools.git.find_git_path(vdc_dashboard_path) - try: - _, out, _ = j.sals.process.execute("git ls-remote --tag | tail -n 1", cwd=sdk_repo_path) - latest_remote_tag = out.split("/tags/")[-1].rstrip("\n") - except Exception as e: - raise j.exceptions.Runtime(f"Failed to fetch remote releases. {str(e)}") + sdk_path = j.tools.git.find_git_path(j.packages.admin.__file__) + latest_remote_tag = j.tools.git.get_latest_remote_tag(sdk_path) + _, latest_local_tag, _ = j.sals.process.execute("git describe --tags --abbrev=0", cwd=sdk_path) - _, latest_local_tag, _ = j.sals.process.execute("git describe --tags --abbrev=0", cwd=sdk_repo_path) if latest_remote_tag != latest_local_tag.rstrip("\n"): return HTTPResponse( j.data.serializers.json.dumps({"new_release": latest_remote_tag}), diff --git a/jumpscale/packages/vdc_dashboard/frontend/components/License.vue b/jumpscale/packages/vdc_dashboard/frontend/components/License.vue index 95c7c90ab3..71e4505366 100644 --- a/jumpscale/packages/vdc_dashboard/frontend/components/License.vue +++ b/jumpscale/packages/vdc_dashboard/frontend/components/License.vue @@ -4,7 +4,7 @@ diff --git a/jumpscale/packages/vdc_dashboard/frontend/components/Terms.vue b/jumpscale/packages/vdc_dashboard/frontend/components/Terms.vue index 83338e6aae..f255b267dc 100644 --- a/jumpscale/packages/vdc_dashboard/frontend/components/Terms.vue +++ b/jumpscale/packages/vdc_dashboard/frontend/components/Terms.vue @@ -1,6 +1,6 @@ diff --git a/jumpscale/packages/vdc_dashboard/frontend/index.html b/jumpscale/packages/vdc_dashboard/frontend/index.html index fb980423fa..6f70c63a8e 100644 --- a/jumpscale/packages/vdc_dashboard/frontend/index.html +++ b/jumpscale/packages/vdc_dashboard/frontend/index.html @@ -4,7 +4,8 @@ - + VDC Dashboard @@ -15,10 +16,10 @@
- + + - diff --git a/jumpscale/packages/vdc_dashboard/scripts/update.sh b/jumpscale/packages/vdc_dashboard/scripts/update.sh index a113df40c0..25874fc79b 100644 --- a/jumpscale/packages/vdc_dashboard/scripts/update.sh +++ b/jumpscale/packages/vdc_dashboard/scripts/update.sh @@ -4,50 +4,51 @@ # 64 Error: poetry install failed POETRY_INSTALL_ERROR # 65 Error: hard reset files to HEAD failed GIT_RESET_ERROR # 66 Error: switch to the upstream branch failed GIT_CHECKOUT_ERROR -# 67 Error: can't find the branch name in the repository GIT_BRANCH_NOT_EXIST +# 67 Error: can't find the branch name in the repository GIT_BRANCH_OR_TAG_NOT_EXIST ################# POETRY_INSTALL_ERROR=64 GIT_RESET_ERROR=65 GIT_CHECKOUT_ERROR=66 -GIT_BRANCH_NOT_EXIST=67 +GIT_BRANCH_OR_TAG_NOT_EXIST=67 # fetching all remote branches" -git fetch --all +git fetch --all --force -# setting the branch name to use on updating -if [ $1 ]; then SDK_BRANCH=$1; else SDK_BRANCH=development; fi -echo "we will use origin/${SDK_BRANCH} branch to update the code" +# setting the branch/tag name to use on updating +if [ $1 ]; then SDK_REFS=$1; else SDK_REFS=development; fi +echo "we will use ${SDK_REFS} branch/tag to update the code" -# find out if a remote git branch with $SDK_BRANCH name exists in the repository -if ! git show-ref --quiet --verify "refs/remotes/origin/$SDK_BRANCH"; then - >&2 echo "error: can't find the branch <$SDK_BRANCH> in the repository" - exit $GIT_BRANCH_NOT_EXIST +# find out if a git branch/tag with $SDK_REFS name exists in the repository +if ! (git show-ref --quiet --verify "refs/heads/$SDK_REFS" || git show-ref --quiet --verify "refs/tags/$SDK_REFS"); then + >&2 echo "error: can't find the branch/ tag <$SDK_REFS> in the repository" + exit $GIT_BRANCH_OR_TAG_NOT_EXIST fi # save the current information to use in case of update failure SAVED_BRANCH_NAME=$(git branch --show-current) +SAVED_TAG_NAME=$(git describe) SAVED_COMMIT_HASH=$(git log -1 --pretty=format:"%H") -echo "we will revert to $SAVED_BRANCH_NAME $SAVED_COMMIT_HASH in case of failure" +echo "we will revert to tag=$SAVED_TAG_NAME branch=$SAVED_BRANCH_NAME commit=$SAVED_COMMIT_HASH in case of failure" # checking if poetry.lock has changed POETRY_INSTALL=false -if ! git diff --quiet origin/$SDK_BRANCH poetry.lock; then +if ! git diff --quiet $SDK_REFS poetry.lock; then # They are differnet echo "poetry.lock has changed" POETRY_INSTALL=true fi -git stash push jumpscale/packages/vdc_dashboard/package.toml + git stash push -m "package.toml" -- jumpscale/packages/vdc_dashboard/package.toml -# git rid of the uncommited local changes and switch the branch -if ! git checkout -f $SDK_BRANCH; then - >&2 echo "error: switch to the upstream branch <$SDK_BRANCH> failed" - git stash pop +# git rid of the uncommited local changes and switch the branch/tag +if ! git checkout -f $SDK_REFS; then + >&2 echo "error: switch to the upstream branch <$SDK_REFS> failed" + git stash apply stash^{/package.toml} exit $GIT_CHECKOUT_ERROR fi RESET_SUCCEEDED=false -if git reset --hard origin/$SDK_BRANCH; then +if git reset --hard $DEST; then RESET_SUCCEEDED=true else ERR=$GIT_RESET_ERROR @@ -62,7 +63,7 @@ if $RESET_SUCCEEDED; then while [ $COUNT -lt $MAX_TRIES ]; do poetry install --no-interaction --no-dev if [ $? -eq 0 ];then - git stash pop + git stash apply stash^{/package.toml} echo "Code updated and all defined dependencies successfully installed!" exit 0 fi @@ -70,13 +71,17 @@ if $RESET_SUCCEEDED; then done >&2 echo "Error: Failed to install the defined dependencies!" else - git stash pop + git stash apply stash^{/package.toml} echo "code updated successfully!" exit 0 fi fi # reverting to saved info if hard reset files to HEAD or installing the defined dependencies was failed -git checkout -f $SAVED_BRANCH_NAME && git reset --hard $SAVED_COMMIT_HASH -git stash pop +if $SAVED_BRANCH_NAME == ""; then + git checkout -f $SAVED_TAG_NAME && git reset --hard $SAVED_COMMIT_HASH +else + git checkout -f $SAVED_BRANCH_NAME && git reset --hard $SAVED_COMMIT_HASH +fi +git stash apply stash^{/package.toml} exit $ERR diff --git a/jumpscale/sals/marketplace/apps_chatflow.py b/jumpscale/sals/marketplace/apps_chatflow.py index f99a966e3c..4ef7f3b3f3 100644 --- a/jumpscale/sals/marketplace/apps_chatflow.py +++ b/jumpscale/sals/marketplace/apps_chatflow.py @@ -25,6 +25,7 @@ class MarketPlaceAppsChatflow(MarketPlaceChatflow): def __init__(self, *args, **kwargs): self._branch = None + self._release = None super().__init__(*args, **kwargs) def _init_solution(self): @@ -62,6 +63,14 @@ def branch(self): self._branch = "development" return self._branch + @property + def release(self): + if not self._release: + # get latest remote tag + sdk_path = j.tools.git.find_git_path(j.packages.admin.__file__) + self._release = j.tools.git.get_latest_remote_tag(sdk_path) + return self._release + def _choose_flavor(self, flavors=None): flavors = flavors or FLAVORS # use cru, mru, hru, mru values as defined in the class query if they are not specified in the flavor diff --git a/jumpscale/sals/vdc/threebot.py b/jumpscale/sals/vdc/threebot.py index 41eeaad520..aeaf17f9b7 100644 --- a/jumpscale/sals/vdc/threebot.py +++ b/jumpscale/sals/vdc/threebot.py @@ -45,6 +45,7 @@ class ThreebotCertificate(Base): class VDCThreebotDeployer(VDCBaseComponent): def __init__(self, *args, **kwargs): self._branch = None + self._release = None super().__init__(*args, **kwargs) self.acme_server_url = j.core.config.get("VDC_ACME_SERVER_URL", "https://ca1.grid.tf") self.acme_server_api_key = j.core.config.get("VDC_ACME_SERVER_API_KEY", "") @@ -66,6 +67,14 @@ def branch(self): self._branch = "development" return self._branch + @property + def release(self): + if not self._release: + # get latest remote tag + sdk_path = j.tools.git.find_git_path(j.packages.admin.__file__) + self._release = j.tools.git.get_latest_remote_tag(sdk_path) + return self._release + def get_subdomain(self): # TODO: parent domain should be always the same prefix = self.vdc_deployer.get_prefix() @@ -135,7 +144,7 @@ def deploy_threebot( "NETWORK_FARMS": ",".join(NETWORK_FARMS.get()), "COMPUTE_FARMS": ",".join(COMPUTE_FARMS.get()), # "VDC_MINIO_ADDRESS": minio_ip_address, - "SDK_VERSION": self.branch, + "SDK_VERSION": self._branch or self.release, "SSHKEY": self.vdc_deployer.ssh_key.public_key.strip(), "MINIMAL": "true", "TEST_CERT": "true" if j.core.config.get("TEST_CERT") else "false", diff --git a/jumpscale/tools/vdc/reporting/__init__.py b/jumpscale/tools/vdc/reporting/__init__.py index 26a9561103..856ecccad8 100644 --- a/jumpscale/tools/vdc/reporting/__init__.py +++ b/jumpscale/tools/vdc/reporting/__init__.py @@ -61,8 +61,12 @@ def report_vdc_status(vdc_name: str): master_ip_state = "Down" threebot_domain_state = "Down" + master_ip = "" if vdc.has_minimal_components(): - master_ip = [n for n in vdc.kubernetes if n.role == KubernetesRole.MASTER][-1].public_ip + for n in vdc.kubernetes: + if n.role == KubernetesRole.MASTER: + master_ip = n.public_ip + threebot_ip = vdc.threebot.ip_address master_ip_state = "Up" if j.sals.nettools.tcp_connection_test(master_ip, 6443, 10) else "Down" threebot_domain = f"https://{vdc.threebot.domain}" diff --git a/poetry.lock b/poetry.lock index b7f49121a4..4042b1ca63 100644 --- a/poetry.lock +++ b/poetry.lock @@ -769,7 +769,7 @@ tests = ["coverage (>=4.0)", "pytest-cache (>=1.0)", "pytest-cov", "flake8", "py [[package]] name = "js-ng" -version = "11.0b13" +version = "11.0b14" description = "system automation, configuration management and RPC framework" category = "main" optional = false @@ -1816,7 +1816,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "1.1" python-versions = "^3.6" -content-hash = "c66ecc6c9f4e99e547cc3c1f9fbbde3a71d09750f7499c52518ae96fc2f010b6" +content-hash = "6f710369683ee9f3ee1670acf1de5c49dbc7b969852c6d0211eda020587868cf" [metadata.files] acme = [ @@ -2278,8 +2278,8 @@ josepy = [ {file = "josepy-1.8.0.tar.gz", hash = "sha256:a5a182eb499665d99e7ec54bb3fe389f9cbc483d429c9651f20384ba29564269"}, ] js-ng = [ - {file = "js-ng-11.0b13.tar.gz", hash = "sha256:f4e9d05c4fc5e511402de78f822ce074c3f181aff0c6bacf853297ba4d1189d3"}, - {file = "js_ng-11.0b13-py3-none-any.whl", hash = "sha256:0f9a60fba9efac39b4d5e97278e59186aeac257ff0f5e7375864b48d352abff7"}, + {file = "js-ng-11.0b14.tar.gz", hash = "sha256:138adac95d8ab8d999cf9d55ec02edb8ba96eae6c883de3368861e3e612e0eda"}, + {file = "js_ng-11.0b14-py3-none-any.whl", hash = "sha256:1295fee3564d94c7425205a91552260a0328fc3ecfa27f8ea48fc2aabdca2037"}, ] jsonpickle = [ {file = "jsonpickle-2.0.0-py2.py3-none-any.whl", hash = "sha256:c1010994c1fbda87a48f8a56698605b598cb0fc6bb7e7927559fc1100e69aeac"}, @@ -2320,39 +2320,20 @@ markupsafe = [ {file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"}, {file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"}, {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5"}, {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"}, {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7"}, {file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"}, {file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b"}, {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-win32.whl", hash = "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8"}, {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, ] mccabe = [ diff --git a/pyproject.toml b/pyproject.toml index 6a0411a0d2..f1c8b17a68 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,14 +1,14 @@ [tool.poetry] name = "js-sdk" packages = [{ include = "jumpscale" }] -version = "11.5b9" +version = "11.5b13" description = "SDK for threefold grid" authors = ["xmonader "] license = "Apache-2.0" [tool.poetry.dependencies] cryptography = "3.3.2" -js-ng = "11.0b13" +js-ng = "11.0b14" python = "^3.6" cryptocompare = "^0.6.4" certifi = "^2019.6"