Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-11-25 23:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge issues

Browse Source 
Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Jürgen Eckel 2022-05-13 11:15:53 +02:00
parent f3a56db9e8
commit ec9bc83f5a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -28,11 +28,11 @@ matrix:
include: include:
- python: 3.9 - python: 3.9
env: env:
- PLANETMINT_DATABASE_BACKEND=tarantool - PLANETMINT_DATABASE_BACKEND=tarantool_db
- PLANETMINT_DATABASE_SSL= - PLANETMINT_DATABASE_SSL=
- python: 3.9 - python: 3.9
env: env:
- PLANETMINT_DATABASE_BACKEND=tarantool - PLANETMINT_DATABASE_BACKEND=tarantool_db
- PLANETMINT_DATABASE_SSL= - PLANETMINT_DATABASE_SSL=
- PLANETMINT_CI_ABCI=enable - PLANETMINT_CI_ABCI=enable
- python: 3.9 - python: 3.9

2
Dockerfile-all-in-one
View File

@ -34,7 +34,7 @@ RUN mkdir -p /data/db /data/configdb \
# Planetmint enviroment variables # Planetmint enviroment variables
ENV PLANETMINT_DATABASE_PORT 27017 ENV PLANETMINT_DATABASE_PORT 27017
ENV PLANETMINT_DATABASE_BACKEND tarantool ENV PLANETMINT_DATABASE_BACKEND tarantool_db
ENV PLANETMINT_SERVER_BIND 0.0.0.0:9984 ENV PLANETMINT_SERVER_BIND 0.0.0.0:9984
ENV PLANETMINT_WSSERVER_HOST 0.0.0.0 ENV PLANETMINT_WSSERVER_HOST 0.0.0.0
ENV PLANETMINT_WSSERVER_SCHEME ws ENV PLANETMINT_WSSERVER_SCHEME ws

6
planetmint/commands/planetmint.py
View File

@ -323,9 +323,9 @@ def create_parser():
help='Prepare the config file.') help='Prepare the config file.')
config_parser.add_argument('backend', config_parser.add_argument('backend',
choices=['tarantool', 'localmongodb'], choices=['tarantool_db', 'localmongodb'],
default='tarantool', default='tarantool_db',
const='tarantool', const='tarantool_db',
nargs='?', nargs='?',
help='The backend to use. It can only be ' help='The backend to use. It can only be '
'"tarantool_db", currently.') '"tarantool_db", currently.')

2
tests/conftest.py
View File

@ -99,7 +99,7 @@ def _configure_planetmint(request):
test_db_name = '{}_{}'.format(TEST_DB_NAME, xdist_suffix) test_db_name = '{}_{}'.format(TEST_DB_NAME, xdist_suffix)
# backend = request.config.getoption('--database-backend') # backend = request.config.getoption('--database-backend')
backend = "tarantool" backend = "tarantool_db"
config = { config = {
'database': Config().get_db_map(backend), 'database': Config().get_db_map(backend),