remove old version of certifi from requirements.txt

docs/conf.py

@@ -4,7 +4,7 @@
 # list see the documentation:
 # https://www.sphinx-doc.org/en/master/usage/configuration.html
 
-# -- Path setup --------------------------------------------------------------
+# -- Path setup ---------------------------------------------------------------
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -16,14 +16,14 @@
 sys.path.insert(0, os.path.abspath(".."))
 
 
-# -- Project information -----------------------------------------------------
+# -- Project information ------------------------------------------------------
 
 project = "pyaqsapi"
 copyright = "2022, US Environmental Protection Agency"
 author = "Clinton Mccrowey (US Environmental Protection Agency)"
 
 
-# -- General configuration ---------------------------------------------------
+# -- General configuration ----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -53,7 +53,7 @@
 ]
 
 
-# -- Options for HTML output -------------------------------------------------
+# -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -90,7 +90,7 @@
 # -- Options for numpydoc -----------------------------------------------------
 numpydoc_show_class_members = False
 
-# -- Options for sphinx-contrib\apidoc -----------------------------------------------------
+# -- Options for sphinx-contrib\apidoc ----------------------------------------
 apidoc_separate_modules = True
 apidoc_module_dir = "../pyaqsapi"
 apidoc_excluded_paths = ["tests"]

pyaqsapi/bybox/bybox.py

