Python >= 3.10

match case

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.x']
+        python-version: [ '3.10', '3.x']
 
     name: Python ${{ matrix.python-version }}
     steps:

Github/AddOrganizationMembers.py

@@ -29,12 +29,13 @@ def main():
 
     fn = Path(p.fn).expanduser()
 
-    if fn.suffix in {".xls", ".xlsx"}:
-        users = pandas.read_excel(fn, usecols=p.col).squeeze().dropna()
-    elif fn.suffix == ".csv":
-        users = pandas.read_csv(fn, usecols=[p.col]).squeeze().dropna()
-    else:
-        raise ValueError(f"Unknown file type {fn}")
+    match fn.suffix:
+        case ".xls" | ".xlsx":
+            users = pandas.read_excel(fn, usecols=p.col).squeeze().dropna()
+        case ".csv":
+            users = pandas.read_csv(fn, usecols=[p.col]).squeeze().dropna()
+        case _:
+            raise ValueError(f"Unknown file type {fn}")
 
     if not users.ndim == 1:
         raise ValueError("need to have member names. Check that -col argument matches spreadsheet.")

Github/AddRepoMembers.py

@@ -35,12 +35,13 @@ def main():
 
     fn = Path(p.fn).expanduser()
 
-    if fn.suffix in (".xls", ".xlsx"):
-        teams = pandas.read_excel(fn, usecols=p.col).squeeze().dropna()
-    elif fn.suffix == ".csv":
-        teams = pandas.read_csv(fn, usecols=p.col).squeeze().dropna()
-    else:
-        raise ValueError(f"Unknown file type {fn}")
+    match fn.suffix:
+        case ".xls" | ".xlsx":
+            teams = pandas.read_excel(fn, usecols=p.col).squeeze().dropna()
+        case ".csv":
+            teams = pandas.read_csv(fn, usecols=p.col).squeeze().dropna()
+        case _:
+            raise ValueError(f"Unknown file type {fn}")
 
     if not teams.ndim == 2:
         raise ValueError(
@@ -55,12 +56,13 @@ def main():
 
 def adder(teams: pandas.DataFrame, stem: str, private: bool, create: bool, op, sess):
     for _, row in teams.iterrows():
-        if row.size == 3:
-            repo_name = f"{stem}{row[TEAMS]:02.0f}-{row[NAME]}"
-        elif row.size == 2:
-            repo_name = f"{stem}{row[TEAMS]}"
-        else:
-            raise ValueError("I expect team number OR team number and team name")
+        match row.size:
+            case 3:
+                repo_name = f"{stem}{row[TEAMS]:02.0f}-{row[NAME]}"
+            case 2:
+                repo_name = f"{stem}{row[TEAMS]}"
+            case _:
+                raise ValueError("I expect team number OR team number and team name")
 
         login = row[USERNAME].strip()
         try:

Github/AddTeamMembers.py

@@ -11,7 +11,6 @@
 https://developer.github.com/v3/repos/#oauth-scope-requirements
 """
 
-from __future__ import annotations
 import sys
 import logging
 import pandas
@@ -38,12 +37,13 @@ def main():
 
     fn = Path(p.fn).expanduser()
 
-    if fn.suffix in (".xls", ".xlsx"):
-        teams = pandas.read_excel(fn, usecols=p.col).squeeze().dropna()
-    elif fn.suffix == ".csv":
-        teams = pandas.read_csv(fn, usecols=p.col).squeeze().dropna()
-    else:
-        raise ValueError(f"Unknown file type {fn}")
+    match fn.suffix:
+        case ".xls" | ".xlsx":
+            teams = pandas.read_excel(fn, usecols=p.col).squeeze().dropna()
+        case ".csv":
+            teams = pandas.read_csv(fn, usecols=p.col).squeeze().dropna()
+        case _:
+            raise ValueError(f"Unknown file type {fn}")
 
     if not teams.ndim == 2:
         raise ValueError(
@@ -63,12 +63,13 @@ def adder(teams: pandas.DataFrame, stem: str, create: bool, op, sess) -> list[tu
     failed: list[tuple[str, str, str]] = []
 
     for _, row in teams.iterrows():
-        if row.size == 3:
-            team_name = f"{stem}{row[TEAMS]:02.0f}-{row[NAME].strip().replace(' ', '-')}"
-        elif row.size == 2:
-            team_name = f"{stem}{row[TEAMS]}"
-        else:
-            raise ValueError("I expect team number OR team number and team name")
+        match row.size:
+            case 3:
+                team_name = f"{stem}{row[TEAMS]:02.0f}-{row[NAME].strip().replace(' ', '-')}"
+            case 2:
+                team_name = f"{stem}{row[TEAMS]}"
+            case _:
+                raise ValueError("I expect team number OR team number and team name")
 
         login = row[USERNAME].strip()
         try:

Github/PlotCommits.py

@@ -14,7 +14,7 @@
 As a first pass, just shows total LoC changed. Future: plot commit vs. time.
 """
 
-from __future__ import annotations
+
 import argparse
 from pathlib import Path
 

pyproject.toml

@@ -14,7 +14,7 @@ classifiers = ["Development Status :: 5 - Production/Stable",
  "Topic :: Software Development :: Version Control :: Git",
  "Topic :: Utilities"
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dynamic = ["readme","version"]
 dependencies = ["pygithub >= 1.53", "pandas"]
 

src/gitbulk/__init__.py

@@ -5,7 +5,7 @@
 The "classic" Oauth does work for organizations.
 """
 
-from __future__ import annotations
+
 from pathlib import Path
 from datetime import datetime
 import logging

src/gitbulk/duplicator.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 from time import sleep
 from pathlib import Path
 import subprocess

src/gitbulk/get.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 import re
 
 import github

src/gitbulk/repo_stats.py

@@ -2,7 +2,7 @@
 How many total GitHub stars do you have?
 """
 
-from __future__ import annotations
+
 from time import sleep
 from pathlib import Path
 import github