Maintainance PR (#367)

* Bump sphinx-design from 0.3.0 to 0.4.1 Bumps [sphinx-design](https://github.com/executablebooks/sphinx-design) from 0.3.0 to 0.4.1. - [Release notes](https://github.com/executablebooks/sphinx-design/releases) - [Changelog](https://github.com/executablebooks/sphinx-design/blob/main/CHANGELOG.md) - [Commits](executablebooks/sphinx-design@v0.3.0...v0.4.1) --- updated-dependencies: - dependency-name: sphinx-design dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump EndBug/add-and-commit from 9.1.1 to 9.1.3 Bumps [EndBug/add-and-commit](https://github.com/EndBug/add-and-commit) from 9.1.1 to 9.1.3. - [Release notes](https://github.com/EndBug/add-and-commit/releases) - [Commits](EndBug/add-and-commit@v9.1.1...v9.1.3) --- updated-dependencies: - dependency-name: EndBug/add-and-commit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update conf.py * Update conf.py * Update conf.py * Update requirements.txt * Bump ablog from 0.11.2 to 0.11.4.post1 Bumps [ablog](https://github.com/abakan-zz/ablog) from 0.11.2 to 0.11.4.post1. - [Commits](https://github.com/abakan-zz/ablog/commits) --- updated-dependencies: - dependency-name: ablog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix: the redirects * Update build.py * Update build.yml * fix: the redirects * Bump JamesIves/github-pages-deploy-action from 4.4.1 to 4.4.2 Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.4.1 to 4.4.2. - [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.4.1...v4.4.2) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump pylint from 2.17.2 to 2.17.4 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.17.2 to 2.17.4. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Commits](pylint-dev/pylint@v2.17.2...v2.17.4) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump sphinx-copybutton from 0.5.1 to 0.5.2 Bumps [sphinx-copybutton](https://github.com/executablebooks/sphinx-copybutton) from 0.5.1 to 0.5.2. - [Release notes](https://github.com/executablebooks/sphinx-copybutton/releases) - [Changelog](https://github.com/executablebooks/sphinx-copybutton/blob/master/CHANGELOG.md) - [Commits](executablebooks/sphinx-copybutton@v0.5.1...v0.5.2) --- updated-dependencies: - dependency-name: sphinx-copybutton dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump requests from 2.28.2 to 2.31.0 Bumps [requests](https://github.com/psf/requests) from 2.28.2 to 2.31.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.28.2...v2.31.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump pre-commit from 3.2.2 to 3.3.3 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.2.2 to 3.3.3. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](pre-commit/pre-commit@v3.2.2...v3.3.3) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump myst-parser from 1.0.0 to 2.0.0 Bumps [myst-parser](https://github.com/executablebooks/MyST-Parser) from 1.0.0 to 2.0.0. - [Release notes](https://github.com/executablebooks/MyST-Parser/releases) - [Changelog](https://github.com/executablebooks/MyST-Parser/blob/master/CHANGELOG.md) - [Commits](executablebooks/MyST-Parser@v1.0.0...v2.0.0) --- updated-dependencies: - dependency-name: myst-parser dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update requirements.txt * Bump pydata-sphinx-theme from 0.9.0 to 0.13.3 Bumps [pydata-sphinx-theme](https://github.com/pydata/pydata-sphinx-theme) from 0.9.0 to 0.13.3. - [Release notes](https://github.com/pydata/pydata-sphinx-theme/releases) - [Commits](pydata/pydata-sphinx-theme@v0.9.0...v0.13.3) --- updated-dependencies: - dependency-name: pydata-sphinx-theme dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update requirements.txt * Bump JamesIves/github-pages-deploy-action from 4.4.2 to 4.4.3 Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.4.2 to 4.4.3. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.4.2...v4.4.3) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump pylint from 2.17.4 to 2.17.5 Bumps [pylint](https://github.com/pylint-dev/pylint) from 2.17.4 to 2.17.5. - [Release notes](https://github.com/pylint-dev/pylint/releases) - [Commits](pylint-dev/pylint@v2.17.4...v2.17.5) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump black from 23.3.0 to 23.7.0 Bumps [black](https://github.com/psf/black) from 23.3.0 to 23.7.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@23.3.0...23.7.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fix: code snippets build time with gfortran * Bump sphinx-sitemap from 2.5.0 to 2.5.1 Bumps [sphinx-sitemap](https://github.com/jdillard/sphinx-sitemap) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/jdillard/sphinx-sitemap/releases) - [Changelog](https://github.com/jdillard/sphinx-sitemap/blob/master/CHANGELOG.rst) - [Commits](jdillard/sphinx-sitemap@v2.5.0...v2.5.1) --- updated-dependencies: - dependency-name: sphinx-sitemap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump pre-commit from 3.3.3 to 3.4.0 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.3.3 to 3.4.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](pre-commit/pre-commit@v3.3.3...v3.4.0) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump black from 23.7.0 to 23.9.1 Bumps [black](https://github.com/psf/black) from 23.7.0 to 23.9.1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@23.7.0...23.9.1) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * refactor: fortran package * Maintainance PR * Maintainance PR * fix * fix * fix: * fix: * fix: * fix: * fix: * fix: * fix: * refactor: fortran package * newsletter * newsletter * newsletter * newsletter * newsletter * newsletter * newsletter * Bump JamesIves/github-pages-deploy-action from 4.4.3 to 4.5.0 Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.4.3 to 4.5.0. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.4.3...v4.5.0) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump actions/setup-python from 4 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Bump pylint from 3.0.2 to 3.0.3 Bumps [pylint](https://github.com/pylint-dev/pylint) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/pylint-dev/pylint/releases) - [Commits](pylint-dev/pylint@v3.0.2...v3.0.3) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Bump pre-commit from 3.5.0 to 3.6.0 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](pre-commit/pre-commit@v3.5.0...v3.6.0) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump black from 23.11.0 to 23.12.0 Bumps [black](https://github.com/psf/black) from 23.11.0 to 23.12.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@23.11.0...23.12.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump black from 23.12.0 to 23.12.1 Bumps [black](https://github.com/psf/black) from 23.12.0 to 23.12.1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@23.12.0...23.12.1) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix: maintainance pr --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sebastian Ehlert <[email protected]>
fortran-lang · Dec 26, 2023 · d466a1d · d466a1d
1 parent 6f780b5
commit d466a1d
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 101 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -60,7 +60,7 @@ jobs:
           BING_TOKEN: ${{ secrets.BING_TOKEN }}
 
       - name: Deploy documentation sphinx
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages

diff --git a/.github/workflows/closePR.yml b/.github/workflows/closePR.yml
@@ -20,6 +20,7 @@ jobs:
           ref: gh-pages
 
       - name: Iterate and Check PRs
+        id: pr_check
         run: |
           pr_folders=($(cd pr && ls -d */))
           closed_pr=()
@@ -34,12 +35,13 @@ jobs:
               echo "Removed folder pr/${pr_folder::-1} for closed PR ${pr_folder::-1}"
             fi
           done
+          echo "${closed_pr[*]}" >> $GITHUB_STATE
       
       - name: Commit and push to gh-pages
         uses: EndBug/[email protected]
         with:
           committer_email: [email protected]
           committer_name: Fortran
-          message: "Sphinx build cleanup pr/${closed_pr[@]}"
+          message: "Sphinx build cleanup pr/${{ steps.pr_check.outputs.closed_pr }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/fortran_packages.yml b/.github/workflows/fortran_packages.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
 
       - name: Install python libraries
         run: pip3 install --user -r requirements.txt
@@ -26,7 +26,7 @@ jobs:
         run: python fortran_package.py
 
       - name: Upload data files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: _data
           path: _data/
diff --git a/.github/workflows/preview_build.yml b/.github/workflows/preview_build.yml
@@ -23,7 +23,7 @@ jobs:
           git checkout pr-${{github.event.issue.number}}
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -44,7 +44,7 @@ jobs:
       - run: touch build/html/.nojekyll
 
       - name: Deploy documentation sphinx
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages

diff --git a/fortran_package.py b/fortran_package.py
@@ -4,7 +4,6 @@
 import json
 import requests
 
-
 root = Path(__file__).parent
 
 with open(root / "data" / "package_index.yml", "r") as f:
@@ -13,73 +12,45 @@
     conf = yaml.safe_load(f)
 
 fortran_index_tags = []
-fortran_index_tags_50 = []
-fortran_index_categories = []
-fortran_index_libraries = []
-fortran_index_data_types = []
-fortran_index_strings = []
-fortran_index_programming = []
-fortran_index_graphics = []
-fortran_index_interfaces = []
-fortran_index_examples = []
-fortran_index_scientific = []
-fortran_index_io = []
-fortran_index_numerical = []
+categories = [
+    "libraries",
+    "data-types",
+    "strings",
+    "programming",
+    "graphics",
+    "interfaces",
+    "examples",
+    "scientific",
+    "io",
+    "numerical",
+]
+fortran_tags = {"fortran_tags": "tags"}
 
 for i in fortran_index:
     try:
-        for j in str(i["tags"]).split():
-            fortran_index_tags.append(j)
-    except KeyError:
+        fortran_index_tags += i["tags"].split()
+    except:
         pass
-    if "libraries" in i["categories"].split():
-        fortran_index_libraries.append(i)
-    if "data-types" in i["categories"].split():
-        fortran_index_data_types.append(i)
-    if "strings" in i["categories"].split():
-        fortran_index_strings.append(i)
-    if "programming" in i["categories"].split():
-        fortran_index_programming.append(i)
-    if "graphics" in i["categories"].split():
-        fortran_index_graphics.append(i)
-    if "interfaces" in i["categories"].split():
-        fortran_index_interfaces.append(i)
-    if "examples" in i["categories"].split():
-        fortran_index_examples.append(i)
-    if "scientific" in i["categories"].split():
-        fortran_index_scientific.append(i)
-    if "io" in i["categories"].split():
-        fortran_index_io.append(i)
-    if "numerical" in i["categories"].split():
-        fortran_index_numerical.append(i)
-
-fortran_tags = {"fortran_tags": "tags"}
-fortran_index_tags = Counter(fortran_index_tags)
-a = sorted(fortran_index_tags.items(), key=lambda x: x[1], reverse=True)
-for i in a:
-    if i[0] == "None":
-        a.remove(i)
-
-for k in range(50):
-    fortran_index_tags_50.append(a[k][0])
 
-for i in fortran_index:
-    for j in i["categories"].split():
-        fortran_index_categories.append(j)
-
-fortran_index_categories = list(set(fortran_index_categories))
-
-fortran_tags["numerical"] = fortran_index_numerical
-fortran_tags["io"] = fortran_index_io
-fortran_tags["scientific"] = fortran_index_scientific
-fortran_tags["examples"] = fortran_index_examples
-fortran_tags["interfaces"] = fortran_index_interfaces
-fortran_tags["graphics"] = fortran_index_graphics
-fortran_tags["programming"] = fortran_index_programming
-fortran_tags["strings"] = fortran_index_strings
-fortran_tags["data_types"] = fortran_index_data_types
-fortran_tags["libraries"] = fortran_index_libraries
-fortran_tags["tags"] = fortran_index_tags_50
+    for j in categories:
+        if j in i["categories"].split():
+            if fortran_tags.get(j, None):
+                fortran_tags[j].append(i)
+            else:
+                fortran_tags[j] = [i]
+
+fortran_index_tags_data = Counter(fortran_index_tags)
+fortran_tags["tags"] = [
+    item[0]
+    for item in sorted(
+        fortran_index_tags_data.items(), key=lambda x: x[1], reverse=True
+    )
+    if item[0] != "None" and item[1] > 0
+][:50]
+
+fortran_index_categories = list(set(fortran_index_tags))
+
+fortran_tags["data_types"] = fortran_tags.pop("data-types")
 conf["reference_books"] = conf["reference-books"]
 conf["reference_courses"] = conf["reference-courses"]
 conf["reference_links"] = conf["reference-links"]
@@ -89,42 +60,31 @@
 with open(root / "_data" / "fortran_learn.json", "w") as f:
     json.dump(conf, f)
 
-fortran_monthly = []
-fortran_commits = []
-fpm_monthly = []
-fpm_commits = []
-stdlib_monthly = []
-stdlib_commits = []
-
-contributor = []
-contributor_repo = {
-    "repo": "fortran-lang",
-}
 
-
-def contributors(repo):
-    info = requests.get(
-        f"https://api.github.com/repos/{repo}/contributors").text
-    d = json.loads(info)
-    if "message" in d:
-        raise Exception(d["message"])
-    for i in d:
-        contributor.append(i["login"])
-
-
-graphs = [
+repos = [
     "fortran-lang/fortran-lang.org",
     "fortran-lang/webpage",
     "fortran-lang/fpm",
     "fortran-lang/stdlib",
     "j3-fortran/fortran_proposals",
 ]
-for i in graphs:
-    contributors(i)
 
-contributor = list(set(contributor))
-contributor.sort()
-contributor_repo["contributor"] = contributor
+
+def get_contributors(repo):
+    info = requests.get(f"https://api.github.com/repos/{repo}/contributors").json()
+    if "message" in info:
+        raise Exception(info["message"])
+    return [contributor["login"] for contributor in info]
+
+
+contributors = set()
+for repo in repos:
+    contributors.update(get_contributors(repo))
+
+contributors = list(contributors)
+contributors.sort()
+
+contributor_repo = {"repo": "fortran-lang", "contributor": contributors}
 
 with open(root / "_data" / "contributor.json", "w") as f:
     json.dump(contributor_repo, f)
diff --git a/requirements.txt b/requirements.txt
@@ -7,8 +7,8 @@ sphinx_copybutton==0.5.2
 sphinx-jinja==2.0.2  
 jinja2==3.1.2  
 requests==2.31.0 
-black==23.11.0 
-pylint==3.0.2
-pre-commit==3.5.0
+black==23.12.1 
+pylint==3.0.3
+pre-commit==3.6.0
 sphinx-sitemap==2.5.1
 sphinx-favicon==1.0.1