Skip to content

Commit d8aa9de

Browse files
committed
chore: format codebase, run format in CI, remove unused code
1 parent f2ac010 commit d8aa9de

17 files changed

+113
-930
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ prof/
2929
Data/
3030
bulk_test_result*
3131

32-
get-pip.py*
32+
get-pip.py*

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ setup-git-hooks:
1313

1414
lint:
1515
ruff check soil_id
16+
ruff format soil_id --diff
1617

1718
format:
1819
ruff format soil_id
@@ -73,7 +74,6 @@ process_bulk_test_results_legacy:
7374
python -m soil_id.tests.legacy.process_bulk_test_results $(RESULTS_FILE)
7475

7576
# Donwload Munsell CSV, SHX, SHP, SBX, SBN, PRJ, DBF
76-
# 1tN23iVe6X1fcomcfveVp4w3Pwd0HJuTe: LandPKS_munsell_rgb_lab.csv
7777
# 1WUa9e3vTWPi6G8h4OI3CBUZP5y7tf1Li: gsmsoilmu_a_us.shx
7878
# 1l9MxC0xENGmI_NmGlBY74EtlD6SZid_a: gsmsoilmu_a_us.shp
7979
# 1asGnnqe0zI2v8xuOszlsNmZkOSl7cJ2n: gsmsoilmu_a_us.sbx
@@ -84,7 +84,6 @@ process_bulk_test_results_legacy:
8484
download-soil-data:
8585
mkdir -p Data
8686
cd Data; \
87-
gdown 1tN23iVe6X1fcomcfveVp4w3Pwd0HJuTe; \
8887
gdown 1WUa9e3vTWPi6G8h4OI3CBUZP5y7tf1Li; \
8988
gdown 1l9MxC0xENGmI_NmGlBY74EtlD6SZid_a; \
9089
gdown 1asGnnqe0zI2v8xuOszlsNmZkOSl7cJ2n; \
@@ -116,7 +115,7 @@ connect_db:
116115
docker compose exec db psql -U postgres -d soil_id
117116

118117
dump_soil_id_db:
119-
pg_dump --format=custom $(DATABASE_URL) -t hwsd2_segment -t hwsd2_data -t landpks_munsell_rgb_lab -t normdist1 -t normdist2 -t wise_soil_data -t wrb2006_to_fao90 -t wrb_fao90_desc -f $(DATABASE_DUMP_FILE)
118+
pg_dump --format=custom $(DATABASE_URL) -t hwsd2_segment -t hwsd2_data -t landpks_munsell_rgb_lab -t normdist2 -f $(DATABASE_DUMP_FILE)
120119

121120
restore_soil_id_db:
122121
pg_restore --dbname=$(DATABASE_URL) --single-transaction --clean --if-exists --no-owner $(DATABASE_DUMP_FILE)

soil_id/config.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,20 @@
1313
# You should have received a copy of the GNU Affero General Public License
1414
# along with this program. If not, see https://www.gnu.org/licenses/.
1515
import os
16-
import tempfile
17-
18-
from platformdirs import user_cache_dir
1916

2017
DATA_PATH = os.environ.get("DATA_PATH", "Data")
2118

2219
# Numpy seeding
2320
RANDOM_SEED = os.environ.get("RANDOM_SEED", 19)
2421

25-
# Output
26-
APP_NAME = os.environ.get("APP_NAME", "org.terraso.soilid")
27-
TEMP_DIR = tempfile.TemporaryDirectory()
28-
CACHE_DIR = user_cache_dir(APP_NAME)
29-
OUTPUT_PATH = TEMP_DIR.name
30-
SOIL_ID_RANK_PATH = f"{OUTPUT_PATH}/soil_id_rank.csv"
31-
SOIL_ID_PROB_PATH = f"{OUTPUT_PATH}/soil_id_cond_prob.csv"
32-
REQUESTS_CACHE_PATH = f"{CACHE_DIR}/requests_cache"
33-
3422
# Determines if in/out of US
3523
US_AREA_PATH = f"{DATA_PATH}/SoilID_US_Areas.shz"
3624

3725
# US Soil ID
3826
STATSGO_PATH = f"{DATA_PATH}/gsmsoilmu_a_us.shp"
39-
MUNSELL_RGB_LAB_PATH = f"{DATA_PATH}/LandPKS_munsell_rgb_lab.csv"
4027

4128
# Database
42-
DB_NAME = os.environ.get("DB_NAME", "terraso_backend")
29+
DB_NAME = os.environ.get("DB_NAME", "soil_id")
4330
DB_HOST = os.environ.get("DB_HOST")
4431
DB_USERNAME = os.environ.get("DB_USERNAME")
4532
DB_PASSWORD = os.environ.get("DB_PASSWORD")

0 commit comments

Comments
 (0)