💚 Address some lint

htdocs/admin/dataprogress.py

@@ -1,6 +1,6 @@
 """Print out a big thing of progress bars, gasp"""
 
-from pyiem.util import get_dbconn
+from pyiem.database import get_dbconn
 from pyiem.webutil import iemapp
 
 DBCONN = get_dbconn("sustainablecorn")

pyproject.toml

@@ -2,6 +2,9 @@
 [tool.ruff]
 line-length = 79
 target-version = "py39"
+exclude = [
+    "**/*.ipynb",
+]
 
 [tool.ruff.lint]
 select = [

scripts/auth/drive2webaccess.py

@@ -2,8 +2,9 @@
 Synchronize the ACL on the Google Drive to the local DB
 """
 
+from pyiem.database import get_dbconn
+
 import isudatateam.cscap_utils as utils
-from pyiem.util import get_dbconn
 
 
 def main():

scripts/cscap/add_agronomic_column.py

@@ -1,4 +1,5 @@
 import gdata.docs.client
+
 import isudatateam.cscap_utils as util
 
 config = util.get_config()

scripts/cscap/check_2012_on.py

@@ -3,10 +3,11 @@
 2011 and the rest of the years
 """
 
-import isudatateam.cscap_utils as util
 from gspread_pandas import Spread
 from pyiem.util import logger
 
+import isudatateam.cscap_utils as util
+
 LOG = logger()
 
 

scripts/cscap/check_agronomic_header.py

@@ -1,8 +1,9 @@
 """Gio discovered a mismatch between AG codes and headers"""
 
-import isudatateam.cscap_utils as util
 import pandas as pd
 
+import isudatateam.cscap_utils as util
+
 config = util.get_config()
 drive = util.get_driveclient(config, "cscap")
 sheets = util.get_sheetsclient(config, "cscap")

scripts/cscap/create_agronomic_datasheet.py

@@ -5,6 +5,7 @@
 import copy
 
 import gdata.spreadsheets.data
+
 import isudatateam.cscap_utils as util
 
 config = util.get_config()

scripts/cscap/create_soil_bd.py

@@ -1,4 +1,5 @@
 import gdata.spreadsheets.data
+
 import isudatateam.cscap_utils as util
 
 config = util.get_config()

scripts/cscap/create_soil_nitrate_sheets.py

@@ -1,4 +1,5 @@
 import gdata.spreadsheets.data
+
 import isudatateam.cscap_utils as util
 
 config = util.get_config()

scripts/cscap/create_soil_texture_sheets.py

@@ -3,6 +3,7 @@
 """
 
 import gdata.spreadsheets.data
+
 import isudatateam.cscap_utils as util
 
 config = util.get_config()

scripts/cscap/drop_column.py

@@ -9,7 +9,7 @@ def main():
 
     # Get me a client, stat
     spr_client = util.get_spreadsheet_client(config)
-    drive_client = util.get_driveclient()
+    drive_client = util.get_driveclient(config)
 
     res = (
         drive_client.files()

scripts/cscap/email_daily_changes.py

@@ -16,10 +16,11 @@
 # third party
 import gdata.gauth
 import gdata.sites.client as sclient
-import isudatateam.cscap_utils as util
 from gdata.client import RequestError
 from pyiem.util import logger
 
+import isudatateam.cscap_utils as util
+
 LOG = logger()
 CONFIG = util.get_config()
 FMIME = "application/vnd.google-apps.folder"

scripts/cscap/fix_agronomic_labels.py

@@ -4,6 +4,7 @@
 """
 
 import gdata.docs.client
+
 import isudatateam.cscap_utils as util
 
 VARID = "agr43"  # lowercase

scripts/cscap/fix_plotid_insheets.py

@@ -1,10 +1,11 @@
 """Go through our data sheets and cleanup entries that don't exactly match
 things that we would like to see"""
 
-import isudatateam.cscap_utils as util
 from pandas.io.sql import read_sql
 from pyiem.util import get_dbconn
 
+import isudatateam.cscap_utils as util
+
 pgconn = get_dbconn("sustainablecorn")
 df = read_sql("SELECT * from plotids", pgconn, index_col=None)
 df["key"] = df["uniqueid"] + "::" + df["plotid"]

scripts/cscap/get_tokens.py

@@ -1,8 +1,9 @@
 """Script fetches openauth2 refresh token that my offline scripts can use"""
 
-import isudatateam.cscap_utils as util
 from gdata import gauth
 
+import isudatateam.cscap_utils as util
+
 config = util.get_config()
 
 token = gauth.OAuth2Token(

scripts/cscap/harvest_agronomic.py

@@ -4,9 +4,10 @@
 
 import sys
 
-import isudatateam.cscap_utils as util
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 YEAR = sys.argv[1]
 
 config = util.get_config()

scripts/cscap/harvest_management.py

@@ -1,8 +1,9 @@
 """Harvest the data in the data management store!"""
 
-import isudatateam.cscap_utils as util
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 
 def main():
     """Go Main"""

scripts/cscap/harvest_plotids.py

@@ -2,9 +2,10 @@
 
 import sys
 
-import isudatateam.cscap_utils as util
 from pyiem.util import get_dbconn
 
+import isudatateam.cscap_utils as util
+
 
 def main():
     """Go Main"""

scripts/cscap/harvest_soil_bd.py

@@ -4,9 +4,10 @@
 
 import sys
 
-import isudatateam.cscap_utils as util
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 YEAR = sys.argv[1]
 
 config = util.get_config()

scripts/cscap/harvest_soil_fertility.py

@@ -2,9 +2,10 @@
 
 import sys
 
-import isudatateam.cscap_utils as util
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 config = util.get_config()
 
 pgconn = psycopg2.connect(

scripts/cscap/harvest_soil_infiltration.py

@@ -2,9 +2,10 @@
 
 import sys
 
-import isudatateam.cscap_utils as util
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 YEAR = sys.argv[1]
 
 config = util.get_config()

scripts/cscap/harvest_soil_nitrate.py

@@ -5,9 +5,10 @@
 import datetime
 import sys
 
-import isudatateam.cscap_utils as util
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 YEAR = sys.argv[1]
 
 DUMMY_DATES = {

scripts/cscap/harvest_soil_texture.py

@@ -6,9 +6,10 @@
 
 import sys
 
-import isudatateam.cscap_utils as util
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 YEAR = sys.argv[1]
 
 config = util.get_config()

scripts/cscap/list_sheet_notes.py

@@ -4,10 +4,11 @@
 https://issuetracker.google.com/issues/36756650
 """
 
-import isudatateam.cscap_utils as util
 import pandas as pd
 from tqdm import tqdm
 
+import isudatateam.cscap_utils as util
+
 
 def main():
     """Go!"""

scripts/cscap/plotids/check_cscap_ipm_plotids.py

@@ -1,10 +1,11 @@
 """Check for IPM data?"""
 
-import isudatateam.cscap_utils as utils
 import pandas as pd
 import psycopg2
 from pandas.io.sql import read_sql
 
+import isudatateam.cscap_utils as utils
+
 
 def main():
     """Do Things"""

scripts/cscap/plotids/check_ghg_plotids.py

@@ -1,10 +1,11 @@
 """Check ghg plotids"""
 
-import isudatateam.cscap_utils as utils
 import pandas as pd
 import psycopg2
 from pandas.io.sql import read_sql
 
+import isudatateam.cscap_utils as utils
+
 
 def main():
     """Do Main"""

scripts/cscap/plotids/check_ipm_plotids.py

@@ -1,10 +1,11 @@
 """Verify that the Plot IDs are OK."""
 
-import isudatateam.cscap_utils as utils
 import pandas as pd
 import psycopg2
 from pandas.io.sql import read_sql
 
+import isudatateam.cscap_utils as utils
+
 
 def main():
     """Go Main"""

scripts/cscap/plotids/set_has_agro_soils.py

@@ -1,8 +1,9 @@
 """set some metadata"""
 
-import isudatateam.cscap_utils as util
 from pyiem.util import get_dbconn
 
+import isudatateam.cscap_utils as util
+
 
 def main():
     """Go Main!"""

scripts/cscap/set_ecoregions.py

@@ -2,9 +2,10 @@
 ftp://ftp.epa.gov/wed/ecoregions/us
 """
 
-import isudatateam.cscap_utils as util
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 pgconn = psycopg2.connect(database="akrherz")
 cursor = pgconn.cursor()
 

scripts/cscap/sheet2database.py

@@ -1,9 +1,10 @@
 """A direct copy of a Google Spreadsheet to a postgresql database"""
 
-import isudatateam.cscap_utils as util
 from gspread_pandas import Spread
 from pyiem.util import get_dbconn, logger
 
+import isudatateam.cscap_utils as util
+
 LOG = logger()
 config = util.get_config()
 pgconn = get_dbconn("sustainablecorn")

scripts/cscap/ss2database.py

@@ -1,10 +1,11 @@
 """A direct copy of a Google Spreadsheet to a postgresql database"""
 
-import isudatateam.cscap_utils as util
 import psycopg2
 from six import string_types
 from unidecode import unidecode
 
+import isudatateam.cscap_utils as util
+
 config = util.get_config()
 pgconn = psycopg2.connect(
     database="sustainablecorn", host=config["database"]["host"]

scripts/cscap/sync_plot_ids_from_metadata_master.py

@@ -3,6 +3,7 @@
 """
 
 import gdata.spreadsheets.data
+
 import isudatateam.cscap_utils as util
 
 config = util.get_config()

scripts/cscap/syncauth_drive2sites.py

@@ -5,9 +5,10 @@
 import gdata.gauth
 import gdata.sites.client as sclient
 import gdata.sites.data
-import isudatateam.cscap_utils as util
 from gdata import gauth
 
+import isudatateam.cscap_utils as util
+
 config = util.get_config()
 
 token = gauth.OAuth2Token(

scripts/cscap/syncauth_sites2drive.py

@@ -4,6 +4,7 @@
 
 import gdata.gauth
 import gdata.sites.client as sclient
+
 import isudatateam.cscap_utils as util
 
 config = util.get_config()

scripts/cscap/watertable/ingest_watertable.py

@@ -3,10 +3,11 @@
 import datetime
 import sys
 
-import isudatateam.cscap_utils as util
 import pandas as pd
 import psycopg2
 
+import isudatateam.cscap_utils as util
+
 CENTRAL_TIME = ["ISUAG", "GILMORE", "SERF"]
 
 

scripts/td/change_file_owners.py

@@ -2,11 +2,12 @@
 account.  This is not ideal as if this file is deleted, then it goes into
 purgatory."""
 
-import isudatateam.cscap_utils as util
 from apiclient.discovery import build
 from httplib2 import Http
 from oauth2client.service_account import ServiceAccountCredentials
 
+import isudatateam.cscap_utils as util
+
 config = util.get_config()
 
 

scripts/td/copy_management.py

@@ -1,6 +1,7 @@
 """Copy management entries from CSCAP to TD"""
 
 import gdata.spreadsheets.data
+
 import isudatateam.cscap_utils as util
 
 CSCAP_ID = "1CdPi6IEnO3T35t-OFQajKYzFLpu7hwOaWdL2FG1_kVA"