Add Python 3.11 to test matrix

Merge pull request #70 from themotleyfool/fix-github-action-display
Fix python version display in github actions
2023-01-22 16:53:04 -05:00 · 2023-01-22 16:51:53 -05:00 · 2023-01-22 16:48:05 -05:00 · 2023-01-17 19:33:35 -05:00 · 2022-12-14 17:06:17 -06:00 · 2022-12-14 17:05:51 -06:00
2 changed files with 12 additions and 8 deletions
@@ -5,11 +5,11 @@ on: [ push, pull_request ]
 jobs:
  test:

-    name: Test on Python ${{ matrix.py_version }}
+    name: Test on Python ${{ matrix.python-version }}
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: [ "3.7", "3.8", "3.9", "3.10" ]
+        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]

    steps:
      - uses: actions/checkout@v1
@@ -1561,7 +1561,8 @@ class DiscourseClient(object):
                if 400 <= response.status_code < 500:
                    if 429 == response.status_code:
                        # This codepath relies on wait_seconds from Discourse v2.0.0.beta3 / v1.9.3 or higher.
-                        if "application/json" in response.headers.get("Content-Type"):
+                        content_type = response.headers.get("Content-Type")
+                        if content_type is not None and "application/json" in content_type:
                            ret = response.json()
                            wait_delay = (
                                retry_backoff + ret["extras"]["wait_seconds"]
@@ -1571,14 +1572,17 @@ class DiscourseClient(object):
                            ret = response.content
                            wait_delay = retry_backoff + 10

+                        limit_name = response.headers.get(
+                                "Discourse-Rate-Limit-Error-Code", "<unknown>")
+
+                        log.info(
+                                "We have been rate limited (limit: {2}) and will wait {0} seconds ({1} retries left)".format(
+                                wait_delay, retry_count, limit_name
+                            )
+                        )
                        if retry_count > 1:
                            time.sleep(wait_delay)
                        retry_count -= 1
-                        log.info(
-                            "We have been rate limited and waited {0} seconds ({1} retries left)".format(
-                                wait_delay, retry_count
-                            )
-                        )
                        log.debug("API returned {0}".format(ret))
                        continue
                    else:
Author	SHA1	Message	Date
Ben Lopatin	0857a9cfe7	Add Python 3.11 to test matrix	2023-01-22 16:53:04 -05:00
Ben Lopatin	30e2068b4d	Merge pull request #70 from themotleyfool/fix-github-action-display Fix python version display in github actions	2023-01-22 16:51:53 -05:00
Ben Lopatin	227924f098	Merge pull request #68 from inducer/rate-limit-improvements Rate limit improvements	2023-01-22 16:48:05 -05:00
Max Lancaster	201ff3d717	Fix python version display in github actions test.yml uses the wrong python version variable which is causing to not display the title correctly in the github actions interface, see github documentation here: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#using-the-python-starter-workflow	2023-01-17 19:33:35 -05:00
Andreas Kloeckner	393422f964	Rate limiting: print limit name, log before waiting	2022-12-14 17:06:17 -06:00
Andreas Kloeckner	d9e0af7e59	Rate-limited: do not fail if no Content-Type header	2022-12-14 17:05:51 -06:00