update metadata in setup.cfg, setup.py, meta.yaml, and pyproject.toml…

…, futher clarification of install in README.rst
USEPA · Nov 30, 2023 · bade784 · bade784
1 parent 514576d
commit bade784
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 22 deletions.
diff --git a/README.rst b/README.rst
@@ -96,7 +96,7 @@ and install pyaqsapi.
 
     pip install -r requirements.txt
 
-Next change into the new directory then use setuptools to build and pip
+While still in the project's root directory use setuptools to build and pip
 to install the package.
 
 .. code-block:: console

diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/pyaqsapi.doctree b/docs/_build/doctrees/pyaqsapi.doctree
diff --git a/meta.yaml b/meta.yaml
@@ -9,8 +9,6 @@ package:
 
 source:
     fn: pyaqsapi-1.0.tar.gz
-    url: https://bitbucket.epa.gov/projects/AQDA/repos/pyaqsapi/browse/dist/pyaqsapi-0.9b0.tar.gz
-    md5: 22e91dd03e5dbcb5f6fb875e4774be8a
 
 build:
     noarch: python
@@ -43,6 +41,8 @@ requirements:
     - pytest-black
     - codecov
 about:
-    home: https://bitbucket.epa.gov/projects/AQDA/repos/pyaqsapi/
+    home:"https://github.com/USEPA/pyaqsapi"
     license: LICENSE.rst
-    summary: "Retrieve air monitoring data and associated metadata from the US Environmental Protection Agency's Air Quality System service using functions."
+    summary: "Retrieve air monitoring data and associated metadata from the \
+              US Environmental Protection Agency's Air Quality System \
+              service using functions."
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,33 @@
+[project]
+name = "pyaqsapi"
+requires-python = ">=3.8"
+dynamic = ["version", "dependencies", "optional-dependencies"]
+description="Retrieve ambient air monitoring data from the United States Environmental Protection Agency’s (US EPA) Air Quality System (AQS) Data Mart API v2 interface."
+authors = [
+  {name = "Clinton Mccrowey", email = "[email protected]"},
+]
+maintainers = [
+  {name = "Clinton Mccrowey", email = "[email protected]"}
+]
+readme = {file = "README.rst", content-type = "text/x-rst"}
+license = {file = "LICENSE.rst"}
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent"
+]
+
+[project.urls]
+"Homepage" = "https://github.com/USEPA/pyaqsapi"
+"AQS" = "https://www.epa.gov/aqs"
+"AQS DataMart" = "https://aqs.epa.gov/aqsweb/documents/data_mart_welcome.html"
+"AQS Data Mart API" = "https://aqs.epa.gov/aqsweb/documents/data_api.html"
+"pyaqsapi API Documentation" = "https://usepa.github.io/pyaqsapi/"
+"SOURCE" = "https://github.com/USEPA/pyaqsapi.git"
+"RAQSAPI" = "https://github.com/USEPA/RAQSAPI"
+"Issue Tracker" = "https://github.com/USEPA/pyaqsapi/issues"
+
 [build-system]
 requires = [
     "sphinx",
@@ -47,8 +77,5 @@ exclude = [
     ".vscode"
 ]
 
-target-version = ["py38", "py39", "py310", "py311", "py312"]
-
-
 [tool.ruff.pydocstyle]
 convention = "google"
diff --git a/setup.cfg b/setup.cfg
@@ -7,16 +7,19 @@ description = Retrieve air monitoring data and associated metadata from the US E
 long_description =
 url = NA
 project_urls =
-    pyaqsapi = "https://github.com/USEPA/pyaqsapi"
-	AQS = https://www.epa.gov/aqs
-	AQS Data Mart = https://aqs.epa.gov/aqsweb/documents/data_mart_welcome.html
-	SOURCE = https://github.com/USEPA/pyaqsapi
-	RAQSAPI = https://github.com/USEPA/RAQSAPI
-	Bug Tracker = https://github.com/USEPA/pyaqsapi/issues
+    Homepage = https://github.com/USEPA/pyaqsapi
+    AQS = https://www.epa.gov/aqs
+    AQS DataMart = https://aqs.epa.gov/aqsweb/documents/data_mart_welcome.html
+    AQS DataMart API = https://aqs.epa.gov/aqsweb/documents/data_api.html
+    SOURCE = https://github.com/USEPA/pyaqsapi.git
+    pyaqsapi API documentation = https://usepa.github.io/pyaqsapi/
+    RAQSAPI = https://github.com/USEPA/RAQSAPI
+    Issue Tracker = https://github.com/USEPA/pyaqsapi/issues
+    
 classifiers =
-	Programming Language :: Python :: 3
-	License :: OSI Approved :: MIT License
-	Operating System :: OS Independent
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
 
 [options]
 packages = find:

diff --git a/setup.py b/setup.py
@@ -18,13 +18,13 @@ def readme():
     install_requires=["wheel", "sphinx", "setuptools", "sphinx-rtd-theme"],
     zip_safe=False,
     project_urls={
-        "pyaqsapi": "https://github.com/USEPA/pyaqsapi",
+        "Homepage": "https://github.com/USEPA/pyaqsapi",
         "AQS": "https://www.epa.gov/aqs",
-        "AQS Data Mart": "https://aqs.epa.gov/aqsweb/documents/data_mart_welcome.html",
+        "AQS DataMart": "https://aqs.epa.gov/aqsweb/documents/data_mart_welcome.html",
         "RAQSAPI": "https://github.com/USEPA/RAQSAPI",
-        "Bug Tracker": "https://github.com/USEPA/pyaqsapi/issues",
-        "Source": "https://github.com/USEPA/pyaqsapi",
-        "Data Mart API": "https://aqs.epa.gov/aqsweb/documents/data_api.html",
+        "Issue Tracker": "https://github.com/USEPA/pyaqsapi/issues",
+        "Source": "https://github.com/USEPA/pyaqsapi.git",
+        "AQS Data Mart API": "https://aqs.epa.gov/aqsweb/documents/data_api.html",
     },
     classifiers=[
         "Programming Language :: Python :: 3",