osgithub 0.6.0__tar.gz → 0.8.0__tar.gz

{osgithub-0.6.0 → osgithub-0.8.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: osgithub
-Version: 0.6.0
+Version: 0.8.0
 Home-page: https://github.com/opensafely-core/osgithub
 Author: OpenSAFELY
 Author-email: tech@opensafely.org
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: requests-cache

{osgithub-0.6.0 → osgithub-0.8.0}/README.md

@@ -16,6 +16,7 @@ Set the following environment variables:
 
 ```py
 from github_api_cache import GithubClient
+
 # Use the default token, if one is set in the environment.
 client = GithubClient()
 ```
@@ -129,9 +130,9 @@ Set expiry on specific url patterns (falls back to `expire_after` if no match fo
 
 ```py
 urls_expire_after = {
-    '*/pulls': 60,  # expire requests to get pull requests after 60 secs
-    '*/branches': 60 * 5, # expire requests to get branches after 5 mins
-    '*/commits': 30,  # expire requests to get commits after 30 secs
+    "*/pulls": 60,  # expire requests to get pull requests after 60 secs
+    "*/branches": 60 * 5,  # expire requests to get branches after 5 mins
+    "*/commits": 30,  # expire requests to get commits after 30 secs
 }
 client = GithubClient(urls_expire_after=urls_expire_after)
 ```

{osgithub-0.6.0 → osgithub-0.8.0}/osgithub/github.py

@@ -13,7 +13,7 @@ Optionally uses requests caching to avoid repeated calls to the API.
 
 import json
 from base64 import b64decode
-from datetime import datetime, timezone
+from datetime import datetime
 from os import environ
 from pathlib import Path
 
@@ -367,11 +367,11 @@ class GithubRepo:
         """
         commits = self.get_commits_for_file(path, ref, number_of_commits=1)
         last_commit_date = commits[0]["commit"]["committer"]["date"]
-        dt = datetime.strptime(last_commit_date, "%Y-%m-%dT%H:%M:%SZ")
-        # we know GitHub is giving us a UTC timezone because the string ends in
-        # Z, but Python's strptime can't consume that with it's %Z operator so
-        # we're matching it literally and then setting the timezone to UTC.
-        return dt.replace(tzinfo=timezone.utc)
+        # GitHub returns UTC timestamps with a trailing Z; normalize it to an
+        # explicit UTC offset so strptime can create an aware datetime with %z.
+        return datetime.strptime(
+            last_commit_date.replace("Z", "+00:00"), "%Y-%m-%dT%H:%M:%S%z"
+        )
 
     def get_readme(self, tag="main"):
         """

{osgithub-0.6.0 → osgithub-0.8.0}/osgithub.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: osgithub
-Version: 0.6.0
+Version: 0.8.0
 Home-page: https://github.com/opensafely-core/osgithub
 Author: OpenSAFELY
 Author-email: tech@opensafely.org
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: requests-cache

{osgithub-0.6.0 → osgithub-0.8.0}/pyproject.toml

@@ -17,6 +17,7 @@ markers = [
 ]
 
 [tool.ruff]
+target-version = "py310"
 line-length = 88
 exclude = [
   ".direnv",

{osgithub-0.6.0 → osgithub-0.8.0}/setup.py

@@ -13,7 +13,7 @@ setup(
     url="https://github.com/opensafely-core/osgithub",
     author="OpenSAFELY",
     author_email="tech@opensafely.org",
-    python_requires=">=3.9",
+    python_requires=">=3.10",
     install_requires=["requests", "requests-cache", "furl"],
     entry_points={},
     include_package_data=True,

{osgithub-0.6.0 → osgithub-0.8.0}/tests/test_github.py

@@ -121,7 +121,7 @@ def test_github_repo_get_pull_requests(httpretty, state):
     register_uri(
         httpretty,
         "repos/test/foo/pulls",
-        queryparams=dict(state=state, page=1, per_page=30),
+        queryparams={"state": state, "page": 1, "per_page": 30},
         body=pull_requests[state],
     )
     pulls = repo.get_pull_requests(state)
@@ -146,7 +146,7 @@ def test_github_repo_get_open_pull_request_count(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/pulls",
-        queryparams=dict(state="open", page=1, per_page=30),
+        queryparams={"state": "open", "page": 1, "per_page": 30},
         body=pull_requests,
     )
     assert repo.open_pull_request_count == 2
@@ -195,7 +195,7 @@ def test_github_repo_get_multipage_pull_request_count(httpretty):
         register_uri(
             httpretty,
             "repos/test/foo/pulls",
-            queryparams=dict(state="open", page=i, per_page=30),
+            queryparams={"state": "open", "page": i, "per_page": 30},
             body=pull_requests,
         )
     last_page_pull_requests = [
@@ -209,7 +209,7 @@ def test_github_repo_get_multipage_pull_request_count(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/pulls",
-        queryparams=dict(state="open", page=3, per_page=30),
+        queryparams={"state": "open", "page": 3, "per_page": 30},
         body=last_page_pull_requests,
     )
 
@@ -242,7 +242,7 @@ def test_github_repo_get_contents_single_file(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/contents/test-folder/test-file.html",
-        queryparams=dict(ref="main"),
+        queryparams={"ref": "main"},
         body=reponse_json,
     )
 
@@ -250,7 +250,11 @@ def test_github_repo_get_contents_single_file(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/commits",
-        queryparams=dict(sha="main", path="test-folder/test-file.html", per_page=1),
+        queryparams={
+            "sha": "main",
+            "path": "test-folder/test-file.html",
+            "per_page": 1,
+        },
         body=commits_response,
     )
 
@@ -280,7 +284,11 @@ def test_github_repo_get_last_updated(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/commits",
-        queryparams=dict(sha="main", path="test-folder/test-file.html", per_page=1),
+        queryparams={
+            "sha": "main",
+            "path": "test-folder/test-file.html",
+            "per_page": 1,
+        },
         body=commits_response,
     )
 
@@ -327,7 +335,7 @@ def test_github_repo_get_contents_exceptions(
     register_uri(
         httpretty,
         "repos/test/foo/contents/test-folder/test-file.html",
-        queryparams=dict(ref="main"),
+        queryparams={"ref": "main"},
         status=status_code,
         body=body,
     )
@@ -368,7 +376,7 @@ def test_github_repo_matching_file_from_parent_contents(
     register_uri(
         httpretty,
         "repos/test/foo/contents/test-folder",
-        queryparams=dict(ref="main"),
+        queryparams={"ref": "main"},
         body=response_json,
     )
 
@@ -401,7 +409,7 @@ def test_github_repo_get_contents_folder(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/contents/test-folder",
-        queryparams=dict(ref="main"),
+        queryparams={"ref": "main"},
         body=response_json,
     )
     contents = repo.get_contents("test-folder", ref="main")
@@ -443,7 +451,7 @@ def test_github_repo_get_contents_from_git_blob(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/contents/test-folder",
-        queryparams=dict(ref="main"),
+        queryparams={"ref": "main"},
         body=response_json,
     )
 
@@ -463,7 +471,11 @@ def test_github_repo_get_contents_from_git_blob(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/commits",
-        queryparams=dict(sha="main", path="test-folder/test-file.html", per_page=1),
+        queryparams={
+            "sha": "main",
+            "path": "test-folder/test-file.html",
+            "per_page": 1,
+        },
         body=commits_response,
     )
 
@@ -499,7 +511,7 @@ def test_github_repo_get_contents_too_large_file(httpretty):
         httpretty,
         "repos/test/foo/contents/test-folder/test-file.html",
         status=200,
-        queryparams=dict(ref="main"),
+        queryparams={"ref": "main"},
         body={
             "name": "test-file.html",
             "path": "test-folder/test-file.html",
@@ -515,7 +527,7 @@ def test_github_repo_get_contents_too_large_file(httpretty):
         httpretty,
         "repos/test/foo/contents/test-folder",
         status=200,
-        queryparams=dict(ref="main"),
+        queryparams={"ref": "main"},
         body=[
             {
                 "name": "test-file.html",
@@ -547,7 +559,11 @@ def test_github_repo_get_contents_too_large_file(httpretty):
     register_uri(
         httpretty,
         "repos/test/foo/commits",
-        queryparams=dict(sha="main", path="test-folder/test-file.html", per_page=1),
+        queryparams={
+            "sha": "main",
+            "path": "test-folder/test-file.html",
+            "per_page": 1,
+        },
         body=commits_response,
     )