fix: global code update

.gitignore

@@ -27,5 +27,6 @@ prof/
 
 # reference and output files
 Data/
+bulk_test_result*
 
 get-pip.py*

Makefile

@@ -54,12 +54,24 @@ graphs:
 	gprof2dot -f pstats  prof/test_soil_location.prof | dot -Tsvg -o prof/test_soil_location.svg
 	flameprof prof/test_soil_location.prof > prof/test_soil_location_flame.svg
 
-generate_bulk_test_results:
+generate_bulk_test_results_us:
 	python -m soil_id.tests.us.generate_bulk_test_results
 
-process_bulk_test_results:
+process_bulk_test_results_us:
 	python -m soil_id.tests.us.process_bulk_test_results $(RESULTS_FILE)
 
+generate_bulk_test_results_global:
+	python -m soil_id.tests.global.generate_bulk_test_results
+
+process_bulk_test_results_global:
+	python -m soil_id.tests.global.process_bulk_test_results $(RESULTS_FILE)
+
+generate_bulk_test_results_legacy:
+	python -m soil_id.tests.legacy.generate_bulk_test_results
+
+process_bulk_test_results_legacy:
+	python -m soil_id.tests.legacy.process_bulk_test_results $(RESULTS_FILE)
+
 # Donwload Munsell CSV, SHX, SHP, SBX, SBN, PRJ, DBF
 download-soil-data:
 	mkdir -p Data

docker-compose.yml

@@ -0,0 +1,16 @@
+name: soil_data
+
+services:
+  db:
+    image: postgis/postgis
+    ports: 
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: soil_data # default database
+    volumes:
+      - pg_data:/var/lib/postgresql/data
+
+volumes:
+  pg_data:

soil_id/config.py

@@ -12,23 +12,19 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see https://www.gnu.org/licenses/.
-
 import os
 import tempfile
 
-from dotenv import load_dotenv
 from platformdirs import user_cache_dir
 
-load_dotenv()
-
 DATA_PATH = os.environ.get("DATA_PATH", "Data")
 
 # Numpy seeding
 RANDOM_SEED = os.environ.get("RANDOM_SEED", 19)
 
 # Output
 APP_NAME = os.environ.get("APP_NAME", "org.terraso.soilid")
-TEMP_DIR = tempfile.TemporaryDirectory(delete=False)
+TEMP_DIR = tempfile.TemporaryDirectory()
 CACHE_DIR = user_cache_dir(APP_NAME)
 OUTPUT_PATH = TEMP_DIR.name
 SOIL_ID_RANK_PATH = f"{OUTPUT_PATH}/soil_id_rank.csv"
@@ -45,8 +41,6 @@
 # Global Soil ID
 HWSD_PATH = f"{DATA_PATH}/HWSD_global_noWater_no_country.shp"
 WISE_PATH = f"{DATA_PATH}/wise30sec_poly_simp_soil.shp"
-NORM_DIST_1_PATH = f"{DATA_PATH}/NormDist1.csv"
-NORM_DIST_2_PATH = f"{DATA_PATH}/NormDist2.csv"
 
 # Database
 DB_NAME = os.environ.get("DB_NAME", "terraso_backend")