rename filepath for authfile

Author: wehrad

tests/conftest.py

@@ -1,55 +1,57 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 
 @author: Adrien Wehrlé, University of Zurich, Switzerland
 
 """
 
-import earthspy.earthspy as es
-import pytest
 import os
 
+import pytest
+
+import earthspy.earthspy as es
+
+
 def pytest_addoption(parser):
-    parser.addoption("--filepath", action="store", default="test")
-    
+    parser.addoption("--authfile", action="store", default="test")
 
-if os.getenv("CI") is not None:    
+
+if os.getenv("CI") is not None:
     # create local variables from environment secrets for convenience
     SH_CLIENT_ID = os.environ["SH_CLIENT_ID"]
     SH_CLIENT_SECRET = os.environ["SH_CLIENT_SECRET"]
-    
+
     # path to credential file to be created
-    filepath = "auth.txt"
-    
+    authfile = "auth.txt"
+
     # create file containing credentials for testing
-    with open(filepath, "w") as out:
+    with open(authfile, "w") as out:
         out.write(f"{SH_CLIENT_ID}\n{SH_CLIENT_SECRET}")
 else:
+
     @pytest.fixture(scope="session")
-    def filepath(pytestconfig):
-        return pytestconfig.getoption("filepath")
-    
+    def authfile(pytestconfig):
+        return pytestconfig.getoption("authfile")
+
     @pytest.fixture(scope="session")
-    def credentials(filepath):
+    def credentials(authfile):
         # read credentials stored in text file
-        with open(filepath) as file:
+        with open(authfile) as file:
             credentials = file.read().splitlines()
         return credentials
-        
+
     @pytest.fixture(scope="session")
-    def SH_CLIENT_ID(credentials) -> None: 
+    def SH_CLIENT_ID(credentials) -> None:
         # extract credentials from lines
         SH_CLIENT_ID = credentials[0]
         return SH_CLIENT_ID
-    
+
     @pytest.fixture(scope="session")
     def SH_CLIENT_SECRET(credentials) -> None:
         SH_CLIENT_SECRET = credentials[1]
         return SH_CLIENT_SECRET
 
 
-      
 @pytest.fixture(scope="session")
 def test_evalscript():
     test_evalscript = """
@@ -69,37 +71,42 @@ def test_evalscript():
         }
         """
     return test_evalscript
-    
+
+
 @pytest.fixture(scope="session")
-def test_url():      
+def test_url():
     test_url = (
         "https://custom-scripts.sentinel-hub.com/custom-scripts/"
         + "sentinel-2/true_color/script.js"
     )
     return test_url
 
+
 @pytest.fixture(scope="session")
-def test_collection():  
+def test_collection():
     # an example of data collection
     test_collection = "SENTINEL2_L2A"
     return test_collection
-    
+
+
 @pytest.fixture(scope="session")
-def test_bounding_box():  
+def test_bounding_box():
     # an example of footprint area
     test_bounding_box = [-51.13, 69.204, -51.06, 69.225]
     return test_bounding_box
-    
+
+
 @pytest.fixture(scope="session")
-def test_area_name():  
+def test_area_name():
     # an example of area available as GEOJSON file
     test_area_name = "Ilulissat"
     return test_area_name
 
+
 @pytest.fixture(scope="session")
-def t1(filepath, test_evalscript, test_collection, test_bounding_box):
+def t1(authfile, test_evalscript, test_collection, test_bounding_box):
     # example of query with default parameters
-    t1 = es.EarthSpy(filepath)
+    t1 = es.EarthSpy(authfile)
     t1.set_query_parameters(
         bounding_box=test_bounding_box,
         time_interval=["2019-08-23"],
@@ -109,10 +116,11 @@ def t1(filepath, test_evalscript, test_collection, test_bounding_box):
     )
     return t1
 
+
 @pytest.fixture(scope="session")
-def t2(filepath, test_evalscript, test_collection, test_area_name):
+def t2(authfile, test_evalscript, test_collection, test_area_name):
     # example of query with direct area name
-    t2 = es.EarthSpy(filepath)
+    t2 = es.EarthSpy(authfile)
     t2.set_query_parameters(
         bounding_box=test_area_name,
         time_interval=["2019-08-23"],
@@ -122,10 +130,11 @@ def t2(filepath, test_evalscript, test_collection, test_area_name):
     )
     return t2
 
+
 @pytest.fixture(scope="session")
-def t3(filepath, test_evalscript, test_collection, test_bounding_box):
+def t3(authfile, test_evalscript, test_collection, test_bounding_box):
     # example of query with direct mode
-    t3 = es.EarthSpy(filepath)
+    t3 = es.EarthSpy(authfile)
     t3.set_query_parameters(
         bounding_box=test_bounding_box,
         time_interval=["2019-08-23"],
@@ -135,10 +144,11 @@ def t3(filepath, test_evalscript, test_collection, test_bounding_box):
     )
     return t3
 
+
 @pytest.fixture(scope="session")
-def t4(filepath, test_evalscript, test_collection, test_bounding_box):
+def t4(authfile, test_evalscript, test_collection, test_bounding_box):
     # example of query with direct mode
-    t4 = es.EarthSpy(filepath)
+    t4 = es.EarthSpy(authfile)
     t4.set_query_parameters(
         bounding_box=test_bounding_box,
         time_interval=["2019-08-23"],
@@ -148,34 +158,3 @@ def t4(filepath, test_evalscript, test_collection, test_bounding_box):
         raster_compression="LZW",
     )
     return t4
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    

tests/test_earthspy.py

@@ -5,15 +5,12 @@
 
 """
 
-import glob
-import json
-import os
-
 import numpy as np
 import pandas as pd
 import requests
 import sentinelhub as shb
 
+
 def test_init(t1, SH_CLIENT_ID, SH_CLIENT_SECRET) -> None:
     """Test auth.txt parsing and connection configuration."""