diff --git a/.github/workflows/clean-and-update.yml b/.github/workflows/clean-and-update.yml index 533663f8e..85e378f97 100644 --- a/.github/workflows/clean-and-update.yml +++ b/.github/workflows/clean-and-update.yml @@ -10,7 +10,7 @@ jobs: name: clean-and-update runs-on: "ubuntu-latest" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v2 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6c68664fa..74a0ca2f6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: name: tests runs-on: "ubuntu-latest" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v3 with: @@ -69,7 +69,7 @@ jobs: concurrency: group: live-tests steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v3 with: diff --git a/conda-requirements.txt b/conda-requirements.txt index 829d0920f..e5e079dad 100644 --- a/conda-requirements.txt +++ b/conda-requirements.txt @@ -6,7 +6,7 @@ conda-build conda-forge-metadata>=0.4.1 conda-forge-pinning conda-smithy>=3.7.6 # this pin is for bot automerge and maint. team bug fixes -cryptography>=39 +cryptography>=39,<42 python-dateutil flake8 git diff --git a/conda_forge_webservices/tokens.py b/conda_forge_webservices/tokens.py index 8729b35ee..f9f1b2fe2 100644 --- a/conda_forge_webservices/tokens.py +++ b/conda_forge_webservices/tokens.py @@ -163,7 +163,8 @@ def generate_app_token_for_webservices_only(app_id, raw_pem): "https://api.github.com/app/installations", headers={ 'Authorization': 'Bearer %s' % token, - 'Accept': 'application/vnd.github.machine-man-preview+json', + 'Accept': 'application/vnd.github+json', + 'X-GitHub-Api-Version': '2022-11-28', }, ) r.raise_for_status() @@ -173,7 +174,8 @@ def generate_app_token_for_webservices_only(app_id, raw_pem): "%s/access_tokens" % r.json()[0]["id"], headers={ 'Authorization': 'Bearer %s' % token, - 'Accept': 'application/vnd.github.machine-man-preview+json', + 'Accept': 'application/vnd.github+json', + 'X-GitHub-Api-Version': '2022-11-28', }, ) r.raise_for_status()