@@ -4,9 +4,10 @@
 (by latitude/longitude bounding box)
 """
 
-import pyaqsapi.helperfunctions as helperfunctions
 from pandas import DataFrame
 
+import pyaqsapi.helperfunctions as helperfunctions
+
 
 def monitors(
     parameter,

pyaqsapi/bybox/tests/test_bybox.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import pytest
 from datetime import date
-import pyaqsapi.bybox as bybox
-from pyaqsapi.helperfunctions import aqs_credentials
-from os.path import exists, abspath
 from os import environ, getcwd
+from os.path import abspath, exists
 from sys import path
 
+import pytest
+
+import pyaqsapi.bybox as bybox
+from pyaqsapi.helperfunctions import aqs_credentials
+
 
 @pytest.fixture
 def setuppyaqsapi(autouse=True):

pyaqsapi/bycbsa/bycbsa.py

@@ -2,9 +2,10 @@
 """Functions that aggregate data by cbsa
 (by Core Based Statistic Area, as defined by the Census Bureau)."""
 
-import pyaqsapi.helperfunctions as helperfunctions
 from pandas import DataFrame
 
+import pyaqsapi.helperfunctions as helperfunctions
+
 
 def monitors(
     parameter, bdate, edate, cbsa_code, cbdate=None, cedate=None, return_header=False

pyaqsapi/bycbsa/tests/test_bycbsa.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import pytest
 from datetime import date
-import pyaqsapi.bycbsa as bycbsa
-from pyaqsapi.helperfunctions import aqs_credentials
-from os.path import exists, abspath
 from os import environ, getcwd
+from os.path import abspath, exists
 from sys import path
 
+import pytest
+
+import pyaqsapi.bycbsa as bycbsa
+from pyaqsapi.helperfunctions import aqs_credentials
+
 
 @pytest.fixture
 def setuppyaqsapi(autouse=True):

pyaqsapi/bycounty/bycounty.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 """Functions that aggregate data by county."""
 
-import pyaqsapi.helperfunctions as helperfunctions
 from pandas import DataFrame
 
+import pyaqsapi.helperfunctions as helperfunctions
+
 
 def monitors(
     parameter,

pyaqsapi/bycounty/tests/test_bycounty.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import pytest
 from datetime import date
-import pyaqsapi.bycounty as bycounty
-from pyaqsapi.helperfunctions import aqs_credentials
-from os.path import exists, abspath
 from os import environ, getcwd
+from os.path import abspath, exists
 from sys import path
 
+import pytest
+
+import pyaqsapi.bycounty as bycounty
+from pyaqsapi.helperfunctions import aqs_credentials
+
 
 @pytest.fixture
 def setuppyaqsapi(autouse=True):

pyaqsapi/byma/tests/test_byma.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import pytest
 from datetime import date
-import pyaqsapi.byma as byma
-from pyaqsapi.helperfunctions import aqs_credentials
-from os.path import exists, abspath
 from os import environ, getcwd
+from os.path import abspath, exists
 from sys import path
 
+import pytest
+
+import pyaqsapi.byma as byma
+from pyaqsapi.helperfunctions import aqs_credentials
+
 
 @pytest.fixture
 def setuppyaqsapi(autouse=True):

pyaqsapi/bypqao/tests/test_bypqao.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import pytest
 from datetime import date
-import pyaqsapi.bypqao as bypqao
-from pyaqsapi.helperfunctions import aqs_credentials
-from os.path import exists, abspath
 from os import environ, getcwd
+from os.path import abspath, exists
 from sys import path
 
+import pytest
+
+import pyaqsapi.bypqao as bypqao
+from pyaqsapi.helperfunctions import aqs_credentials
+
 
 @pytest.fixture
 def setuppyaqsapi(autouse=True):

pyaqsapi/bysite/bysite.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 """pyaqsapi Functions that aggregate data by site."""
 
-import pyaqsapi.helperfunctions as helperfunctions
 from pandas import DataFrame
 
+import pyaqsapi.helperfunctions as helperfunctions
+
 
 def monitors(
     parameter,

pyaqsapi/bysite/tests/test_bysite.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import pytest
 from datetime import date
-import pyaqsapi.bysite as bysite
-from pyaqsapi.helperfunctions import aqs_credentials
-from os.path import exists, abspath
 from os import environ, getcwd
+from os.path import abspath, exists
 from sys import path
 
+import pytest
+
+import pyaqsapi.bysite as bysite
+from pyaqsapi.helperfunctions import aqs_credentials
+
 
 @pytest.fixture
 def setuppyaqsapi(autouse=True):

pyaqsapi/bystate/bystate.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 """Functions that aggregated data by state."""
 
-import pyaqsapi.helperfunctions as helperfunctions
 from pandas import DataFrame
 
+import pyaqsapi.helperfunctions as helperfunctions
+
 
 def monitors(
     parameter,

pyaqsapi/bystate/tests/test_bystate.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import pytest
 from datetime import date
-import pyaqsapi.bystate as bystate
-from pyaqsapi.helperfunctions import aqs_credentials
-from os.path import exists, abspath
 from os import environ, getcwd
+from os.path import abspath, exists
 from sys import path
 
+import pytest
+
+import pyaqsapi.bystate as bystate
+from pyaqsapi.helperfunctions import aqs_credentials
+
 
 @pytest.fixture
 def setuppyaqsapi(autouse=True):

pyaqsapi/helperfunctions.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 """helperfunctions."""
 
-from pandas import DataFrame, concat
-from requests import get
-from time import sleep
-from warnings import warn
 from datetime import date
 from itertools import starmap
-from certifi import where
+from time import sleep
+from warnings import warn
 
+from certifi import where
+from pandas import DataFrame, concat
+from requests import get
 
 AQS_user = None
 AQS_key = None
@@ -267,13 +267,13 @@ def __aqs(
             variables["pc"] = variables.pop("class")
         if "county_code" in variables.keys():
             variables["county"] = variables.pop("county_code")
-        if "edate" in variables.keys() and not variables["edate"] is None:
+        if "edate" in variables.keys() and variables["edate"] is not None:
             variables["edate"] = variables["edate"].strftime(format="%Y%m%d")
-        if "bdate" in variables.keys() and not variables["bdate"] is None:
+        if "bdate" in variables.keys() and variables["bdate"] is not None:
             variables["bdate"] = variables["bdate"].strftime(format="%Y%m%d")
-        if "cedate" in variables.keys() and not variables["cedate"] is None:
+        if "cedate" in variables.keys() and variables["cedate"] is not None:
             variables["cedate"] = variables["cedate"].strftime(format="%Y%m%d")
-        if "cbdate" in variables.keys() and not variables["cbdate"] is None:
+        if "cbdate" in variables.keys() and variables["cbdate"] is not None:
             variables["cbdate"] = variables["cbdate"].strftime(format="%Y%m%d")
         if service is None:
             service = ""

pyaqsapi/listfunctions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """listfunctions."""
 import pyaqsapi.helperfunctions as helperfunctions
 

pyproject.toml

@@ -12,3 +12,44 @@ build-backend = "setuptools.build_meta"
 minversion = "6.0"
 testpaths = ["tests"]
 max-line-length = 85
+combine-as-imports = true
+show-source = true
+
+
+[tool.ruff]
+select = ["I001",
+          "I002",
+          "E101",
+          "D100",
+          "D401",
+          "D402",
+          "D403",
+          "D404",
+          "D406",
+          "D407",
+          "D408",
+          "D409",
+          "D414",
+          "D415",
+          "D417",
+          "D419"]
+
+extend-select = ["UP"]
+
+
+exclude = [
+    "__init__.py",
+    ".git",
+    ".tox",
+    "ruff_cache",
+    ".spyproject",
+    ".github",
+    ".vscode"
+]
+
+
+target-version = "py37"
+
+
+[tool.ruff.pydocstyle]
+convention = "google"

requirements.txt

@@ -13,4 +13,4 @@ toml
 sphinx_rtd_theme
 numpydoc
 certifi
-cryptography==36.0.2
+cryptography

setup.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 def readme():
@@ -24,7 +24,6 @@ def readme():
         "RAQSAPI": "https://github.com/USEPA/RAQSAPI",
         "Bug Tracker": "https://github.com/USEPA/pyaqsapi/issues",
         "Source": "https://github.com/USEPA/pyaqsapi",
-        "Bug Tracker": "https://github.com/USEPA/pyaqsapi/issues",
         "Data Mart API": "https://aqs.epa.gov/aqsweb/documents/data_api.html",
     },
     classifiers=[

tests/test_listfunctions.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
+from os import environ, getcwd
+from os.path import abspath, exists
+from sys import path
+
 import pytest
-from datetime import date
+
 import pyaqsapi.listfunctions as listfunctions
 from pyaqsapi.helperfunctions import aqs_credentials
-from os.path import exists, abspath
-from os import environ, getcwd
-from sys import path
-from os import getcwd
 
 
 @pytest.fixture