From f59e5312b53dd89bac30c4cceb70547eb88909cc Mon Sep 17 00:00:00 2001 From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com> Date: Fri, 30 Jun 2023 15:06:42 +0300 Subject: [PATCH 1/5] Update requirements.txt --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 91781062..aa4cd4bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,5 +25,4 @@ ordered-set~=4.0.2 json2html~=1.3.0 minio~=7.1.1 certifi~=2022.12.7 -shortuuid~=1.0.11 -pycurl~=7.45.2 \ No newline at end of file +shortuuid~=1.0.11 \ No newline at end of file From 53492ceb6ecfe699904bfb9af9ca4622b180da16 Mon Sep 17 00:00:00 2001 From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com> Date: Fri, 30 Jun 2023 15:12:56 +0300 Subject: [PATCH 2/5] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index aa4cd4bc..906f45a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # Project dependecies pydantic~=1.9.0 -requests~=2.28.2 +requests~=2.27.1 deepdiff~=5.7.0 jinja2~=3.1.2 python-dotenv~=0.19.2 From 775628651dcf3f042fd206b09dec36254773af95 Mon Sep 17 00:00:00 2001 From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com> Date: Fri, 30 Jun 2023 15:14:43 +0300 Subject: [PATCH 3/5] move pycurl to test env --- requirements.dev.txt | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.dev.txt b/requirements.dev.txt index 1cbcadce..8e0ff54c 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -9,3 +9,4 @@ tox-pytest-summary~=0.1.2 mongomock==4.0.0 uvicorn[standard] allure-pytest-bdd==2.10.0 +pycurl~=7.45.2 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 906f45a5..aa4cd4bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # Project dependecies pydantic~=1.9.0 -requests~=2.27.1 +requests~=2.28.2 deepdiff~=5.7.0 jinja2~=3.1.2 python-dotenv~=0.19.2 From 27af05d2922ee2bbcf18befaf3c613a47a9a98c9 Mon Sep 17 00:00:00 2001 From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com> Date: Fri, 30 Jun 2023 17:07:07 +0300 Subject: [PATCH 4/5] update tests for new mapping suite packages version --- requirements.dev.txt | 2 +- ...processor_from_github_expand_and_load_package_in_mongo_db.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.dev.txt b/requirements.dev.txt index 8e0ff54c..7e45e5f0 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -6,7 +6,7 @@ pytest-cov~=3.0.0 pytest-subtests~=0.6.0 tox~=3.24.5 tox-pytest-summary~=0.1.2 -mongomock==4.0.0 +mongomock==4.1.2 uvicorn[standard] allure-pytest-bdd==2.10.0 pycurl~=7.45.2 \ No newline at end of file diff --git a/tests/e2e/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py b/tests/e2e/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py index 279ca620..b186a7fd 100644 --- a/tests/e2e/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py +++ b/tests/e2e/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py @@ -3,7 +3,7 @@ mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db MAPPING_SUITE_PACKAGE_NAME = "package_F03_test" -MAPPING_SUITE_PACKAGE_ID = f"{MAPPING_SUITE_PACKAGE_NAME}_v2.3.0" +MAPPING_SUITE_PACKAGE_ID = f"package_F03_v6.8.1" def test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db(fake_mongodb_client): From 13aa934e1e594070fcb0f7c49326b18f3118da92 Mon Sep 17 00:00:00 2001 From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com> Date: Fri, 30 Jun 2023 17:11:39 +0300 Subject: [PATCH 5/5] Update test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py --- ...ocessor_from_github_expand_and_load_package_in_mongo_db.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/e2e/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py b/tests/e2e/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py index b186a7fd..1c9dcf1e 100644 --- a/tests/e2e/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py +++ b/tests/e2e/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py @@ -3,7 +3,9 @@ mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db MAPPING_SUITE_PACKAGE_NAME = "package_F03_test" -MAPPING_SUITE_PACKAGE_ID = f"package_F03_v6.8.1" +MAPPING_SUITE_METADATA_IDENTIFIER = "package_F03" +MAPPING_SUITE_METADATA_VERSION = "6.8.1" +MAPPING_SUITE_PACKAGE_ID = f"{MAPPING_SUITE_METADATA_IDENTIFIER}_v{MAPPING_SUITE_METADATA_VERSION}" def test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db(fake_mongodb_client):