Merge pull request #307 from jdebacker/fixes

Some small fixes to website
PSLmodels · Mar 8, 2024 · b8332e5 · b8332e5
2 parents 46445ff + 412a8be
commit b8332e5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/Tools/Catalog-Builder/catalog_builder/tests/test_catalog.py b/Tools/Catalog-Builder/catalog_builder/tests/test_catalog.py
@@ -51,8 +51,7 @@ def mock_gh_api(mock_markdown_doc, mock_catalog_meta, monkeypatch):
     """
 
     def _gh_api(org, repo, branch, filename):
-        url = f"https://api.github.com/repos/{org}/{
-            repo}/contents/{filename}?ref={branch}"
+        url = f"https://api.github.com/repos/{org}/{repo}/contents/{filename}?ref={branch}"
         response = requests.get(url)
         return response.text
 

diff --git a/Tools/Catalog-Builder/catalog_builder/utils.py b/Tools/Catalog-Builder/catalog_builder/utils.py
@@ -127,8 +127,7 @@ def _get_from_github_api(org, repo, branch, filename):
             "For more information, check out the catalog configuration "
             "docs: Tools/Catalog-Builder/README.md"
         )
-    url = f"https://api.github.com/repos/{org}/{
-        repo}/contents/{filename}?ref={branch}"
+    url = f"https://api.github.com/repos/{org}/{repo}/contents/{filename}?ref={branch}"
     response = requests.request('GET', url, headers=HEADER)
     print(f"GET: {url} {response.status_code}")
     if response.status_code == 403:

diff --git a/Tools/Page-Builder/make_pages.sh b/Tools/Page-Builder/make_pages.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-py ./page_builder.py ../../Community/contribute.md ../../Community/contribute.html
-py ./page_builder.py ../../Community/council.md ../../Community/council.html
-py ./page_builder.py ../../Community/roadmap.md ../../Community/roadmap.html
-py ./page_builder.py ../../Community/initiatives.md ../../Community/initiatives.html
-py ./page_builder.py ../../Catalog/library_criteria.md ../../Catalog/library_criteria.html
+python ./page_builder.py ../../Community/contribute.md ../../Community/contribute.html
+python ./page_builder.py ../../Community/council.md ../../Community/council.html
+python ./page_builder.py ../../Community/roadmap.md ../../Community/roadmap.html
+python ./page_builder.py ../../Community/initiatives.md ../../Community/initiatives.html
+python ./page_builder.py ../../Catalog/library_criteria.md ../../Catalog/library_criteria.html
diff --git a/environment.yml b/environment.yml
@@ -5,4 +5,5 @@ dependencies:
   - bs4
   - jinja2
   - requests
+  - requests_mock
   - pandoc
diff --git a/users.json b/users.json
@@ -6,7 +6,7 @@
       "link": "https://www.cbo.gov/"
     },
     {
-      "name": "Office of Tax Analysis, Treasury",
+      "name": "Office of Tax Analysis, U.S. Treasury",
       "image": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/cb/Seal_of_the_United_States_Department_of_the_Treasury.svg/600px-Seal_of_the_United_States_Department_of_the_Treasury.svg.png",
       "link": "https://home.treasury.gov/policy-issues/tax-policy/office-of-tax-analysis"
     },
@@ -31,12 +31,12 @@
       "link": "https://www.congress.gov/"
     },
     {
-      "name": "Senate Finance, United States Congress",
+      "name": "Senate Finance Committee, United States Congress",
       "image": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f0/Seal_of_the_United_States_Senate.svg/138px-Seal_of_the_United_States_Senate.svg.png",
       "link": "https://www.finance.senate.gov/"
     },
     {
-      "name": "Ways and Means, United States Congress",
+      "name": "Ways and Means Committee, United States Congress",
       "image": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f0/Ways_and_Means_%28118th_Congress%29.svg/250px-Ways_and_Means_%28118th_Congress%29.svg.png",
       "link": "https://waysandmeans.house.gov/"
     }
@@ -73,7 +73,7 @@
       "link": "https://www.thecgo.org/"
     },
     {
-      "name": "Committee for Responsible Federal Budget",
+      "name": "Committee for a Responsible Federal Budget",
       "image": "https://upload.wikimedia.org/wikipedia/en/2/21/Committee_Responsible_Federal_Budget_Logo.jpg",
       "link": "https://www.crfb.org/"
     },
@@ -130,7 +130,7 @@
       "link": "https://www.wisconsin.edu/"
     },
     {
-      "name": "University of Virgninia",
+      "name": "University of Virginia",
       "image": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/University_of_Virginia_Rotunda_logo.svg/800px-University_of_Virginia_Rotunda_logo.svg.png",
       "link": "https://www.virginia.edu/"
     },
@@ -194,7 +194,7 @@
       "link": "https://www.un.org/en/"
     },
     {
-      "name": "Eurpoean Commission",
+      "name": "European Commission",
       "image": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/European_Commission.svg/1280px-European_Commission.svg.png",
       "link": "https://commission.europa.eu/index_en"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,5 @@ dependencies: @@
       - bs4
       - jinja2
       - requests
+      - requests_mock
       - pandoc