Merge pull request #2726 from jdebacker/catalog

Update PSL catalog JSON

PSL_catalog.json

@@ -1,51 +1,29 @@
 {
-    "project_one_line": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<p>Tax-Calculator is an open-source microsimulation model for static analysis of USA federal income and payroll taxes.</p>"
-    },
-    "project_overview": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<a href=\"https://PSLmodels.github.io/Tax-Calculator/\">What is Tax-Calculator?</a>"
-    },
-    "core_maintainers": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<ul><li>Jason DeBacker</li><li>Henry Doupe</li><li>Anderson Frailey</li><li>Matt Jensen</li></ul>"
-    },
-    "user_documentation": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<a href=\"http://PSLmodels.github.io/Tax-Calculator/\"></a>"
-    },
-    "contributor_overview": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<a href=\"https://pslmodels.github.io/Tax-Calculator/contributing/contributor_guide.html\"></a>"
-    },
-    "user_changelog_recent": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": "html",
-        "data": "<a href=\"https://pslmodels.github.io/Tax-Calculator/about/changes.html\"></a>"
-    },
-    "link_to_webapp": {
-        "start_header": null,
-        "end_header": null,
-        "source": null,
-        "type": null,
-        "data": null
+    "name": "Tax-Calculator",
+    "img": "",
+    "banner_title": "Tax-Calculator",
+    "banner_subtitle": "USA Federal Individual Income and Payroll Tax Microsimulation Model",
+    "detailed_description": "Tax-Calculator is an open-source microsimulation model for static analysis of USA federal income and payroll taxes.",
+    "policy_area": "Tax Microsimulation, Revenue Estimation, Distributional Analysis",
+    "geography": "United States",
+    "language": "Python",
+    "maintainers": [
+        {
+            "name": "Jason DeBacker",
+            "image": "https://github.com/jdebacker.png",
+            "link": "https://github.com/jdebacker"
+        },
+        {
+            "name": "Matthew Jensen",
+            "image": "https://avatars.githubusercontent.com/u/8301092?v=4",
+            "link": "https://github.com/MattHJensen/"
+        },
+    ],
+    "links": {
+      "code_repository": "https://github.com/PSLmodels/Tax-Calculator",
+      "user_documentation": "https://taxcalc.pslmodels.org/",
+      "contributor_documentation": "https://taxcalc.pslmodels.org/contributing/contributor_guide.html",
+      "webapp": "",
+      "recent_changes": "https://taxcalc.pslmodels.org/about/releases.html"
     }
-}
+}

setup.py

@@ -10,6 +10,7 @@
     "url": "https://github.com/PSLmodels/Tax-Calculator",
     "download_url": "https://github.com/PSLmodels/Tax-Calculator",
     "description": "taxcalc",
+    "long_description_content_type": "text/markdown",
     "long_description": longdesc,
     "version": version,
     "license": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",

taxcalc.egg-info/PKG-INFO

@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: setuptools
 Requires-Dist: numpy