Skip to content

Commit 9f23b5a

Browse files
bump required py version to 3.6 (#126)
* bump required py version to 3.6 since we use type hints * Catch no token environment variable to make tests run locally * black format tests
1 parent c447bab commit 9f23b5a

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import os
22

3+
34
def pytest_addoption(parser):
45
parser.addoption("--token", action="store", default="")
56

7+
68
def pytest_generate_tests(metafunc):
79
# token = metafunc.config.option.token
810
token = os.environ.get("ACCESS_TOKEN")
9-
token = token if len(token) > 0 else None
11+
token = token if token and len(token) > 0 else None
1012

1113
if "token" in metafunc.fixturenames:
12-
metafunc.parametrize("token", [token])
14+
metafunc.parametrize("token", [token])

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def parse_requirements(fname):
4444
use_scm_version={"write_to": "src/sumo/wrapper/version.py"},
4545
author="Equinor ASA",
4646
install_requires=REQUIREMENTS,
47-
python_requires=">=3.4",
47+
python_requires=">=3.6",
4848
packages=find_packages("src"),
4949
package_dir={"": "src"},
5050
include_package_data=True,

tests/test_sumo_thin_client.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import sys
77
import os
88

9-
sys.path.append(os.path.abspath(os.path.join('src')))
9+
sys.path.append(os.path.abspath(os.path.join("src")))
1010

1111
from sumo.wrapper import SumoClient
1212

@@ -56,8 +56,7 @@ def _upload_child_level_json(C, parent_id, json):
5656
response = C.api.post(f"/objects('{parent_id}')", json=json)
5757

5858
if not 200 <= response.status_code < 202:
59-
raise Exception(
60-
f"Response: {response.status_code}, Text: {response.text}")
59+
raise Exception(f"Response: {response.status_code}, Text: {response.text}")
6160
return response
6261

6362

@@ -77,6 +76,7 @@ class ValueKeeper:
7776

7877
import uuid
7978

79+
8080
def test_upload_search_delete_ensemble_child(token):
8181
"""
8282
Testing the wrapper functionalities.
@@ -101,7 +101,7 @@ def test_upload_search_delete_ensemble_child(token):
101101
assert isinstance(response_case.json(), dict)
102102

103103
case_id = response_case.json().get("objectid")
104-
assert(case_id == case_uuid)
104+
assert case_id == case_uuid
105105

106106
sleep(5)
107107

@@ -111,8 +111,7 @@ def test_upload_search_delete_ensemble_child(token):
111111

112112
fmu_surface_metadata["fmu"]["case"]["uuid"] = case_uuid
113113

114-
fmu_surface_id = fmu_surface_metadata.get(
115-
"fmu").get("realization").get("id")
114+
fmu_surface_id = fmu_surface_metadata.get("fmu").get("realization").get("id")
116115
response_surface = _upload_child_level_json(
117116
C=C, parent_id=case_id, json=fmu_surface_metadata
118117
)

0 commit comments

Comments
 (0)