From 9305257cd88ac70410faf9bb7d09c634236f347f Mon Sep 17 00:00:00 2001
From: vtexier <vit@free.fr>
Date: Wed, 18 Mar 2020 20:12:43 +0100
Subject: [PATCH] [fix] update pytest environment
---
Makefile | 4 +++-
requirements_dev.txt | 8 ++++----
tests/conftest.py | 4 +---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 21e8713d..13040c44 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@
# run tests
tests:
- pytest -q -s ${TESTS_FILTER}
+ python3 gen_resources.py
+ python3 gen_translations.py --lrelease
+ pytest -q -s --disable-warnings ${TESTS_FILTER}
# check
check: mypy pylint check-format
diff --git a/requirements_dev.txt b/requirements_dev.txt
index cea6b28f..06bccdb4 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1,7 +1,7 @@
black==19.10b0
-duniter-mirage==0.1.15
-mypy==0.761
+duniter-mirage==0.1.50
+mypy==0.770
pylint==2.4.4
-pytest==5.3.5
-pytest-asyncio==0.10.0
+pytest
+pytest-asyncio
md-to-html
\ No newline at end of file
diff --git a/tests/conftest.py b/tests/conftest.py
index 5a6a09ff..7ac7557c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -5,19 +5,17 @@ import sqlite3
import mirage
import sys
import os
-import locale
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
from sakia.constants import ROOT_SERVERS
from duniterpy.documents import BlockUID
-from duniterpy.key import ScryptParams
+from duniterpy.key.scrypt_params import ScryptParams
from sakia.app import Application
from sakia.options import SakiaOptions
from sakia.data.files import *
from sakia.data.entities import *
from sakia.data.repositories import *
-from sakia.services import DocumentsService
_application_ = []
--
GitLab