Skip to content

Commit f859ab7

Browse files
Merge pull request #25 from pythoninthegrass/dependabot/pip/pytz-2022.5
Bump pytz from 2022.2.1 to 2022.5
2 parents 9b7c1a2 + 6680d9c commit f859ab7

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

.github/workflows/auto_merge.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#approve-a-pull-request
22

33
name: auto_merge
4-
on: [pull_request, workflow_dispatch] # pull_request, push, workflow_dispatch
4+
on: # pull_request, push, workflow_dispatch
5+
pull_request:
6+
workflow_dispatch:
7+
push:
8+
release:
9+
types: [published]
510

611
permissions:
712
pull-requests: write
@@ -19,9 +24,19 @@ jobs:
1924
- name: Approve a PR
2025
run: gh pr review --approve "$PR_URL"
2126
env:
22-
PR_URL: ${{github.event.pull_request.html_url}}
23-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
27+
PR_URL: ${{ github.event.pull_request.html_url }}
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2429
- name: Merge a PR
2530
run: gh pr merge "$PR_URL" --auto --squash
2631
env:
27-
PR_URL: ${{github.event.pull_request.html_url}}
32+
PR_URL: ${{ github.event.pull_request.html_url }}
33+
auto-rebase:
34+
name: rebase dependabot PRs
35+
runs-on: ubuntu-latest
36+
if: github.ref == 'refs/heads/main' || github.event == 'release'
37+
timeout-minutes: 5
38+
steps:
39+
- name: rebase
40+
uses: "bbeesley/gha-auto-dependabot-rebase@main"
41+
env:
42+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jupyter/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pycparser==2.21 ; implementation_name == "pypy" and python_full_version == "3.10
2929
pygments==2.13.0 ; python_full_version == "3.10.7"
3030
pyparsing==3.0.9 ; python_full_version == "3.10.7"
3131
python-dateutil==2.8.2 ; python_full_version == "3.10.7"
32-
pytz==2022.2.1 ; python_full_version == "3.10.7"
32+
pytz==2022.5 ; python_full_version == "3.10.7"
3333
pywin32==304 ; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_full_version == "3.10.7"
3434
pyzmq==24.0.1 ; python_full_version == "3.10.7"
3535
six==1.16.0 ; python_full_version == "3.10.7"

0 commit comments

Comments
 (0)