diff --git a/.idea/planetmint.iml b/.idea/planetmint.iml index c8ca155..5f63e81 100644 --- a/.idea/planetmint.iml +++ b/.idea/planetmint.iml @@ -3,8 +3,9 @@ + - + diff --git a/docker_environment/bin/base58 b/docker_environment/bin/base58 deleted file mode 100755 index bad317e..0000000 --- a/docker_environment/bin/base58 +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from base58.__main__ import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/docker_environment/bin/chardetect b/docker_environment/bin/chardetect deleted file mode 100755 index 3ab624f..0000000 --- a/docker_environment/bin/chardetect +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from chardet.cli.chardetect import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/docker_environment/bin/cm2html b/docker_environment/bin/cm2html deleted file mode 100755 index 5315b3d..0000000 --- a/docker_environment/bin/cm2html +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from recommonmark.scripts import cm2html -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(cm2html()) diff --git a/docker_environment/bin/cm2latex b/docker_environment/bin/cm2latex deleted file mode 100755 index 6f7ad41..0000000 --- a/docker_environment/bin/cm2latex +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from recommonmark.scripts import cm2latex -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(cm2latex()) diff --git a/docker_environment/bin/cm2man b/docker_environment/bin/cm2man deleted file mode 100755 index a908a81..0000000 --- a/docker_environment/bin/cm2man +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from recommonmark.scripts import cm2man -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(cm2man()) diff --git a/docker_environment/bin/cm2pseudoxml b/docker_environment/bin/cm2pseudoxml deleted file mode 100755 index 87f85cb..0000000 --- a/docker_environment/bin/cm2pseudoxml +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from recommonmark.scripts import cm2pseudoxml -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(cm2pseudoxml()) diff --git a/docker_environment/bin/cm2xetex b/docker_environment/bin/cm2xetex deleted file mode 100755 index 9f6d661..0000000 --- a/docker_environment/bin/cm2xetex +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from recommonmark.scripts import cm2xetex -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(cm2xetex()) diff --git a/docker_environment/bin/cm2xml b/docker_environment/bin/cm2xml deleted file mode 100755 index 5729708..0000000 --- a/docker_environment/bin/cm2xml +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from recommonmark.scripts import cm2xml -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(cm2xml()) diff --git a/docker_environment/bin/counter b/docker_environment/bin/counter deleted file mode 100755 index 7c9027a..0000000 --- a/docker_environment/bin/counter +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from example.counter import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/docker_environment/bin/easy_install b/docker_environment/bin/easy_install deleted file mode 100755 index 3d930f2..0000000 --- a/docker_environment/bin/easy_install +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_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/docker_environment/bin/flask b/docker_environment/bin/flask deleted file mode 100755 index 3ad2f7c..0000000 --- a/docker_environment/bin/flask +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from flask.cli import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/docker_environment/bin/gunicorn b/docker_environment/bin/gunicorn deleted file mode 100755 index 7b66116..0000000 --- a/docker_environment/bin/gunicorn +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from gunicorn.app.wsgiapp import run -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(run()) diff --git a/docker_environment/bin/humanfriendly b/docker_environment/bin/humanfriendly deleted file mode 100755 index b716b8e..0000000 --- a/docker_environment/bin/humanfriendly +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from humanfriendly.cli import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/docker_environment/bin/jsonschema b/docker_environment/bin/jsonschema deleted file mode 100755 index 43a5bd0..0000000 --- a/docker_environment/bin/jsonschema +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from jsonschema.cli import main -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/docker_environment/bin/normalizer b/docker_environment/bin/normalizer deleted file mode 100755 index 746a2cd..0000000 --- a/docker_environment/bin/normalizer +++ /dev/null @@ -1,8 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# -*- coding: utf-8 -*- -import re -import sys -from charset_normalizer.cli.normalizer import cli_detect -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) - sys.exit(cli_detect()) diff --git a/docker_environment/bin/planetmint b/docker_environment/bin/planetmint deleted file mode 100755 index 371c876..0000000 --- a/docker_environment/bin/planetmint +++ /dev/null @@ -1,12 +0,0 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 -# EASY-INSTALL-ENTRY-SCRIPT: 'Planetmint','console_scripts','planetmint' -__requires__ = 'Planetmint' -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', 'console_scripts', 'planetmint')() - ) diff --git a/docker_environment/include/site/python3.9/greenlet/greenlet.h b/docker_environment/include/site/python3.9/greenlet/greenlet.h deleted file mode 100644 index 830bef8..0000000 --- a/docker_environment/include/site/python3.9/greenlet/greenlet.h +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- indent-tabs-mode: nil; tab-width: 4; -*- */ - -/* Greenlet object interface */ - -#ifndef Py_GREENLETOBJECT_H -#define Py_GREENLETOBJECT_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* This is deprecated and undocumented. It does not change. */ -#define GREENLET_VERSION "1.0.0" - -typedef struct _greenlet { - PyObject_HEAD - char* stack_start; - char* stack_stop; - char* stack_copy; - intptr_t stack_saved; - struct _greenlet* stack_prev; - struct _greenlet* parent; - PyObject* run_info; - struct _frame* top_frame; - int recursion_depth; - PyObject* weakreflist; -#if PY_VERSION_HEX >= 0x030700A3 - _PyErr_StackItem* exc_info; - _PyErr_StackItem exc_state; -#else - PyObject* exc_type; - PyObject* exc_value; - PyObject* exc_traceback; -#endif - PyObject* dict; -#if PY_VERSION_HEX >= 0x030700A3 - PyObject* context; -#endif -#if PY_VERSION_HEX >= 0x30A00B1 - CFrame* cframe; -#endif -} PyGreenlet; - -#define PyGreenlet_Check(op) PyObject_TypeCheck(op, &PyGreenlet_Type) -#define PyGreenlet_MAIN(op) (((PyGreenlet*)(op))->stack_stop == (char*)-1) -#define PyGreenlet_STARTED(op) (((PyGreenlet*)(op))->stack_stop != NULL) -#define PyGreenlet_ACTIVE(op) (((PyGreenlet*)(op))->stack_start != NULL) -#define PyGreenlet_GET_PARENT(op) (((PyGreenlet*)(op))->parent) - -/* C API functions */ - -/* Total number of symbols that are exported */ -#define PyGreenlet_API_pointers 8 - -#define PyGreenlet_Type_NUM 0 -#define PyExc_GreenletError_NUM 1 -#define PyExc_GreenletExit_NUM 2 - -#define PyGreenlet_New_NUM 3 -#define PyGreenlet_GetCurrent_NUM 4 -#define PyGreenlet_Throw_NUM 5 -#define PyGreenlet_Switch_NUM 6 -#define PyGreenlet_SetParent_NUM 7 - -#ifndef GREENLET_MODULE -/* This section is used by modules that uses the greenlet C API */ -static void** _PyGreenlet_API = NULL; - -# define PyGreenlet_Type \ - (*(PyTypeObject*)_PyGreenlet_API[PyGreenlet_Type_NUM]) - -# define PyExc_GreenletError \ - ((PyObject*)_PyGreenlet_API[PyExc_GreenletError_NUM]) - -# define PyExc_GreenletExit \ - ((PyObject*)_PyGreenlet_API[PyExc_GreenletExit_NUM]) - -/* - * PyGreenlet_New(PyObject *args) - * - * greenlet.greenlet(run, parent=None) - */ -# define PyGreenlet_New \ - (*(PyGreenlet * (*)(PyObject * run, PyGreenlet * parent)) \ - _PyGreenlet_API[PyGreenlet_New_NUM]) - -/* - * PyGreenlet_GetCurrent(void) - * - * greenlet.getcurrent() - */ -# define PyGreenlet_GetCurrent \ - (*(PyGreenlet * (*)(void)) _PyGreenlet_API[PyGreenlet_GetCurrent_NUM]) - -/* - * PyGreenlet_Throw( - * PyGreenlet *greenlet, - * PyObject *typ, - * PyObject *val, - * PyObject *tb) - * - * g.throw(...) - */ -# define PyGreenlet_Throw \ - (*(PyObject * (*)(PyGreenlet * self, \ - PyObject * typ, \ - PyObject * val, \ - PyObject * tb)) \ - _PyGreenlet_API[PyGreenlet_Throw_NUM]) - -/* - * PyGreenlet_Switch(PyGreenlet *greenlet, PyObject *args) - * - * g.switch(*args, **kwargs) - */ -# define PyGreenlet_Switch \ - (*(PyObject * \ - (*)(PyGreenlet * greenlet, PyObject * args, PyObject * kwargs)) \ - _PyGreenlet_API[PyGreenlet_Switch_NUM]) - -/* - * PyGreenlet_SetParent(PyObject *greenlet, PyObject *new_parent) - * - * g.parent = new_parent - */ -# define PyGreenlet_SetParent \ - (*(int (*)(PyGreenlet * greenlet, PyGreenlet * nparent)) \ - _PyGreenlet_API[PyGreenlet_SetParent_NUM]) - -/* Macro that imports greenlet and initializes C API */ -/* NOTE: This has actually moved to ``greenlet._greenlet._C_API``, but we - keep the older definition to be sure older code that might have a copy of - the header still works. */ -# define PyGreenlet_Import() \ - { \ - _PyGreenlet_API = (void**)PyCapsule_Import("greenlet._C_API", 0); \ - } - -#endif /* GREENLET_MODULE */ - -#ifdef __cplusplus -} -#endif -#endif /* !Py_GREENLETOBJECT_H */ diff --git a/planetmint/backend/tarantool/connection.py b/planetmint/backend/tarantool/connection.py index 06a48ec..15a6ea3 100644 --- a/planetmint/backend/tarantool/connection.py +++ b/planetmint/backend/tarantool/connection.py @@ -13,8 +13,7 @@ logger = logging.getLogger(__name__) class TarantoolDB: - def __init__(self, host: str = "localhost", port: int = 3303, user: str = None, password: str = None, - reset_database: bool = False, **kwargs): + def __init__(self, host: str = "localhost", port: int = 3303, user: str = None, password: str = None, **kwargs): try: self.host = host self.port = port @@ -26,11 +25,11 @@ 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"] - args_reset_db = kwargs.get("kwargs").get("reset_database") if "kwargs" in kwargs else None - if reset_database or args_reset_db is True: - self.drop_database() - self.init_database() - self._reconnect() + # args_reset_db = kwargs.get("kwargs").get("reset_database") if "kwargs" in kwargs else None + # if reset_database or args_reset_db is True: + # self.drop_database() + # self.init_database() + # self._reconnect() self.SPACE_NAMES = ["abci_chains", "assets", "blocks", "blocks_tx", "elections", "meta_data", "pre_commits", "validators", "transactions", "inputs", "outputs", "keys"] diff --git a/planetmint/backend/tarantool/query.py b/planetmint/backend/tarantool/query.py index 0fd30d9..d866afb 100644 --- a/planetmint/backend/tarantool/query.py +++ b/planetmint/backend/tarantool/query.py @@ -285,6 +285,7 @@ def get_block(connection, block_id=[]): space = connection.space("blocks") _block = space.select(block_id, index="block_search", limit=1) _block = _block.data + print(f"QUERY 1 :: {_block}") if len(_block) == 0: return [] _block = _block[0] @@ -303,8 +304,7 @@ def get_block_with_transaction(connection, txid: str): return [] space = connection.space("blocks") _block = space.select(_all_blocks_tx[0][1], index="block_id_search") - _block = _block.data[0] - return {"app_hash": _block[0], "height": _block[1], "transactions": [_tx[0] for _tx in _all_blocks_tx]} + return [{"height": _height[1]} for _height in _block.data] @register_query(TarantoolDB) diff --git a/planetmint/lib.py b/planetmint/lib.py index 47ec851..1297e94 100644 --- a/planetmint/lib.py +++ b/planetmint/lib.py @@ -35,6 +35,7 @@ from planetmint.validation import BaseValidationRules logger = logging.getLogger(__name__) + class Planetmint(object): """Planetmint API @@ -73,7 +74,7 @@ class Planetmint(object): else: self.validation = BaseValidationRules # planetmint.backend.tarantool.connection_tarantool.connect(**Config().get()['database']) - self.connection = connection if connection is not None else planetmint.backend.Connection(reset_database=True) + self.connection = connection if connection is not None else planetmint.backend.Connection() print(f"PLANETMINT self.connection {self.connection} !!!!") def post_transaction(self, transaction, mode): diff --git a/docker_environment/bin/Activate.ps1 b/planetmint_env/bin/Activate.ps1 similarity index 100% rename from docker_environment/bin/Activate.ps1 rename to planetmint_env/bin/Activate.ps1 diff --git a/docker_environment/bin/aafigure b/planetmint_env/bin/aafigure similarity index 79% rename from docker_environment/bin/aafigure rename to planetmint_env/bin/aafigure index 268b68e..805a80f 100755 --- a/docker_environment/bin/aafigure +++ b/planetmint_env/bin/aafigure @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # # This file is part of aafigure. https://github.com/aafigure/aafigure # (C) 2007 Chris Liechti diff --git a/docker_environment/bin/activate b/planetmint_env/bin/activate similarity index 94% rename from docker_environment/bin/activate rename to planetmint_env/bin/activate index 70a820e..3fc6d76 100644 --- a/docker_environment/bin/activate +++ b/planetmint_env/bin/activate @@ -37,7 +37,7 @@ deactivate () { # unset irrelevant variables deactivate nondestructive -VIRTUAL_ENV="/home/deffuls/work/planetmint/docker_environment" +VIRTUAL_ENV="/home/deffuls/work/planetmint/planetmint_env" export VIRTUAL_ENV _OLD_VIRTUAL_PATH="$PATH" @@ -54,7 +54,7 @@ fi if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then _OLD_VIRTUAL_PS1="${PS1:-}" - PS1="(docker_environment) ${PS1:-}" + PS1="(planetmint_env) ${PS1:-}" export PS1 fi diff --git a/docker_environment/bin/activate.csh b/planetmint_env/bin/activate.csh similarity index 86% rename from docker_environment/bin/activate.csh rename to planetmint_env/bin/activate.csh index e065c27..31c8d48 100644 --- a/docker_environment/bin/activate.csh +++ b/planetmint_env/bin/activate.csh @@ -8,7 +8,7 @@ alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PA # Unset irrelevant variables. deactivate nondestructive -setenv VIRTUAL_ENV "/home/deffuls/work/planetmint/docker_environment" +setenv VIRTUAL_ENV "/home/deffuls/work/planetmint/planetmint_env" set _OLD_VIRTUAL_PATH="$PATH" setenv PATH "$VIRTUAL_ENV/bin:$PATH" @@ -17,7 +17,7 @@ setenv PATH "$VIRTUAL_ENV/bin:$PATH" set _OLD_VIRTUAL_PROMPT="$prompt" if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then - set prompt = "(docker_environment) $prompt" + set prompt = "(planetmint_env) $prompt" endif alias pydoc python -m pydoc diff --git a/docker_environment/bin/activate.fish b/planetmint_env/bin/activate.fish similarity index 92% rename from docker_environment/bin/activate.fish rename to planetmint_env/bin/activate.fish index 5bf574e..d2951b2 100644 --- a/docker_environment/bin/activate.fish +++ b/planetmint_env/bin/activate.fish @@ -29,7 +29,7 @@ end # Unset irrelevant variables. deactivate nondestructive -set -gx VIRTUAL_ENV "/home/deffuls/work/planetmint/docker_environment" +set -gx VIRTUAL_ENV "/home/deffuls/work/planetmint/planetmint_env" set -gx _OLD_VIRTUAL_PATH $PATH set -gx PATH "$VIRTUAL_ENV/bin" $PATH @@ -52,7 +52,7 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" 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) "(docker_environment) " (set_color normal) + printf "%s%s%s" (set_color 4B8BBE) "(planetmint_env) " (set_color normal) # Restore the return status of the previous command. echo "exit $old_status" | . diff --git a/planetmint_env/bin/base58 b/planetmint_env/bin/base58 new file mode 100755 index 0000000..97b7a04 --- /dev/null +++ b/planetmint_env/bin/base58 @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/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_env/bin/chardetect b/planetmint_env/bin/chardetect new file mode 100755 index 0000000..283e807 --- /dev/null +++ b/planetmint_env/bin/chardetect @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/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/docker_environment/bin/cmark b/planetmint_env/bin/cmark similarity index 75% rename from docker_environment/bin/cmark rename to planetmint_env/bin/cmark index 6814823..a619c96 100755 --- a/docker_environment/bin/cmark +++ b/planetmint_env/bin/cmark @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/planetmint_env/bin/counter b/planetmint_env/bin/counter new file mode 100755 index 0000000..dac2331 --- /dev/null +++ b/planetmint_env/bin/counter @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'abci==0.8.3','console_scripts','counter' +__requires__ = 'abci==0.8.3' +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('abci==0.8.3', 'console_scripts', 'counter')() + ) diff --git a/docker_environment/bin/coverage b/planetmint_env/bin/coverage similarity index 75% rename from docker_environment/bin/coverage rename to planetmint_env/bin/coverage index 6110b59..d20c133 100755 --- a/docker_environment/bin/coverage +++ b/planetmint_env/bin/coverage @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/coverage-3.9 b/planetmint_env/bin/coverage-3.9 similarity index 75% rename from docker_environment/bin/coverage-3.9 rename to planetmint_env/bin/coverage-3.9 index 6110b59..d20c133 100755 --- a/docker_environment/bin/coverage-3.9 +++ b/planetmint_env/bin/coverage-3.9 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/coverage3 b/planetmint_env/bin/coverage3 similarity index 75% rename from docker_environment/bin/coverage3 rename to planetmint_env/bin/coverage3 index 6110b59..d20c133 100755 --- a/docker_environment/bin/coverage3 +++ b/planetmint_env/bin/coverage3 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/planetmint_env/bin/easy_install b/planetmint_env/bin/easy_install new file mode 100755 index 0000000..3f00c0f --- /dev/null +++ b/planetmint_env/bin/easy_install @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/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/docker_environment/bin/easy_install-3.9 b/planetmint_env/bin/easy_install-3.9 similarity index 77% rename from docker_environment/bin/easy_install-3.9 rename to planetmint_env/bin/easy_install-3.9 index 3d930f2..cd44e32 100755 --- a/docker_environment/bin/easy_install-3.9 +++ b/planetmint_env/bin/easy_install-3.9 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/flake8 b/planetmint_env/bin/flake8 similarity index 75% rename from docker_environment/bin/flake8 rename to planetmint_env/bin/flake8 index 3555c2d..afd4c1c 100755 --- a/docker_environment/bin/flake8 +++ b/planetmint_env/bin/flake8 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/planetmint_env/bin/flask b/planetmint_env/bin/flask new file mode 100755 index 0000000..a711ec6 --- /dev/null +++ b/planetmint_env/bin/flask @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'Flask==2.1.2','console_scripts','flask' +__requires__ = 'Flask==2.1.2' +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.1.2', 'console_scripts', 'flask')() + ) diff --git a/planetmint_env/bin/gunicorn b/planetmint_env/bin/gunicorn new file mode 100755 index 0000000..5695041 --- /dev/null +++ b/planetmint_env/bin/gunicorn @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/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_env/bin/humanfriendly b/planetmint_env/bin/humanfriendly new file mode 100755 index 0000000..6fcfefb --- /dev/null +++ b/planetmint_env/bin/humanfriendly @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/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/docker_environment/bin/hypothesis b/planetmint_env/bin/hypothesis similarity index 76% rename from docker_environment/bin/hypothesis rename to planetmint_env/bin/hypothesis index 10e5df8..d846c0e 100755 --- a/docker_environment/bin/hypothesis +++ b/planetmint_env/bin/hypothesis @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/identify-cli b/planetmint_env/bin/identify-cli similarity index 75% rename from docker_environment/bin/identify-cli rename to planetmint_env/bin/identify-cli index 3aaa426..4199698 100755 --- a/docker_environment/bin/identify-cli +++ b/planetmint_env/bin/identify-cli @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/ipdb3 b/planetmint_env/bin/ipdb3 similarity index 84% rename from docker_environment/bin/ipdb3 rename to planetmint_env/bin/ipdb3 index 8949b3c..a65fbd7 100755 --- a/docker_environment/bin/ipdb3 +++ b/planetmint_env/bin/ipdb3 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # EASY-INSTALL-ENTRY-SCRIPT: 'ipdb==0.13.9','console_scripts','ipdb3' __requires__ = 'ipdb==0.13.9' import re diff --git a/docker_environment/bin/ipython b/planetmint_env/bin/ipython similarity index 76% rename from docker_environment/bin/ipython rename to planetmint_env/bin/ipython index f132585..021745c 100755 --- a/docker_environment/bin/ipython +++ b/planetmint_env/bin/ipython @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/ipython3 b/planetmint_env/bin/ipython3 similarity index 76% rename from docker_environment/bin/ipython3 rename to planetmint_env/bin/ipython3 index f132585..021745c 100755 --- a/docker_environment/bin/ipython3 +++ b/planetmint_env/bin/ipython3 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/planetmint_env/bin/jsonschema b/planetmint_env/bin/jsonschema new file mode 100755 index 0000000..b11eb77 --- /dev/null +++ b/planetmint_env/bin/jsonschema @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/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/docker_environment/bin/keyring b/planetmint_env/bin/keyring similarity index 75% rename from docker_environment/bin/keyring rename to planetmint_env/bin/keyring index b9cf63e..e5174da 100755 --- a/docker_environment/bin/keyring +++ b/planetmint_env/bin/keyring @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/markdown-it b/planetmint_env/bin/markdown-it similarity index 76% rename from docker_environment/bin/markdown-it rename to planetmint_env/bin/markdown-it index 4754ac6..cb3af68 100755 --- a/docker_environment/bin/markdown-it +++ b/planetmint_env/bin/markdown-it @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/myst-anchors b/planetmint_env/bin/myst-anchors similarity index 77% rename from docker_environment/bin/myst-anchors rename to planetmint_env/bin/myst-anchors index 89b2004..b89df9a 100755 --- a/docker_environment/bin/myst-anchors +++ b/planetmint_env/bin/myst-anchors @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/myst-docutils-html b/planetmint_env/bin/myst-docutils-html similarity index 76% rename from docker_environment/bin/myst-docutils-html rename to planetmint_env/bin/myst-docutils-html index 88debac..57e4f10 100755 --- a/docker_environment/bin/myst-docutils-html +++ b/planetmint_env/bin/myst-docutils-html @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/myst-docutils-html5 b/planetmint_env/bin/myst-docutils-html5 similarity index 77% rename from docker_environment/bin/myst-docutils-html5 rename to planetmint_env/bin/myst-docutils-html5 index 0817bc4..c4543ac 100755 --- a/docker_environment/bin/myst-docutils-html5 +++ b/planetmint_env/bin/myst-docutils-html5 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/myst-docutils-latex b/planetmint_env/bin/myst-docutils-latex similarity index 77% rename from docker_environment/bin/myst-docutils-latex rename to planetmint_env/bin/myst-docutils-latex index ba14198..b4e9518 100755 --- a/docker_environment/bin/myst-docutils-latex +++ b/planetmint_env/bin/myst-docutils-latex @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/myst-docutils-pseudoxml b/planetmint_env/bin/myst-docutils-pseudoxml similarity index 77% rename from docker_environment/bin/myst-docutils-pseudoxml rename to planetmint_env/bin/myst-docutils-pseudoxml index cba1859..f06fa08 100755 --- a/docker_environment/bin/myst-docutils-pseudoxml +++ b/planetmint_env/bin/myst-docutils-pseudoxml @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/myst-docutils-xml b/planetmint_env/bin/myst-docutils-xml similarity index 76% rename from docker_environment/bin/myst-docutils-xml rename to planetmint_env/bin/myst-docutils-xml index 296414b..9bdd7c0 100755 --- a/docker_environment/bin/myst-docutils-xml +++ b/planetmint_env/bin/myst-docutils-xml @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/nodeenv b/planetmint_env/bin/nodeenv similarity index 74% rename from docker_environment/bin/nodeenv rename to planetmint_env/bin/nodeenv index f0d196f..dfa7fcc 100755 --- a/docker_environment/bin/nodeenv +++ b/planetmint_env/bin/nodeenv @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/planetmint_env/bin/normalizer b/planetmint_env/bin/normalizer new file mode 100755 index 0000000..2df8d88 --- /dev/null +++ b/planetmint_env/bin/normalizer @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'charset-normalizer==2.0.12','console_scripts','normalizer' +__requires__ = 'charset-normalizer==2.0.12' +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('charset-normalizer==2.0.12', 'console_scripts', 'normalizer')() + ) diff --git a/docker_environment/bin/pep8 b/planetmint_env/bin/pep8 similarity index 74% rename from docker_environment/bin/pep8 rename to planetmint_env/bin/pep8 index 0978559..637f4c3 100755 --- a/docker_environment/bin/pep8 +++ b/planetmint_env/bin/pep8 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pip b/planetmint_env/bin/pip similarity index 76% rename from docker_environment/bin/pip rename to planetmint_env/bin/pip index dbc9573..e7daa74 100755 --- a/docker_environment/bin/pip +++ b/planetmint_env/bin/pip @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pip3 b/planetmint_env/bin/pip3 similarity index 76% rename from docker_environment/bin/pip3 rename to planetmint_env/bin/pip3 index dbc9573..e7daa74 100755 --- a/docker_environment/bin/pip3 +++ b/planetmint_env/bin/pip3 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pip3.9 b/planetmint_env/bin/pip3.9 similarity index 76% rename from docker_environment/bin/pip3.9 rename to planetmint_env/bin/pip3.9 index dbc9573..e7daa74 100755 --- a/docker_environment/bin/pip3.9 +++ b/planetmint_env/bin/pip3.9 @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pkginfo b/planetmint_env/bin/pkginfo similarity index 75% rename from docker_environment/bin/pkginfo rename to planetmint_env/bin/pkginfo index 523610a..8a1da44 100755 --- a/docker_environment/bin/pkginfo +++ b/planetmint_env/bin/pkginfo @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/planetmint_env/bin/planetmint b/planetmint_env/bin/planetmint new file mode 100755 index 0000000..5a8f684 --- /dev/null +++ b/planetmint_env/bin/planetmint @@ -0,0 +1,12 @@ +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 +# EASY-INSTALL-ENTRY-SCRIPT: 'Planetmint==0.9.2','console_scripts','planetmint' +__requires__ = 'Planetmint==0.9.2' +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.2', 'console_scripts', 'planetmint')() + ) diff --git a/docker_environment/bin/planetmint-monit-config b/planetmint_env/bin/planetmint-monit-config similarity index 100% rename from docker_environment/bin/planetmint-monit-config rename to planetmint_env/bin/planetmint-monit-config diff --git a/docker_environment/bin/pre-commit b/planetmint_env/bin/pre-commit similarity index 75% rename from docker_environment/bin/pre-commit rename to planetmint_env/bin/pre-commit index be12d6b..345c9eb 100755 --- a/docker_environment/bin/pre-commit +++ b/planetmint_env/bin/pre-commit @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pre-commit-validate-config b/planetmint_env/bin/pre-commit-validate-config similarity index 78% rename from docker_environment/bin/pre-commit-validate-config rename to planetmint_env/bin/pre-commit-validate-config index 75f50e3..0a8e892 100755 --- a/docker_environment/bin/pre-commit-validate-config +++ b/planetmint_env/bin/pre-commit-validate-config @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pre-commit-validate-manifest b/planetmint_env/bin/pre-commit-validate-manifest similarity index 78% rename from docker_environment/bin/pre-commit-validate-manifest rename to planetmint_env/bin/pre-commit-validate-manifest index bf56798..c4e94fb 100755 --- a/docker_environment/bin/pre-commit-validate-manifest +++ b/planetmint_env/bin/pre-commit-validate-manifest @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/py.test b/planetmint_env/bin/py.test similarity index 76% rename from docker_environment/bin/py.test rename to planetmint_env/bin/py.test index 8a3b399..f92e766 100755 --- a/docker_environment/bin/py.test +++ b/planetmint_env/bin/py.test @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pybabel b/planetmint_env/bin/pybabel similarity index 76% rename from docker_environment/bin/pybabel rename to planetmint_env/bin/pybabel index d20f106..c08bab2 100755 --- a/docker_environment/bin/pybabel +++ b/planetmint_env/bin/pybabel @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pycodestyle b/planetmint_env/bin/pycodestyle similarity index 75% rename from docker_environment/bin/pycodestyle rename to planetmint_env/bin/pycodestyle index 2a8efb4..87b5c80 100755 --- a/docker_environment/bin/pycodestyle +++ b/planetmint_env/bin/pycodestyle @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pyflakes b/planetmint_env/bin/pyflakes similarity index 75% rename from docker_environment/bin/pyflakes rename to planetmint_env/bin/pyflakes index 348215b..382218c 100755 --- a/docker_environment/bin/pyflakes +++ b/planetmint_env/bin/pyflakes @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pygmentize b/planetmint_env/bin/pygmentize similarity index 75% rename from docker_environment/bin/pygmentize rename to planetmint_env/bin/pygmentize index fa663ec..2459498 100755 --- a/docker_environment/bin/pygmentize +++ b/planetmint_env/bin/pygmentize @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/pytest b/planetmint_env/bin/pytest similarity index 76% rename from docker_environment/bin/pytest rename to planetmint_env/bin/pytest index 8a3b399..f92e766 100755 --- a/docker_environment/bin/pytest +++ b/planetmint_env/bin/pytest @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/python b/planetmint_env/bin/python similarity index 100% rename from docker_environment/bin/python rename to planetmint_env/bin/python diff --git a/docker_environment/bin/python3 b/planetmint_env/bin/python3 similarity index 100% rename from docker_environment/bin/python3 rename to planetmint_env/bin/python3 diff --git a/docker_environment/bin/python3.9 b/planetmint_env/bin/python3.9 similarity index 100% rename from docker_environment/bin/python3.9 rename to planetmint_env/bin/python3.9 diff --git a/docker_environment/bin/rst2html.py b/planetmint_env/bin/rst2html.py similarity index 90% rename from docker_environment/bin/rst2html.py rename to planetmint_env/bin/rst2html.py index bbf1d93..6318f0f 100755 --- a/docker_environment/bin/rst2html.py +++ b/planetmint_env/bin/rst2html.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2html.py 4564 2006-05-21 20:44:42Z wiemann $ # Author: David Goodger diff --git a/docker_environment/bin/rst2html4.py b/planetmint_env/bin/rst2html4.py similarity index 91% rename from docker_environment/bin/rst2html4.py rename to planetmint_env/bin/rst2html4.py index 2257112..bc9bef0 100755 --- a/docker_environment/bin/rst2html4.py +++ b/planetmint_env/bin/rst2html4.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2html4.py 7994 2016-12-10 17:41:45Z milde $ # Author: David Goodger diff --git a/docker_environment/bin/rst2html5.py b/planetmint_env/bin/rst2html5.py similarity index 94% rename from docker_environment/bin/rst2html5.py rename to planetmint_env/bin/rst2html5.py index da3197d..3fbe6ae 100755 --- a/docker_environment/bin/rst2html5.py +++ b/planetmint_env/bin/rst2html5.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf8 -*- # :Copyright: © 2015 Günter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: diff --git a/docker_environment/bin/rst2latex.py b/planetmint_env/bin/rst2latex.py similarity index 92% rename from docker_environment/bin/rst2latex.py rename to planetmint_env/bin/rst2latex.py index a79354c..c50957c 100755 --- a/docker_environment/bin/rst2latex.py +++ b/planetmint_env/bin/rst2latex.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2latex.py 5905 2009-04-16 12:04:49Z milde $ # Author: David Goodger diff --git a/docker_environment/bin/rst2man.py b/planetmint_env/bin/rst2man.py similarity index 90% rename from docker_environment/bin/rst2man.py rename to planetmint_env/bin/rst2man.py index 9e1b26d..dd8b183 100755 --- a/docker_environment/bin/rst2man.py +++ b/planetmint_env/bin/rst2man.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # Author: # Contact: grubert@users.sf.net diff --git a/docker_environment/bin/rst2odt.py b/planetmint_env/bin/rst2odt.py similarity index 92% rename from docker_environment/bin/rst2odt.py rename to planetmint_env/bin/rst2odt.py index 9b46b0b..ceb42d3 100755 --- a/docker_environment/bin/rst2odt.py +++ b/planetmint_env/bin/rst2odt.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2odt.py 5839 2009-01-07 19:09:28Z dkuhlman $ # Author: Dave Kuhlman diff --git a/docker_environment/bin/rst2odt_prepstyles.py b/planetmint_env/bin/rst2odt_prepstyles.py similarity index 96% rename from docker_environment/bin/rst2odt_prepstyles.py rename to planetmint_env/bin/rst2odt_prepstyles.py index 2468f46..0b5ba29 100755 --- a/docker_environment/bin/rst2odt_prepstyles.py +++ b/planetmint_env/bin/rst2odt_prepstyles.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2odt_prepstyles.py 8346 2019-08-26 12:11:32Z milde $ # Author: Dave Kuhlman diff --git a/docker_environment/bin/rst2pseudoxml.py b/planetmint_env/bin/rst2pseudoxml.py similarity index 90% rename from docker_environment/bin/rst2pseudoxml.py rename to planetmint_env/bin/rst2pseudoxml.py index cf1a7f2..1423669 100755 --- a/docker_environment/bin/rst2pseudoxml.py +++ b/planetmint_env/bin/rst2pseudoxml.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2pseudoxml.py 4564 2006-05-21 20:44:42Z wiemann $ # Author: David Goodger diff --git a/docker_environment/bin/rst2s5.py b/planetmint_env/bin/rst2s5.py similarity index 90% rename from docker_environment/bin/rst2s5.py rename to planetmint_env/bin/rst2s5.py index fb7ae1c..460df14 100755 --- a/docker_environment/bin/rst2s5.py +++ b/planetmint_env/bin/rst2s5.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2s5.py 4564 2006-05-21 20:44:42Z wiemann $ # Author: Chris Liechti diff --git a/docker_environment/bin/rst2xetex.py b/planetmint_env/bin/rst2xetex.py similarity index 93% rename from docker_environment/bin/rst2xetex.py rename to planetmint_env/bin/rst2xetex.py index e58e5d4..6d5b2c1 100755 --- a/docker_environment/bin/rst2xetex.py +++ b/planetmint_env/bin/rst2xetex.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2xetex.py 7847 2015-03-17 17:30:47Z milde $ # Author: Guenter Milde diff --git a/docker_environment/bin/rst2xml.py b/planetmint_env/bin/rst2xml.py similarity index 90% rename from docker_environment/bin/rst2xml.py rename to planetmint_env/bin/rst2xml.py index dd8dc99..c48d872 100755 --- a/docker_environment/bin/rst2xml.py +++ b/planetmint_env/bin/rst2xml.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rst2xml.py 4564 2006-05-21 20:44:42Z wiemann $ # Author: David Goodger diff --git a/docker_environment/bin/rstpep2html.py b/planetmint_env/bin/rstpep2html.py similarity index 91% rename from docker_environment/bin/rstpep2html.py rename to planetmint_env/bin/rstpep2html.py index b7a7a9f..0a43b05 100755 --- a/docker_environment/bin/rstpep2html.py +++ b/planetmint_env/bin/rstpep2html.py @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # $Id: rstpep2html.py 4564 2006-05-21 20:44:42Z wiemann $ # Author: David Goodger diff --git a/docker_environment/bin/sphinx-apidoc b/planetmint_env/bin/sphinx-apidoc similarity index 75% rename from docker_environment/bin/sphinx-apidoc rename to planetmint_env/bin/sphinx-apidoc index 1b6c51e..2ce957d 100755 --- a/docker_environment/bin/sphinx-apidoc +++ b/planetmint_env/bin/sphinx-apidoc @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/sphinx-autogen b/planetmint_env/bin/sphinx-autogen similarity index 77% rename from docker_environment/bin/sphinx-autogen rename to planetmint_env/bin/sphinx-autogen index f327dfd..35d137e 100755 --- a/docker_environment/bin/sphinx-autogen +++ b/planetmint_env/bin/sphinx-autogen @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/sphinx-build b/planetmint_env/bin/sphinx-build similarity index 75% rename from docker_environment/bin/sphinx-build rename to planetmint_env/bin/sphinx-build index e8588f5..cbce3b3 100755 --- a/docker_environment/bin/sphinx-build +++ b/planetmint_env/bin/sphinx-build @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/sphinx-quickstart b/planetmint_env/bin/sphinx-quickstart similarity index 76% rename from docker_environment/bin/sphinx-quickstart rename to planetmint_env/bin/sphinx-quickstart index 9ae415e..5bfb5fd 100755 --- a/docker_environment/bin/sphinx-quickstart +++ b/planetmint_env/bin/sphinx-quickstart @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/tox b/planetmint_env/bin/tox similarity index 75% rename from docker_environment/bin/tox rename to planetmint_env/bin/tox index bbed807..cf97732 100755 --- a/docker_environment/bin/tox +++ b/planetmint_env/bin/tox @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/tox-quickstart b/planetmint_env/bin/tox-quickstart similarity index 75% rename from docker_environment/bin/tox-quickstart rename to planetmint_env/bin/tox-quickstart index 7e67a58..7120029 100755 --- a/docker_environment/bin/tox-quickstart +++ b/planetmint_env/bin/tox-quickstart @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/twine b/planetmint_env/bin/twine similarity index 75% rename from docker_environment/bin/twine rename to planetmint_env/bin/twine index cf3c97d..bd4b3cf 100755 --- a/docker_environment/bin/twine +++ b/planetmint_env/bin/twine @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/virtualenv b/planetmint_env/bin/virtualenv similarity index 77% rename from docker_environment/bin/virtualenv rename to planetmint_env/bin/virtualenv index dde3caa..7c31095 100755 --- a/docker_environment/bin/virtualenv +++ b/planetmint_env/bin/virtualenv @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/bin/watchmedo b/planetmint_env/bin/watchmedo similarity index 75% rename from docker_environment/bin/watchmedo rename to planetmint_env/bin/watchmedo index 4e2a9e8..55f63ea 100755 --- a/docker_environment/bin/watchmedo +++ b/planetmint_env/bin/watchmedo @@ -1,4 +1,4 @@ -#!/home/deffuls/work/planetmint/docker_environment/bin/python3 +#!/home/deffuls/work/planetmint/planetmint_env/bin/python3 # -*- coding: utf-8 -*- import re import sys diff --git a/docker_environment/lib64 b/planetmint_env/lib64 similarity index 100% rename from docker_environment/lib64 rename to planetmint_env/lib64 diff --git a/docker_environment/pyvenv.cfg b/planetmint_env/pyvenv.cfg similarity index 100% rename from docker_environment/pyvenv.cfg rename to planetmint_env/pyvenv.cfg diff --git a/docker_environment/share/man/man1/ipython.1 b/planetmint_env/share/man/man1/ipython.1 similarity index 100% rename from docker_environment/share/man/man1/ipython.1 rename to planetmint_env/share/man/man1/ipython.1 diff --git a/docker_environment/share/python-wheels/CacheControl-0.12.6-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/CacheControl-0.12.6-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/CacheControl-0.12.6-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/CacheControl-0.12.6-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/appdirs-1.4.4-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/appdirs-1.4.4-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/appdirs-1.4.4-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/appdirs-1.4.4-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/certifi-2020.6.20-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/certifi-2020.6.20-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/certifi-2020.6.20-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/certifi-2020.6.20-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/chardet-4.0.0-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/chardet-4.0.0-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/chardet-4.0.0-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/chardet-4.0.0-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/colorama-0.4.4-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/colorama-0.4.4-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/colorama-0.4.4-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/colorama-0.4.4-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/contextlib2-0.6.0.post1-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/contextlib2-0.6.0.post1-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/contextlib2-0.6.0.post1-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/contextlib2-0.6.0.post1-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/distlib-0.3.1-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/distlib-0.3.1-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/distlib-0.3.1-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/distlib-0.3.1-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/distro-1.5.0-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/html5lib-1.1-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/html5lib-1.1-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/html5lib-1.1-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/html5lib-1.1-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/idna-2.10-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/idna-2.10-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/idna-2.10-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/idna-2.10-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/ipaddr-2.2.0-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/ipaddr-2.2.0-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/ipaddr-2.2.0-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/ipaddr-2.2.0-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/msgpack-1.0.0-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/msgpack-1.0.0-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/msgpack-1.0.0-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/msgpack-1.0.0-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/packaging-20.9-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/packaging-20.9-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/packaging-20.9-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/packaging-20.9-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/pep517-0.9.1-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/pep517-0.9.1-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/pep517-0.9.1-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/pep517-0.9.1-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/pip-20.3.4-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/pip-20.3.4-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/pip-20.3.4-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/pip-20.3.4-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/pkg_resources-0.0.0-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/pkg_resources-0.0.0-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/pkg_resources-0.0.0-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/pkg_resources-0.0.0-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/progress-1.5-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/progress-1.5-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/progress-1.5-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/progress-1.5-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/pyparsing-2.4.7-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/pyparsing-2.4.7-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/pyparsing-2.4.7-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/pyparsing-2.4.7-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/requests-2.25.1-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/requests-2.25.1-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/requests-2.25.1-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/requests-2.25.1-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/resolvelib-0.5.4-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/resolvelib-0.5.4-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/resolvelib-0.5.4-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/resolvelib-0.5.4-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/retrying-1.3.3-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/retrying-1.3.3-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/retrying-1.3.3-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/retrying-1.3.3-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/setuptools-44.1.1-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/setuptools-44.1.1-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/setuptools-44.1.1-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/setuptools-44.1.1-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/six-1.16.0-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/six-1.16.0-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/six-1.16.0-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/six-1.16.0-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/toml-0.10.1-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/toml-0.10.1-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/toml-0.10.1-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/toml-0.10.1-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/urllib3-1.26.5-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/urllib3-1.26.5-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/urllib3-1.26.5-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/urllib3-1.26.5-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/webencodings-0.5.1-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/webencodings-0.5.1-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/webencodings-0.5.1-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/webencodings-0.5.1-py2.py3-none-any.whl diff --git a/docker_environment/share/python-wheels/wheel-0.34.2-py2.py3-none-any.whl b/planetmint_env/share/python-wheels/wheel-0.34.2-py2.py3-none-any.whl similarity index 100% rename from docker_environment/share/python-wheels/wheel-0.34.2-py2.py3-none-any.whl rename to planetmint_env/share/python-wheels/wheel-0.34.2-py2.py3-none-any.whl diff --git a/tests/conftest.py b/tests/conftest.py index fdc13e0..12e5f71 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -100,10 +100,8 @@ def _restore_config(_configure_planetmint): config_before_test = Config().init_config('tarantool_db') - @pytest.fixture(scope='session') def _configure_planetmint(request): - from planetmint import config_utils test_db_name = TEST_DB_NAME # Put a suffix like _gw0, _gw1 etc on xdist processes @@ -127,7 +125,6 @@ def _configure_planetmint(request): def _setup_database(_configure_planetmint): # TODO Here is located setup database from planetmint.backend.tarantool.connection import TarantoolDB - print('Deleting `{}` database') db_conn = Connection() db_conn.drop_database() @@ -136,14 +133,12 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa yield - print('Initializing test db') db_conn2 = Connection() db_conn2.drop_database() print('Finishing init database') - @pytest.fixture def _bdb(_setup_database): from planetmint.backend import Connection @@ -250,16 +245,25 @@ def abci_fixture(): return types_pb2 +def run_init_once(): + from planetmint.backend.tarantool.connection import TarantoolDB + db = TarantoolDB() + db.init_database() + + @pytest.fixture def b(): from planetmint import Planetmint + run_init_once() return Planetmint() + @pytest.fixture def eventqueue_fixture(): from multiprocessing import Queue return Queue() + @pytest.fixture def b_mock(b, network_validators): b.get_validators = mock_get_validators(network_validators) @@ -497,7 +501,8 @@ def unspent_output_0(): 'amount': 1, 'asset_id': 'e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d', 'condition_uri': 'ni:///sha-256;RmovleG60-7K0CX60jjfUunV3lBpUOkiQOAnBzghm0w?fpt=ed25519-sha-256&cost=131072', - 'fulfillment_message': '{"asset":{"data":{"hash":"06e47bcf9084f7ecfd2a2a2ad275444a"}},"id":"e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d","inputs":[{"fulfillment":"pGSAIIQT0Jm6LDlcSs9coJK4Q4W-SNtsO2EtMtQJ04EUjBMJgUAXKIqeaippbF-IClhhZNNaP6EIZ_OgrVQYU4mH6b-Vc3Tg-k6p-rJOlLGUUo_w8C5QgPHNRYFOqUk2f1q0Cs4G","fulfills":null,"owners_before":["9taLkHkaBXeSF8vrhDGFTAmcZuCEPqjQrKadfYGs4gHv"]}],"metadata":null,"operation":"CREATE","outputs":[{"amount":"1","condition":{"details":{"public_key":"6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz","type":"ed25519-sha-256"},"uri":"ni:///sha-256;RmovleG60-7K0CX60jjfUunV3lBpUOkiQOAnBzghm0w?fpt=ed25519-sha-256&cost=131072"},"public_keys":["6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz"]},{"amount":"2","condition":{"details":{"public_key":"AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT","type":"ed25519-sha-256"},"uri":"ni:///sha-256;-HlYmgwwl-vXwE52IaADhvYxaL1TbjqfJ-LGn5a1PFc?fpt=ed25519-sha-256&cost=131072"},"public_keys":["AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT"]},{"amount":"3","condition":{"details":{"public_key":"HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB","type":"ed25519-sha-256"},"uri":"ni:///sha-256;xfn8pvQkTCPtvR0trpHy2pqkkNTmMBCjWMMOHtk3WO4?fpt=ed25519-sha-256&cost=131072"},"public_keys":["HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB"]}],"version":"1.0"}', # noqa + 'fulfillment_message': '{"asset":{"data":{"hash":"06e47bcf9084f7ecfd2a2a2ad275444a"}},"id":"e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d","inputs":[{"fulfillment":"pGSAIIQT0Jm6LDlcSs9coJK4Q4W-SNtsO2EtMtQJ04EUjBMJgUAXKIqeaippbF-IClhhZNNaP6EIZ_OgrVQYU4mH6b-Vc3Tg-k6p-rJOlLGUUo_w8C5QgPHNRYFOqUk2f1q0Cs4G","fulfills":null,"owners_before":["9taLkHkaBXeSF8vrhDGFTAmcZuCEPqjQrKadfYGs4gHv"]}],"metadata":null,"operation":"CREATE","outputs":[{"amount":"1","condition":{"details":{"public_key":"6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz","type":"ed25519-sha-256"},"uri":"ni:///sha-256;RmovleG60-7K0CX60jjfUunV3lBpUOkiQOAnBzghm0w?fpt=ed25519-sha-256&cost=131072"},"public_keys":["6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz"]},{"amount":"2","condition":{"details":{"public_key":"AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT","type":"ed25519-sha-256"},"uri":"ni:///sha-256;-HlYmgwwl-vXwE52IaADhvYxaL1TbjqfJ-LGn5a1PFc?fpt=ed25519-sha-256&cost=131072"},"public_keys":["AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT"]},{"amount":"3","condition":{"details":{"public_key":"HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB","type":"ed25519-sha-256"},"uri":"ni:///sha-256;xfn8pvQkTCPtvR0trpHy2pqkkNTmMBCjWMMOHtk3WO4?fpt=ed25519-sha-256&cost=131072"},"public_keys":["HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB"]}],"version":"1.0"}', + # noqa 'output_index': 0, 'transaction_id': 'e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d' } @@ -509,7 +514,8 @@ def unspent_output_1(): 'amount': 2, 'asset_id': 'e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d', 'condition_uri': 'ni:///sha-256;-HlYmgwwl-vXwE52IaADhvYxaL1TbjqfJ-LGn5a1PFc?fpt=ed25519-sha-256&cost=131072', - 'fulfillment_message': '{"asset":{"data":{"hash":"06e47bcf9084f7ecfd2a2a2ad275444a"}},"id":"e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d","inputs":[{"fulfillment":"pGSAIIQT0Jm6LDlcSs9coJK4Q4W-SNtsO2EtMtQJ04EUjBMJgUAXKIqeaippbF-IClhhZNNaP6EIZ_OgrVQYU4mH6b-Vc3Tg-k6p-rJOlLGUUo_w8C5QgPHNRYFOqUk2f1q0Cs4G","fulfills":null,"owners_before":["9taLkHkaBXeSF8vrhDGFTAmcZuCEPqjQrKadfYGs4gHv"]}],"metadata":null,"operation":"CREATE","outputs":[{"amount":"1","condition":{"details":{"public_key":"6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz","type":"ed25519-sha-256"},"uri":"ni:///sha-256;RmovleG60-7K0CX60jjfUunV3lBpUOkiQOAnBzghm0w?fpt=ed25519-sha-256&cost=131072"},"public_keys":["6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz"]},{"amount":"2","condition":{"details":{"public_key":"AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT","type":"ed25519-sha-256"},"uri":"ni:///sha-256;-HlYmgwwl-vXwE52IaADhvYxaL1TbjqfJ-LGn5a1PFc?fpt=ed25519-sha-256&cost=131072"},"public_keys":["AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT"]},{"amount":"3","condition":{"details":{"public_key":"HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB","type":"ed25519-sha-256"},"uri":"ni:///sha-256;xfn8pvQkTCPtvR0trpHy2pqkkNTmMBCjWMMOHtk3WO4?fpt=ed25519-sha-256&cost=131072"},"public_keys":["HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB"]}],"version":"1.0"}', # noqa + 'fulfillment_message': '{"asset":{"data":{"hash":"06e47bcf9084f7ecfd2a2a2ad275444a"}},"id":"e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d","inputs":[{"fulfillment":"pGSAIIQT0Jm6LDlcSs9coJK4Q4W-SNtsO2EtMtQJ04EUjBMJgUAXKIqeaippbF-IClhhZNNaP6EIZ_OgrVQYU4mH6b-Vc3Tg-k6p-rJOlLGUUo_w8C5QgPHNRYFOqUk2f1q0Cs4G","fulfills":null,"owners_before":["9taLkHkaBXeSF8vrhDGFTAmcZuCEPqjQrKadfYGs4gHv"]}],"metadata":null,"operation":"CREATE","outputs":[{"amount":"1","condition":{"details":{"public_key":"6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz","type":"ed25519-sha-256"},"uri":"ni:///sha-256;RmovleG60-7K0CX60jjfUunV3lBpUOkiQOAnBzghm0w?fpt=ed25519-sha-256&cost=131072"},"public_keys":["6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz"]},{"amount":"2","condition":{"details":{"public_key":"AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT","type":"ed25519-sha-256"},"uri":"ni:///sha-256;-HlYmgwwl-vXwE52IaADhvYxaL1TbjqfJ-LGn5a1PFc?fpt=ed25519-sha-256&cost=131072"},"public_keys":["AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT"]},{"amount":"3","condition":{"details":{"public_key":"HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB","type":"ed25519-sha-256"},"uri":"ni:///sha-256;xfn8pvQkTCPtvR0trpHy2pqkkNTmMBCjWMMOHtk3WO4?fpt=ed25519-sha-256&cost=131072"},"public_keys":["HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB"]}],"version":"1.0"}', + # noqa 'output_index': 1, 'transaction_id': 'e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d', } @@ -521,7 +527,8 @@ def unspent_output_2(): 'amount': 3, 'asset_id': 'e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d', 'condition_uri': 'ni:///sha-256;xfn8pvQkTCPtvR0trpHy2pqkkNTmMBCjWMMOHtk3WO4?fpt=ed25519-sha-256&cost=131072', - 'fulfillment_message': '{"asset":{"data":{"hash":"06e47bcf9084f7ecfd2a2a2ad275444a"}},"id":"e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d","inputs":[{"fulfillment":"pGSAIIQT0Jm6LDlcSs9coJK4Q4W-SNtsO2EtMtQJ04EUjBMJgUAXKIqeaippbF-IClhhZNNaP6EIZ_OgrVQYU4mH6b-Vc3Tg-k6p-rJOlLGUUo_w8C5QgPHNRYFOqUk2f1q0Cs4G","fulfills":null,"owners_before":["9taLkHkaBXeSF8vrhDGFTAmcZuCEPqjQrKadfYGs4gHv"]}],"metadata":null,"operation":"CREATE","outputs":[{"amount":"1","condition":{"details":{"public_key":"6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz","type":"ed25519-sha-256"},"uri":"ni:///sha-256;RmovleG60-7K0CX60jjfUunV3lBpUOkiQOAnBzghm0w?fpt=ed25519-sha-256&cost=131072"},"public_keys":["6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz"]},{"amount":"2","condition":{"details":{"public_key":"AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT","type":"ed25519-sha-256"},"uri":"ni:///sha-256;-HlYmgwwl-vXwE52IaADhvYxaL1TbjqfJ-LGn5a1PFc?fpt=ed25519-sha-256&cost=131072"},"public_keys":["AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT"]},{"amount":"3","condition":{"details":{"public_key":"HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB","type":"ed25519-sha-256"},"uri":"ni:///sha-256;xfn8pvQkTCPtvR0trpHy2pqkkNTmMBCjWMMOHtk3WO4?fpt=ed25519-sha-256&cost=131072"},"public_keys":["HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB"]}],"version":"1.0"}', # noqa + 'fulfillment_message': '{"asset":{"data":{"hash":"06e47bcf9084f7ecfd2a2a2ad275444a"}},"id":"e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d","inputs":[{"fulfillment":"pGSAIIQT0Jm6LDlcSs9coJK4Q4W-SNtsO2EtMtQJ04EUjBMJgUAXKIqeaippbF-IClhhZNNaP6EIZ_OgrVQYU4mH6b-Vc3Tg-k6p-rJOlLGUUo_w8C5QgPHNRYFOqUk2f1q0Cs4G","fulfills":null,"owners_before":["9taLkHkaBXeSF8vrhDGFTAmcZuCEPqjQrKadfYGs4gHv"]}],"metadata":null,"operation":"CREATE","outputs":[{"amount":"1","condition":{"details":{"public_key":"6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz","type":"ed25519-sha-256"},"uri":"ni:///sha-256;RmovleG60-7K0CX60jjfUunV3lBpUOkiQOAnBzghm0w?fpt=ed25519-sha-256&cost=131072"},"public_keys":["6FDGsHrR9RZqNaEm7kBvqtxRkrvuWogBW2Uy7BkWc5Tz"]},{"amount":"2","condition":{"details":{"public_key":"AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT","type":"ed25519-sha-256"},"uri":"ni:///sha-256;-HlYmgwwl-vXwE52IaADhvYxaL1TbjqfJ-LGn5a1PFc?fpt=ed25519-sha-256&cost=131072"},"public_keys":["AH9D7xgmhyLmVE944zvHvuvYWuj5DfbMBJhnDM4A5FdT"]},{"amount":"3","condition":{"details":{"public_key":"HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB","type":"ed25519-sha-256"},"uri":"ni:///sha-256;xfn8pvQkTCPtvR0trpHy2pqkkNTmMBCjWMMOHtk3WO4?fpt=ed25519-sha-256&cost=131072"},"public_keys":["HpmSVrojHvfCXQbmoAs4v6Aq1oZiZsZDnjr68KiVtPbB"]}],"version":"1.0"}', + # noqa 'output_index': 2, 'transaction_id': 'e897c7a0426461a02b4fca8ed73bc0debed7570cf3b40fb4f49c963434225a4d', } @@ -531,19 +538,21 @@ def unspent_output_2(): def unspent_outputs(unspent_output_0, unspent_output_1, unspent_output_2): return unspent_output_0, unspent_output_1, unspent_output_2 + @pytest.fixture def tarantool_client(db_context): # TODO Here add TarantoolConnectionClass - return TarantoolDB(host=db_context.host, port=db_context.port) + return TarantoolDB(host=db_context.host, port=db_context.port) -#@pytest.fixture -#def mongo_client(db_context): # TODO Here add TarantoolConnectionClass + +# @pytest.fixture +# def mongo_client(db_context): # TODO Here add TarantoolConnectionClass # return None # MongoClient(host=db_context.host, port=db_context.port) # # @pytest.fixture def utxo_collection(tarantool_client): - return tarantool_client.space("utxos") + return tarantool_client.space("utxos") @pytest.fixture @@ -605,13 +614,13 @@ def ed25519_node_keys(node_keys): @pytest.fixture def node_keys(): return {'zL/DasvKulXZzhSNFwx4cLRXKkSM9GPK7Y0nZ4FEylM=': - 'cM5oW4J0zmUSZ/+QRoRlincvgCwR0pEjFoY//ZnnjD3Mv8Nqy8q6VdnOFI0XDHhwtFcqRIz0Y8rtjSdngUTKUw==', + 'cM5oW4J0zmUSZ/+QRoRlincvgCwR0pEjFoY//ZnnjD3Mv8Nqy8q6VdnOFI0XDHhwtFcqRIz0Y8rtjSdngUTKUw==', 'GIijU7GBcVyiVUcB0GwWZbxCxdk2xV6pxdvL24s/AqM=': - 'mdz7IjP6mGXs6+ebgGJkn7kTXByUeeGhV+9aVthLuEAYiKNTsYFxXKJVRwHQbBZlvELF2TbFXqnF28vbiz8Cow==', + 'mdz7IjP6mGXs6+ebgGJkn7kTXByUeeGhV+9aVthLuEAYiKNTsYFxXKJVRwHQbBZlvELF2TbFXqnF28vbiz8Cow==', 'JbfwrLvCVIwOPm8tj8936ki7IYbmGHjPiKb6nAZegRA=': - '83VINXdj2ynOHuhvSZz5tGuOE5oYzIi0mEximkX1KYMlt/Csu8JUjA4+by2Pz3fqSLshhuYYeM+IpvqcBl6BEA==', + '83VINXdj2ynOHuhvSZz5tGuOE5oYzIi0mEximkX1KYMlt/Csu8JUjA4+by2Pz3fqSLshhuYYeM+IpvqcBl6BEA==', 'PecJ58SaNRsWJZodDmqjpCWqG6btdwXFHLyE40RYlYM=': - 'uz8bYgoL4rHErWT1gjjrnA+W7bgD/uDQWSRKDmC8otc95wnnxJo1GxYlmh0OaqOkJaobpu13BcUcvITjRFiVgw=='} + 'uz8bYgoL4rHErWT1gjjrnA+W7bgD/uDQWSRKDmC8otc95wnnxJo1GxYlmh0OaqOkJaobpu13BcUcvITjRFiVgw=='} @pytest.fixture @@ -699,7 +708,6 @@ def validators(b, node_keys): def get_block_height(b): - if b.get_latest_block(): height = b.get_latest_block()['height'] else: diff --git a/tests/db/test_planetmint_api.py b/tests/db/test_planetmint_api.py index 3ce7077..9a04b6c 100644 --- a/tests/db/test_planetmint_api.py +++ b/tests/db/test_planetmint_api.py @@ -25,10 +25,10 @@ class TestBigchainApi(object): b.store_bulk_transactions([tx]) transfer_tx = Transfer.generate(tx.to_inputs(), [([alice.public_key], 1)], - asset_id=tx.id) + asset_id=tx.id) transfer_tx = transfer_tx.sign([alice.private_key]) transfer_tx2 = Transfer.generate(tx.to_inputs(), [([alice.public_key], 2)], - asset_id=tx.id) + asset_id=tx.id) transfer_tx2 = transfer_tx2.sign([alice.private_key]) with pytest.raises(DoubleSpend): @@ -74,11 +74,11 @@ class TestBigchainApi(object): # create the transactions tx1 = Create.generate([alice.public_key], [([alice.public_key], 1)], - asset=asset1).sign([alice.private_key]) + asset=asset1).sign([alice.private_key]) tx2 = Create.generate([alice.public_key], [([alice.public_key], 1)], - asset=asset2).sign([alice.private_key]) + asset=asset2).sign([alice.private_key]) tx3 = Create.generate([alice.public_key], [([alice.public_key], 1)], - asset=asset3).sign([alice.private_key]) + asset=asset3).sign([alice.private_key]) # write the transactions to the DB b.store_bulk_transactions([tx1, tx2, tx3]) @@ -98,7 +98,7 @@ class TestBigchainApi(object): [user_pk], TransactionLink('somethingsomething', 0)) tx = Transfer.generate([input], [([user_pk], 1)], - asset_id='mock_asset_link') + asset_id='mock_asset_link') with pytest.raises(InputDoesNotExist): tx.validate(b) @@ -107,7 +107,7 @@ class TestBigchainApi(object): asset1 = {'msg': 'Planetmint 1'} tx = Create.generate([alice.public_key], [([alice.public_key], 1)], - asset=asset1).sign([alice.private_key]) + asset=asset1).sign([alice.private_key]) b.store_bulk_transactions([tx]) tx_from_db = b.get_transaction(tx.id) @@ -170,7 +170,7 @@ class TestMultipleInputs(object): input_tx = b.get_transaction(tx_link.txid) inputs = input_tx.to_inputs() tx = Transfer.generate(inputs, [([user2_pk], 1)], - asset_id=input_tx.id) + asset_id=input_tx.id) tx = tx.sign([user_sk]) # validate transaction @@ -190,8 +190,8 @@ class TestMultipleInputs(object): input_tx = b.get_transaction(tx_link.txid) tx = Transfer.generate(input_tx.to_inputs(), - [([user2_pk, user3_pk], 1)], - asset_id=input_tx.id) + [([user2_pk, user3_pk], 1)], + asset_id=input_tx.id) tx = tx.sign([user_sk]) tx.validate(b) @@ -217,7 +217,7 @@ class TestMultipleInputs(object): inputs = input_tx.to_inputs() transfer_tx = Transfer.generate(inputs, [([user3_pk], 1)], - asset_id=input_tx.id) + asset_id=input_tx.id) transfer_tx = transfer_tx.sign([user_sk, user2_sk]) # validate transaction @@ -245,8 +245,8 @@ class TestMultipleInputs(object): tx_input = b.get_transaction(tx_link.txid) tx = Transfer.generate(tx_input.to_inputs(), - [([user3_pk, user4_pk], 1)], - asset_id=tx_input.id) + [([user3_pk, user4_pk], 1)], + asset_id=tx_input.id) tx = tx.sign([user_sk, user2_sk]) tx.validate(b) @@ -269,7 +269,7 @@ class TestMultipleInputs(object): assert owned_inputs_user2 == [] tx_transfer = Transfer.generate(tx.to_inputs(), [([user2_pk], 1)], - asset_id=tx.id) + asset_id=tx.id) tx_transfer = tx_transfer.sign([user_sk]) b.store_bulk_transactions([tx_transfer]) @@ -302,8 +302,8 @@ class TestMultipleInputs(object): # transfer divisible asset divided in two outputs tx_transfer = Transfer.generate(tx_create.to_inputs(), - [([user2_pk], 1), ([user2_pk], 1)], - asset_id=tx_create.id) + [([user2_pk], 1), ([user2_pk], 1)], + asset_id=tx_create.id) tx_transfer_signed = tx_transfer.sign([user_sk]) b.store_bulk_transactions([tx_transfer_signed]) @@ -333,7 +333,7 @@ class TestMultipleInputs(object): assert owned_inputs_user1 == expected_owned_inputs_user1 tx = Transfer.generate(tx.to_inputs(), [([user3_pk], 1)], - asset_id=tx.id) + asset_id=tx.id) tx = tx.sign([user_sk, user2_sk]) b.store_bulk_transactions([tx]) @@ -362,7 +362,7 @@ class TestMultipleInputs(object): # create a transaction and send it tx = Transfer.generate(tx.to_inputs(), [([user2_pk], 1)], - asset_id=tx.id) + asset_id=tx.id) tx = tx.sign([user_sk]) b.store_bulk_transactions([tx]) @@ -377,9 +377,9 @@ class TestMultipleInputs(object): # create a divisible asset with 3 outputs tx_create = Create.generate([alice.public_key], - [([user_pk], 1), - ([user_pk], 1), - ([user_pk], 1)]) + [([user_pk], 1), + ([user_pk], 1), + ([user_pk], 1)]) tx_create_signed = tx_create.sign([alice.private_key]) b.store_bulk_transactions([tx_create_signed]) @@ -391,8 +391,8 @@ class TestMultipleInputs(object): # transfer the first 2 inputs tx_transfer = Transfer.generate(tx_create.to_inputs()[:2], - [([user2_pk], 1), ([user2_pk], 1)], - asset_id=tx_create.id) + [([user2_pk], 1), ([user2_pk], 1)], + asset_id=tx_create.id) tx_transfer_signed = tx_transfer.sign([user_sk]) b.store_bulk_transactions([tx_transfer_signed]) @@ -415,7 +415,7 @@ class TestMultipleInputs(object): for i in range(3): payload = {'somedata': i} tx = Create.generate([alice.public_key], [([user_pk, user2_pk], 1)], - payload) + payload) tx = tx.sign([alice.private_key]) transactions.append(tx) @@ -428,8 +428,8 @@ class TestMultipleInputs(object): # create a transaction tx = Transfer.generate(transactions[0].to_inputs(), - [([user3_pk], 1)], - asset_id=transactions[0].id) + [([user3_pk], 1)], + asset_id=transactions[0].id) tx = tx.sign([user_sk, user2_sk]) b.store_bulk_transactions([tx]) @@ -503,7 +503,7 @@ def test_cant_spend_same_input_twice_in_tx(b, alice): # Create a transfer transaction with duplicated fulfillments dup_inputs = tx_create.to_inputs() + tx_create.to_inputs() tx_transfer = Transfer.generate(dup_inputs, [([alice.public_key], 200)], - asset_id=tx_create.id) + asset_id=tx_create.id) tx_transfer_signed = tx_transfer.sign([alice.private_key]) with pytest.raises(DoubleSpend): tx_transfer_signed.validate(b) diff --git a/tests/test_config_utils.py b/tests/test_config_utils.py index c0ad1cb..34d0a6a 100644 --- a/tests/test_config_utils.py +++ b/tests/test_config_utils.py @@ -11,8 +11,9 @@ import pytest import planetmint from planetmint.config import Config + @pytest.fixture(scope='function', autouse=True) -def clean_config(monkeypatch, request): +def clean_config(monkeypatch, request): original_config = Config().init_config('tarantool_db') backend = request.config.getoption('--database-backend') original_config['database'] = Config().get_db_map(backend) @@ -50,7 +51,7 @@ def test_load_validation_plugin_raises_with_invalid_subclass(monkeypatch): import time monkeypatch.setattr(config_utils, 'iter_entry_points', - lambda *args: [type('entry_point', (object, ), {'load': lambda: object})]) + lambda *args: [type('entry_point', (object,), {'load': lambda: object})]) with pytest.raises(TypeError): # Since the function is decorated with `lru_cache`, we need to @@ -62,7 +63,7 @@ def test_load_events_plugins(monkeypatch): from planetmint import config_utils monkeypatch.setattr(config_utils, 'iter_entry_points', - lambda *args: [type('entry_point', (object, ), {'load': lambda: object})]) + lambda *args: [type('entry_point', (object,), {'load': lambda: object})]) plugins = config_utils.load_events_plugins(['one', 'two']) assert len(plugins) == 2 @@ -127,8 +128,10 @@ def test_env_config(monkeypatch): assert result == expected + @pytest.mark.skip -def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request): # TODO Disabled until we create a better config format +def test_autoconfigure_read_both_from_file_and_env(monkeypatch, + request): # TODO Disabled until we create a better config format return # constants DATABASE_HOST = 'test-host' @@ -311,10 +314,10 @@ def test_write_config(): @pytest.mark.parametrize('env_name,env_value,config_key', ( - ('PLANETMINT_DATABASE_BACKEND', 'test-backend', 'backend'), - ('PLANETMINT_DATABASE_HOST', 'test-host', 'host'), - ('PLANETMINT_DATABASE_PORT', 4242, 'port'), - ('PLANETMINT_DATABASE_NAME', 'test-db', 'name'), + ('PLANETMINT_DATABASE_BACKEND', 'test-backend', 'backend'), + ('PLANETMINT_DATABASE_HOST', 'test-host', 'host'), + ('PLANETMINT_DATABASE_PORT', 4242, 'port'), + ('PLANETMINT_DATABASE_NAME', 'test-db', 'name'), )) def test_database_envs(env_name, env_value, config_key, monkeypatch): import planetmint diff --git a/tests/web/test_block_tendermint.py b/tests/web/test_block_tendermint.py index 7fb034d..e52bac6 100644 --- a/tests/web/test_block_tendermint.py +++ b/tests/web/test_block_tendermint.py @@ -56,7 +56,6 @@ def test_get_block_containing_transaction(b, client, alice): height=13, transactions=[tx.id]) b.store_block(block._asdict()) - res = client.get('{}?transaction_id={}'.format(BLOCKS_ENDPOINT, tx.id)) expected_response = [block.height] assert res.json == expected_response