diff --git a/pyproject.toml b/pyproject.toml index adfaa84..1a9010a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,8 +22,6 @@ classifiers = [ "Topic :: Software Development :: Object Brokering" ] dependencies = [ - "numpy>1.25.0", - "pandas==2.0.2", "psycopg2-binary>=2.9.10", "python-dateutil==2.8.2", "python-dotenv==1.0.0", @@ -32,7 +30,6 @@ dependencies = [ "six==1.16.0", "tzdata==2023.3", "openpyxl", - "requests", "tqdm>=4.65.0", "mkdocs>=1.6.1", "mkdocs-material>=9.6.16", diff --git a/src/DataBUS/neotomaValidator/insert_final.py b/src/DataBUS/neotomaValidator/insert_final.py index b1c1849..b7c924f 100644 --- a/src/DataBUS/neotomaValidator/insert_final.py +++ b/src/DataBUS/neotomaValidator/insert_final.py @@ -46,5 +46,4 @@ def insert_final(cur, databus): response.valid.append(False) response.message.append(f"✗ Dataset submission cannot be finalized: {e}") response.message = list(set(response.message)) - response.validAll = all(response.valid) return response diff --git a/src/DataBUS/neotomaValidator/valid_geopolitical_units.py b/src/DataBUS/neotomaValidator/valid_geopolitical_units.py index f8f51c5..114078e 100644 --- a/src/DataBUS/neotomaValidator/valid_geopolitical_units.py +++ b/src/DataBUS/neotomaValidator/valid_geopolitical_units.py @@ -71,11 +71,14 @@ def valid_geopolitical_units(cur, yml_dict, csv_file, databus=None): response.valid.append(False) for unit in inputs: - cur.execute( - query_with_parent, - {"geopoliticalname": inputs[unit].lower(), "highergeopoliticalid": current_id}, - ) - gpid2 = cur.fetchone() + if inputs[unit] is None: + break + else: + cur.execute( + query_with_parent, + {"geopoliticalname": inputs[unit].lower(), "highergeopoliticalid": current_id}, + ) + gpid2 = cur.fetchone() if not gpid2: response.message.append(f"? Subregional Unit {inputs[unit]} not found.") break