diff --git a/planetmint/backend/tarantool/connection.py b/planetmint/backend/tarantool/connection.py index 1a66d9f..867084b 100644 --- a/planetmint/backend/tarantool/connection.py +++ b/planetmint/backend/tarantool/connection.py @@ -13,7 +13,7 @@ logger = logging.getLogger(__name__) class TarantoolDB: - def __init__(self, host: str = None, port: int = None, user: str = None, password: str = None, + def __init__(self, host: str = "localhost", port: int = 3303, user: str = None, password: str = None, reset_database: bool = False): self.host = host self.port = port @@ -24,30 +24,33 @@ class TarantoolDB: self.db_connect = tarantool.connect(host=self.host, port=self.port) self.init_path = Config().get()["database"]["init_config"]["absolute_path"] self.drop_path = Config().get()["database"]["drop_config"]["absolute_path"] - if reset_database: - self.drop_database() - self.init_database() + # if reset_database: + # self.drop_database() + # self.init_database() self.SPACE_NAMES = ["abci_chains", "assets", "blocks", "blocks_tx", "elections", "meta_data", "pre_commits", "validators", "transactions", "inputs", "outputs", "keys"] + def _reconnect(self): + self.db_connect = tarantool.connect(host=self.host, port=self.port) + def space(self, space_name: str): - try: - return self.db_connect.space(space_name) - except tarantool.error.SchemaError: - return None + return self.db_connect.space(space_name) def get_connection(self): return self.db_connect def drop_database(self): db_config = Config().get()["database"] - return self.run_command(command=self.drop_path, config=db_config) + cmd_resp = self.run_command(command=self.drop_path, config=db_config) + self._reconnect() + return cmd_resp def init_database(self): db_config = Config().get()["database"] - - return self.run_command(command=self.init_path, config=db_config) + cmd_resp = self.run_command(command=self.init_path, config=db_config) + self._reconnect() + return cmd_resp def run_command(self, command: str, config: dict): import subprocess @@ -57,7 +60,7 @@ class TarantoolDB: stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True, - bufsize=0, + bufsize=1, shell=True).stdout.readlines() # TODO verify if subprocess creation worked properly return True if "nil value" not in ret else False diff --git a/planetmint_environment/bin/Activate.ps1 b/planetmint_environment/bin/Activate.ps1 new file mode 100644 index 0000000..2fb3852 --- /dev/null +++ b/planetmint_environment/bin/Activate.ps1 @@ -0,0 +1,241 @@ +<# +.Synopsis +Activate a Python virtual environment for the current PowerShell session. + +.Description +Pushes the python executable for a virtual environment to the front of the +$Env:PATH environment variable and sets the prompt to signify that you are +in a Python virtual environment. Makes use of the command line switches as +well as the `pyvenv.cfg` file values present in the virtual environment. + +.Parameter VenvDir +Path to the directory that contains the virtual environment to activate. The +default value for this is the parent of the directory that the Activate.ps1 +script is located within. + +.Parameter Prompt +The prompt prefix to display when this virtual environment is activated. By +default, this prompt is the name of the virtual environment folder (VenvDir) +surrounded by parentheses and followed by a single space (ie. '(.venv) '). + +.Example +Activate.ps1 +Activates the Python virtual environment that contains the Activate.ps1 script. + +.Example +Activate.ps1 -Verbose +Activates the Python virtual environment that contains the Activate.ps1 script, +and shows extra information about the activation as it executes. + +.Example +Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv +Activates the Python virtual environment located in the specified location. + +.Example +Activate.ps1 -Prompt "MyPython" +Activates the Python virtual environment that contains the Activate.ps1 script, +and prefixes the current prompt with the specified string (surrounded in +parentheses) while the virtual environment is active. + +.Notes +On Windows, it may be required to enable this Activate.ps1 script by setting the +execution policy for the user. You can do this by issuing the following PowerShell +command: + +PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser + +For more information on Execution Policies: +https://go.microsoft.com/fwlink/?LinkID=135170 + +#> +Param( + [Parameter(Mandatory = $false)] + [String] + $VenvDir, + [Parameter(Mandatory = $false)] + [String] + $Prompt +) + +<# Function declarations --------------------------------------------------- #> + +<# +.Synopsis +Remove all shell session elements added by the Activate script, including the +addition of the virtual environment's Python executable from the beginning of +the PATH variable. + +.Parameter NonDestructive +If present, do not remove this function from the global namespace for the +session. + +#> +function global:deactivate ([switch]$NonDestructive) { + # Revert to original values + + # The prior prompt: + if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) { + Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt + Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT + } + + # The prior PYTHONHOME: + if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) { + Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME + Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME + } + + # The prior PATH: + if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) { + Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH + Remove-Item -Path Env:_OLD_VIRTUAL_PATH + } + + # Just remove the VIRTUAL_ENV altogether: + if (Test-Path -Path Env:VIRTUAL_ENV) { + Remove-Item -Path env:VIRTUAL_ENV + } + + # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether: + if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) { + Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force + } + + # Leave deactivate function in the global namespace if requested: + if (-not $NonDestructive) { + Remove-Item -Path function:deactivate + } +} + +<# +.Description +Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the +given folder, and returns them in a map. + +For each line in the pyvenv.cfg file, if that line can be parsed into exactly +two strings separated by `=` (with any amount of whitespace surrounding the =) +then it is considered a `key = value` line. The left hand string is the key, +the right hand is the value. + +If the value starts with a `'` or a `"` then the first and last character is +stripped from the value before being captured. + +.Parameter ConfigDir +Path to the directory that contains the `pyvenv.cfg` file. +#> +function Get-PyVenvConfig( + [String] + $ConfigDir +) { + Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg" + + # Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue). + $pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue + + # An empty map will be returned if no config file is found. + $pyvenvConfig = @{ } + + if ($pyvenvConfigPath) { + + Write-Verbose "File exists, parse `key = value` lines" + $pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath + + $pyvenvConfigContent | ForEach-Object { + $keyval = $PSItem -split "\s*=\s*", 2 + if ($keyval[0] -and $keyval[1]) { + $val = $keyval[1] + + # Remove extraneous quotations around a string value. + if ("'""".Contains($val.Substring(0, 1))) { + $val = $val.Substring(1, $val.Length - 2) + } + + $pyvenvConfig[$keyval[0]] = $val + Write-Verbose "Adding Key: '$($keyval[0])'='$val'" + } + } + } + return $pyvenvConfig +} + + +<# Begin Activate script --------------------------------------------------- #> + +# Determine the containing directory of this script +$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition +$VenvExecDir = Get-Item -Path $VenvExecPath + +Write-Verbose "Activation script is located in path: '$VenvExecPath'" +Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)" +Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)" + +# Set values required in priority: CmdLine, ConfigFile, Default +# First, get the location of the virtual environment, it might not be +# VenvExecDir if specified on the command line. +if ($VenvDir) { + Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values" +} +else { + Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir." + $VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/") + Write-Verbose "VenvDir=$VenvDir" +} + +# Next, read the `pyvenv.cfg` file to determine any required value such +# as `prompt`. +$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir + +# Next, set the prompt from the command line, or the config file, or +# just use the name of the virtual environment folder. +if ($Prompt) { + Write-Verbose "Prompt specified as argument, using '$Prompt'" +} +else { + Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value" + if ($pyvenvCfg -and $pyvenvCfg['prompt']) { + Write-Verbose " Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'" + $Prompt = $pyvenvCfg['prompt']; + } + else { + Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virutal environment)" + Write-Verbose " Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'" + $Prompt = Split-Path -Path $venvDir -Leaf + } +} + +Write-Verbose "Prompt = '$Prompt'" +Write-Verbose "VenvDir='$VenvDir'" + +# Deactivate any currently active virtual environment, but leave the +# deactivate function in place. +deactivate -nondestructive + +# Now set the environment variable VIRTUAL_ENV, used by many tools to determine +# that there is an activated venv. +$env:VIRTUAL_ENV = $VenvDir + +if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) { + + Write-Verbose "Setting prompt to '$Prompt'" + + # Set the prompt to include the env name + # Make sure _OLD_VIRTUAL_PROMPT is global + function global:_OLD_VIRTUAL_PROMPT { "" } + Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT + New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt + + function global:prompt { + Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) " + _OLD_VIRTUAL_PROMPT + } +} + +# Clear PYTHONHOME +if (Test-Path -Path Env:PYTHONHOME) { + Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME + Remove-Item -Path Env:PYTHONHOME +} + +# Add the venv to the PATH +Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH +$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH" diff --git a/planetmint_environment/bin/activate b/planetmint_environment/bin/activate new file mode 100644 index 0000000..9c2ed9a --- /dev/null +++ b/planetmint_environment/bin/activate @@ -0,0 +1,66 @@ +# This file must be used with "source bin/activate" *from bash* +# you cannot run it directly + +deactivate () { + # reset old environment variables + if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then + PATH="${_OLD_VIRTUAL_PATH:-}" + export PATH + unset _OLD_VIRTUAL_PATH + fi + if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then + PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}" + export PYTHONHOME + unset _OLD_VIRTUAL_PYTHONHOME + fi + + # This should detect bash and zsh, which have a hash command that must + # be called to get it to forget past commands. Without forgetting + # past commands the $PATH changes we made may not be respected + if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then + hash -r 2> /dev/null + fi + + if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then + PS1="${_OLD_VIRTUAL_PS1:-}" + export PS1 + unset _OLD_VIRTUAL_PS1 + fi + + unset VIRTUAL_ENV + if [ ! "${1:-}" = "nondestructive" ] ; then + # Self destruct! + unset -f deactivate + fi +} + +# unset irrelevant variables +deactivate nondestructive + +VIRTUAL_ENV="/home/deffuls/work/planetmint/planetmint_environment" +export VIRTUAL_ENV + +_OLD_VIRTUAL_PATH="$PATH" +PATH="$VIRTUAL_ENV/bin:$PATH" +export PATH + +# unset PYTHONHOME if set +# this will fail if PYTHONHOME is set to the empty string (which is bad anyway) +# could use `if (set -u; : $PYTHONHOME) ;` in bash +if [ -n "${PYTHONHOME:-}" ] ; then + _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}" + unset PYTHONHOME +fi + +if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then + _OLD_VIRTUAL_PS1="${PS1:-}" + PS1="(planetmint_environment) ${PS1:-}" + export PS1 +fi + +# This should detect bash and zsh, which have a hash command that must +# be called to get it to forget past commands. Without forgetting +# past commands the $PATH changes we made may not be respected +if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then + hash -r 2> /dev/null +fi diff --git a/planetmint_environment/bin/activate.csh b/planetmint_environment/bin/activate.csh new file mode 100644 index 0000000..04d45af --- /dev/null +++ b/planetmint_environment/bin/activate.csh @@ -0,0 +1,25 @@ +# This file must be used with "source bin/activate.csh" *from csh*. +# You cannot run it directly. +# Created by Davide Di Blasi . +# Ported to Python 3.3 venv by Andrew Svetlov + +alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate' + +# Unset irrelevant variables. +deactivate nondestructive + +setenv VIRTUAL_ENV "/home/deffuls/work/planetmint/planetmint_environment" + +set _OLD_VIRTUAL_PATH="$PATH" +setenv PATH "$VIRTUAL_ENV/bin:$PATH" + + +set _OLD_VIRTUAL_PROMPT="$prompt" + +if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then + set prompt = "(planetmint_environment) $prompt" +endif + +alias pydoc python -m pydoc + +rehash diff --git a/planetmint_environment/bin/activate.fish b/planetmint_environment/bin/activate.fish new file mode 100644 index 0000000..e9890a5 --- /dev/null +++ b/planetmint_environment/bin/activate.fish @@ -0,0 +1,64 @@ +# This file must be used with "source /bin/activate.fish" *from fish* +# (https://fishshell.com/); you cannot run it directly. + +function deactivate -d "Exit virtual environment and return to normal shell environment" + # reset old environment variables + if test -n "$_OLD_VIRTUAL_PATH" + set -gx PATH $_OLD_VIRTUAL_PATH + set -e _OLD_VIRTUAL_PATH + end + if test -n "$_OLD_VIRTUAL_PYTHONHOME" + set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME + set -e _OLD_VIRTUAL_PYTHONHOME + end + + if test -n "$_OLD_FISH_PROMPT_OVERRIDE" + functions -e fish_prompt + set -e _OLD_FISH_PROMPT_OVERRIDE + functions -c _old_fish_prompt fish_prompt + functions -e _old_fish_prompt + end + + set -e VIRTUAL_ENV + if test "$argv[1]" != "nondestructive" + # Self-destruct! + functions -e deactivate + end +end + +# Unset irrelevant variables. +deactivate nondestructive + +set -gx VIRTUAL_ENV "/home/deffuls/work/planetmint/planetmint_environment" + +set -gx _OLD_VIRTUAL_PATH $PATH +set -gx PATH "$VIRTUAL_ENV/bin" $PATH + +# Unset PYTHONHOME if set. +if set -q PYTHONHOME + set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME + set -e PYTHONHOME +end + +if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" + # fish uses a function instead of an env var to generate the prompt. + + # Save the current fish_prompt function as the function _old_fish_prompt. + functions -c fish_prompt _old_fish_prompt + + # With the original prompt function renamed, we can override with our own. + function fish_prompt + # Save the return status of the last command. + set -l old_status $status + + # Output the venv prompt; color taken from the blue of the Python logo. + printf "%s%s%s" (set_color 4B8BBE) "(planetmint_environment) " (set_color normal) + + # Restore the return status of the previous command. + echo "exit $old_status" | . + # Output the original/"old" prompt. + _old_fish_prompt + end + + set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" +end diff --git a/planetmint_environment/bin/base58 b/planetmint_environment/bin/base58 new file mode 100755 index 0000000..028bc54 --- /dev/null +++ b/planetmint_environment/bin/base58 @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'base58==2.1.0','console_scripts','base58' +__requires__ = 'base58==2.1.0' +import re +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit( + load_entry_point('base58==2.1.0', 'console_scripts', 'base58')() + ) diff --git a/planetmint_environment/bin/chardetect b/planetmint_environment/bin/chardetect new file mode 100755 index 0000000..c9e1ce2 --- /dev/null +++ b/planetmint_environment/bin/chardetect @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'chardet==3.0.4','console_scripts','chardetect' +__requires__ = 'chardet==3.0.4' +import re +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit( + load_entry_point('chardet==3.0.4', 'console_scripts', 'chardetect')() + ) diff --git a/planetmint_environment/bin/easy_install b/planetmint_environment/bin/easy_install new file mode 100755 index 0000000..a5eca3c --- /dev/null +++ b/planetmint_environment/bin/easy_install @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'setuptools==44.1.1','console_scripts','easy_install' +__requires__ = 'setuptools==44.1.1' +import re +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit( + load_entry_point('setuptools==44.1.1', 'console_scripts', 'easy_install')() + ) diff --git a/planetmint_environment/bin/easy_install-3.9 b/planetmint_environment/bin/easy_install-3.9 new file mode 100755 index 0000000..43c911b --- /dev/null +++ b/planetmint_environment/bin/easy_install-3.9 @@ -0,0 +1,8 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from setuptools.command.easy_install import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/planetmint_environment/bin/flask b/planetmint_environment/bin/flask new file mode 100755 index 0000000..dc73351 --- /dev/null +++ b/planetmint_environment/bin/flask @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'Flask==2.0.1','console_scripts','flask' +__requires__ = 'Flask==2.0.1' +import re +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit( + load_entry_point('Flask==2.0.1', 'console_scripts', 'flask')() + ) diff --git a/planetmint_environment/bin/gunicorn b/planetmint_environment/bin/gunicorn new file mode 100755 index 0000000..cf8a691 --- /dev/null +++ b/planetmint_environment/bin/gunicorn @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'gunicorn==20.1.0','console_scripts','gunicorn' +__requires__ = 'gunicorn==20.1.0' +import re +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit( + load_entry_point('gunicorn==20.1.0', 'console_scripts', 'gunicorn')() + ) diff --git a/planetmint_environment/bin/humanfriendly b/planetmint_environment/bin/humanfriendly new file mode 100755 index 0000000..387f006 --- /dev/null +++ b/planetmint_environment/bin/humanfriendly @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'humanfriendly==10.0','console_scripts','humanfriendly' +__requires__ = 'humanfriendly==10.0' +import re +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit( + load_entry_point('humanfriendly==10.0', 'console_scripts', 'humanfriendly')() + ) diff --git a/planetmint_environment/bin/jsonschema b/planetmint_environment/bin/jsonschema new file mode 100755 index 0000000..1424e12 --- /dev/null +++ b/planetmint_environment/bin/jsonschema @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'jsonschema==3.2.0','console_scripts','jsonschema' +__requires__ = 'jsonschema==3.2.0' +import re +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit( + load_entry_point('jsonschema==3.2.0', 'console_scripts', 'jsonschema')() + ) diff --git a/planetmint_environment/bin/pip b/planetmint_environment/bin/pip new file mode 100755 index 0000000..6cc2d8b --- /dev/null +++ b/planetmint_environment/bin/pip @@ -0,0 +1,8 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/planetmint_environment/bin/pip3 b/planetmint_environment/bin/pip3 new file mode 100755 index 0000000..6cc2d8b --- /dev/null +++ b/planetmint_environment/bin/pip3 @@ -0,0 +1,8 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/planetmint_environment/bin/pip3.9 b/planetmint_environment/bin/pip3.9 new file mode 100755 index 0000000..6cc2d8b --- /dev/null +++ b/planetmint_environment/bin/pip3.9 @@ -0,0 +1,8 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/planetmint_environment/bin/planetmint b/planetmint_environment/bin/planetmint new file mode 100755 index 0000000..2591ce3 --- /dev/null +++ b/planetmint_environment/bin/planetmint @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'Planetmint==0.9.0','console_scripts','planetmint' +__requires__ = 'Planetmint==0.9.0' +import re +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit( + load_entry_point('Planetmint==0.9.0', 'console_scripts', 'planetmint')() + ) diff --git a/planetmint_environment/bin/planetmint-monit-config b/planetmint_environment/bin/planetmint-monit-config new file mode 100755 index 0000000..0181505 --- /dev/null +++ b/planetmint_environment/bin/planetmint-monit-config @@ -0,0 +1,199 @@ +#!/bin/bash + +set -o nounset + +# Check if directory for monit logs exists +if [ ! -d "$HOME/.planetmint-monit" ]; then + mkdir -p "$HOME/.planetmint-monit" +fi + +monit_pid_path=${MONIT_PID_PATH:=$HOME/.planetmint-monit/monit_processes} +monit_script_path=${MONIT_SCRIPT_PATH:=$HOME/.planetmint-monit/monit_script} +monit_log_path=${MONIT_LOG_PATH:=$HOME/.planetmint-monit/logs} +monitrc_path=${MONITRC_PATH:=$HOME/.monitrc} + +function usage() { + cat <${monit_script_path} < /dev/null 2>&1 & + + echo \$! > \$2 + popd + + ;; + + stop_planetmint) + + kill -2 \`cat \$2\` + rm -f \$2 + + ;; + + start_tendermint) + + pushd \$4 + + nohup tendermint node >> \$3/tendermint.out.log 2>> \$3/tendermint.err.log & + + echo \$! > \$2 + popd + + ;; + + stop_tendermint) + + kill -2 \`cat \$2\` + rm -f \$2 + + ;; + +esac +exit 0 +EOF +chmod +x ${monit_script_path} + +cat >${monit_script_path}_logrotate <${monitrc_path} < 200 MB then + exec "${monit_script_path}_logrotate rotate_tendermint_logs ${monit_log_path}/tendermint.out.log $monit_pid_path/tendermint.pid" + +check file tendermint.err.log with path ${monit_log_path}/tendermint.err.log + if size > 200 MB then + exec "${monit_script_path}_logrotate rotate_tendermint_logs ${monit_log_path}/tendermint.err.log $monit_pid_path/tendermint.pid" + +EOF + +# Setting permissions for control file +chmod 0700 ${monitrc_path} + +echo -e "Planetmint process manager configured!" +set -o errexit diff --git a/planetmint_environment/bin/py.test b/planetmint_environment/bin/py.test new file mode 100755 index 0000000..e4f0b73 --- /dev/null +++ b/planetmint_environment/bin/py.test @@ -0,0 +1,8 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pytest import console_main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(console_main()) diff --git a/planetmint_environment/bin/pytest b/planetmint_environment/bin/pytest new file mode 100755 index 0000000..e4f0b73 --- /dev/null +++ b/planetmint_environment/bin/pytest @@ -0,0 +1,8 @@ +#!/home/deffuls/work/planetmint/planetmint_environment/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pytest import console_main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(console_main()) diff --git a/planetmint_environment/bin/python b/planetmint_environment/bin/python new file mode 120000 index 0000000..b8a0adb --- /dev/null +++ b/planetmint_environment/bin/python @@ -0,0 +1 @@ +python3 \ No newline at end of file diff --git a/planetmint_environment/bin/python3 b/planetmint_environment/bin/python3 new file mode 120000 index 0000000..ae65fda --- /dev/null +++ b/planetmint_environment/bin/python3 @@ -0,0 +1 @@ +/usr/bin/python3 \ No newline at end of file diff --git a/planetmint_environment/bin/python3.9 b/planetmint_environment/bin/python3.9 new file mode 120000 index 0000000..b8a0adb --- /dev/null +++ b/planetmint_environment/bin/python3.9 @@ -0,0 +1 @@ +python3 \ No newline at end of file diff --git a/planetmint_environment/lib64 b/planetmint_environment/lib64 new file mode 120000 index 0000000..7951405 --- /dev/null +++ b/planetmint_environment/lib64 @@ -0,0 +1 @@ +lib \ No newline at end of file diff --git a/planetmint_environment/pyvenv.cfg b/planetmint_environment/pyvenv.cfg new file mode 100644 index 0000000..5c102c1 --- /dev/null +++ b/planetmint_environment/pyvenv.cfg @@ -0,0 +1,3 @@ +home = /usr/bin +include-system-site-packages = false +version = 3.9.2 diff --git a/planetmint_environment/share/python-wheels/CacheControl-0.12.6-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/CacheControl-0.12.6-py2.py3-none-any.whl new file mode 100644 index 0000000..6ef9423 Binary files /dev/null and b/planetmint_environment/share/python-wheels/CacheControl-0.12.6-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/appdirs-1.4.4-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/appdirs-1.4.4-py2.py3-none-any.whl new file mode 100644 index 0000000..2459003 Binary files /dev/null and b/planetmint_environment/share/python-wheels/appdirs-1.4.4-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/certifi-2020.6.20-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/certifi-2020.6.20-py2.py3-none-any.whl new file mode 100644 index 0000000..9f6ebc6 Binary files /dev/null and b/planetmint_environment/share/python-wheels/certifi-2020.6.20-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/chardet-4.0.0-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/chardet-4.0.0-py2.py3-none-any.whl new file mode 100644 index 0000000..c120243 Binary files /dev/null and b/planetmint_environment/share/python-wheels/chardet-4.0.0-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/colorama-0.4.4-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/colorama-0.4.4-py2.py3-none-any.whl new file mode 100644 index 0000000..d38d3a0 Binary files /dev/null and b/planetmint_environment/share/python-wheels/colorama-0.4.4-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/contextlib2-0.6.0.post1-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/contextlib2-0.6.0.post1-py2.py3-none-any.whl new file mode 100644 index 0000000..d1dca5f Binary files /dev/null and b/planetmint_environment/share/python-wheels/contextlib2-0.6.0.post1-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/distlib-0.3.1-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/distlib-0.3.1-py2.py3-none-any.whl new file mode 100644 index 0000000..6503b96 Binary files /dev/null and b/planetmint_environment/share/python-wheels/distlib-0.3.1-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl new file mode 100644 index 0000000..3708fe7 Binary files /dev/null and b/planetmint_environment/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/html5lib-1.1-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/html5lib-1.1-py2.py3-none-any.whl new file mode 100644 index 0000000..fb5e80c Binary files /dev/null and b/planetmint_environment/share/python-wheels/html5lib-1.1-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/idna-2.10-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/idna-2.10-py2.py3-none-any.whl new file mode 100644 index 0000000..0ba1dda Binary files /dev/null and b/planetmint_environment/share/python-wheels/idna-2.10-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/ipaddr-2.2.0-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/ipaddr-2.2.0-py2.py3-none-any.whl new file mode 100644 index 0000000..98157fa Binary files /dev/null and b/planetmint_environment/share/python-wheels/ipaddr-2.2.0-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/msgpack-1.0.0-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/msgpack-1.0.0-py2.py3-none-any.whl new file mode 100644 index 0000000..e761172 Binary files /dev/null and b/planetmint_environment/share/python-wheels/msgpack-1.0.0-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/packaging-20.9-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/packaging-20.9-py2.py3-none-any.whl new file mode 100644 index 0000000..e6598ec Binary files /dev/null and b/planetmint_environment/share/python-wheels/packaging-20.9-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/pep517-0.9.1-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/pep517-0.9.1-py2.py3-none-any.whl new file mode 100644 index 0000000..d870913 Binary files /dev/null and b/planetmint_environment/share/python-wheels/pep517-0.9.1-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/pip-20.3.4-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/pip-20.3.4-py2.py3-none-any.whl new file mode 100644 index 0000000..51cafb9 Binary files /dev/null and b/planetmint_environment/share/python-wheels/pip-20.3.4-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/pkg_resources-0.0.0-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/pkg_resources-0.0.0-py2.py3-none-any.whl new file mode 100644 index 0000000..72e02ff Binary files /dev/null and b/planetmint_environment/share/python-wheels/pkg_resources-0.0.0-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/progress-1.5-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/progress-1.5-py2.py3-none-any.whl new file mode 100644 index 0000000..7f58777 Binary files /dev/null and b/planetmint_environment/share/python-wheels/progress-1.5-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/pyparsing-2.4.7-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/pyparsing-2.4.7-py2.py3-none-any.whl new file mode 100644 index 0000000..9ff2e00 Binary files /dev/null and b/planetmint_environment/share/python-wheels/pyparsing-2.4.7-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/requests-2.25.1-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/requests-2.25.1-py2.py3-none-any.whl new file mode 100644 index 0000000..eb382f7 Binary files /dev/null and b/planetmint_environment/share/python-wheels/requests-2.25.1-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/resolvelib-0.5.4-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/resolvelib-0.5.4-py2.py3-none-any.whl new file mode 100644 index 0000000..cd8f0de Binary files /dev/null and b/planetmint_environment/share/python-wheels/resolvelib-0.5.4-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/retrying-1.3.3-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/retrying-1.3.3-py2.py3-none-any.whl new file mode 100644 index 0000000..e2f8ffa Binary files /dev/null and b/planetmint_environment/share/python-wheels/retrying-1.3.3-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/setuptools-44.1.1-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/setuptools-44.1.1-py2.py3-none-any.whl new file mode 100644 index 0000000..e3d6e08 Binary files /dev/null and b/planetmint_environment/share/python-wheels/setuptools-44.1.1-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/six-1.16.0-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/six-1.16.0-py2.py3-none-any.whl new file mode 100644 index 0000000..574b3ab Binary files /dev/null and b/planetmint_environment/share/python-wheels/six-1.16.0-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/toml-0.10.1-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/toml-0.10.1-py2.py3-none-any.whl new file mode 100644 index 0000000..3b1cbcb Binary files /dev/null and b/planetmint_environment/share/python-wheels/toml-0.10.1-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/urllib3-1.26.5-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/urllib3-1.26.5-py2.py3-none-any.whl new file mode 100644 index 0000000..b17a8e8 Binary files /dev/null and b/planetmint_environment/share/python-wheels/urllib3-1.26.5-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/webencodings-0.5.1-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/webencodings-0.5.1-py2.py3-none-any.whl new file mode 100644 index 0000000..0a83fdd Binary files /dev/null and b/planetmint_environment/share/python-wheels/webencodings-0.5.1-py2.py3-none-any.whl differ diff --git a/planetmint_environment/share/python-wheels/wheel-0.34.2-py2.py3-none-any.whl b/planetmint_environment/share/python-wheels/wheel-0.34.2-py2.py3-none-any.whl new file mode 100644 index 0000000..3fcb11b Binary files /dev/null and b/planetmint_environment/share/python-wheels/wheel-0.34.2-py2.py3-none-any.whl differ diff --git a/requirements_old.txt b/requirements_old.txt index 20f32a4..f5f4ca3 100644 --- a/requirements_old.txt +++ b/requirements_old.txt @@ -1,47 +1,57 @@ -aiohttp==3.6.2 +aiohttp==3.7.4 aniso8601==9.0.1 -asn1crypto==1.4.0 async-timeout==3.0.1 attrs==21.4.0 -base58==1.0.3 -BigchainDB==2.2.2 -bigchaindb-abci==1.0.5 +base58==2.1.0 +bigchaindb-abci==1.0.7 +capturer==3.0 certifi==2021.10.8 cffi==1.15.0 chardet==3.0.4 -click==8.0.3 -colorlog==4.1.0 -cryptoconditions==0.8.0 -cryptography==2.3.1 -Flask==1.1.2 -Flask-Cors==3.0.8 -Flask-RESTful==0.3.8 -gevent==20.6.2 -greenlet==0.4.16 -gunicorn==20.0.4 +click==8.1.2 +colorlog==5.0.1 +cryptography==3.4.7 +Flask==2.0.1 +Flask-Cors==3.0.10 +Flask-RESTful==0.3.9 +gevent==21.1.2 +greenlet==1.1.2 +gunicorn==20.1.0 +humanfriendly==10.0 idna==2.10 -itsdangerous==2.0.1 -Jinja2==3.0.3 +iniconfig==1.1.1 +itsdangerous==2.1.2 +Jinja2==3.1.1 jsonschema==3.2.0 logstats==0.3.0 -MarkupSafe==2.0.1 -multidict==4.7.6 +MarkupSafe==2.1.1 +msgpack==1.0.3 +multidict==6.0.2 packaging==21.3 -protobuf==3.6.1 +Planetmint==0.9.0 +planetmint-cryptoconditions==0.9.4 +pluggy==1.0.0 +protobuf==3.17.2 +py==1.11.0 pyasn1==0.4.8 pycparser==2.21 -pymongo==3.7.2 -PyNaCl==1.1.2 -pyparsing==3.0.7 +pymongo==3.11.4 +PyNaCl==1.4.0 +pyparsing==3.0.8 pyrsistent==0.18.1 -python-rapidjson==0.9.1 -pytz==2021.3 -PyYAML==5.3.1 -requests==2.23.0 -setproctitle==1.1.10 +pytest==7.1.1 +python-rapidjson==1.0 +pytz==2022.1 +PyYAML==5.4.1 +requests==2.25.1 +setproctitle==1.2.2 six==1.16.0 -urllib3==1.25.11 -Werkzeug==2.0.3 +tarantool==0.7.1 +tomli==2.0.1 +typing-extensions==4.1.1 +urllib3==1.26.9 +Werkzeug==2.1.1 yarl==1.7.2 +zenroom==2.1.0.dev1649760309 zope.event==4.5.0 zope.interface==5.5.0.dev0 diff --git a/tests/backend/tarantool/conftest.py b/tests/backend/tarantool/conftest.py index d83788e..ac4a7e1 100644 --- a/tests/backend/tarantool/conftest.py +++ b/tests/backend/tarantool/conftest.py @@ -1,5 +1,7 @@ import pytest from planetmint.backend.connection import Connection + + # # # @@ -22,12 +24,6 @@ from planetmint.backend.connection import Connection # conn.drop_database() # #_drop_db(conn, dbname) -#def _drop_db(conn, dbname): -# try: -# conn.drop_database() -# schema.drop_database(conn, dbname) -# except DatabaseDoesNotExist: -# pass @pytest.fixture def db_conn(): diff --git a/tests/backend/tarantool/test_schema.py b/tests/backend/tarantool/test_schema.py index 3961f33..dc8d56c 100644 --- a/tests/backend/tarantool/test_schema.py +++ b/tests/backend/tarantool/test_schema.py @@ -3,17 +3,9 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 -from planetmint.config import Config -from planetmint.backend import Connection from planetmint.backend.tarantool.connection import TarantoolDB -# This function creates database, we have now only spaces so for now it is commented -# def test_init_database_is_graceful_if_db_exists(): -# conn = TarantoolDB('localhost', 3303) -# conn.drop_database() -# conn.init_database() - def _check_spaces_by_list(conn, space_names): _exists = [] for name in space_names: @@ -26,16 +18,15 @@ def _check_spaces_by_list(conn, space_names): def test_create_tables(): - conn = TarantoolDB('localhost', 3303) - # The db is set up by the fixtures so we need to remove it - # conn.drop_database() - conn.init_database() - - assert conn.SPACE_NAMES == _check_spaces_by_list(conn=conn, space_names=conn.SPACE_NAMES) + db_conn = TarantoolDB("localhost", 3303) + db_conn.drop_database() + db_conn.init_database() + assert db_conn.SPACE_NAMES == _check_spaces_by_list(conn=db_conn, space_names=db_conn.SPACE_NAMES) def test_drop(): # remove dummy_db as argument - conn = TarantoolDB('localhost', 3303) - conn.drop_database() - actual_spaces = _check_spaces_by_list(conn=conn, space_names=conn.SPACE_NAMES) + db_conn = TarantoolDB("localhost", 3303) + db_conn.drop_database() + actual_spaces = _check_spaces_by_list(conn=db_conn, space_names=db_conn.SPACE_NAMES) assert [] == actual_spaces +