Skip to content

Commit e8a5a8e

Browse files
Merge remote-tracking branch 'upstream/main'
- support for Python 3.12
2 parents 6c14cc7 + 9a8665b commit e8a5a8e

File tree

63 files changed

+812
-374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+812
-374
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1+
# Default to requesting pull request reviews from the Heroku Languages team.
12
* @heroku/languages
3+
4+
# However, request review from the language owner instead for files that are updated
5+
# by Dependabot or release automation, to reduce team review request noise.
6+
CHANGELOG.md @edmorley
7+
Gemfile.lock @edmorley
8+
/requirements/ @edmorley

.github/dependabot.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ updates:
88
- "dependencies"
99
- "ruby"
1010
- "skip changelog"
11+
groups:
12+
ruby-dependencies:
13+
update-types:
14+
- "minor"
15+
- "patch"
1116
- package-ecosystem: "github-actions"
1217
directory: "/"
1318
schedule:
@@ -17,7 +22,7 @@ updates:
1722
- "github actions"
1823
- "skip changelog"
1924
- package-ecosystem: "pip"
20-
directory: "/requirements"
25+
directory: "/"
2126
schedule:
2227
interval: "monthly"
2328
labels:

.github/workflows/build_python_runtime.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
STACK_VERSION: "20"
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
- name: Build Docker image
3737
run: docker build --pull --tag buildenv --build-arg=STACK_VERSION builds/
3838
- name: Build and package Python runtime
@@ -49,7 +49,7 @@ jobs:
4949
STACK_VERSION: "22"
5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353
- name: Build Docker image
5454
run: docker build --pull --tag buildenv --build-arg=STACK_VERSION builds/
5555
- name: Build and package Python runtime

.github/workflows/check_changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: (!contains(github.event.pull_request.labels.*.name, 'skip changelog'))
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
- name: Check that CHANGELOG is touched
1818
run: |
1919
git fetch origin ${{ github.base_ref }} --depth 1 && \

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: Install Ruby and dependencies
2020
uses: ruby/setup-ruby@v1
2121
with:
@@ -42,7 +42,7 @@ jobs:
4242
PARALLEL_SPLIT_TEST_PROCESSES: 60
4343
steps:
4444
- name: Checkout
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646
- name: Install Ruby and dependencies
4747
uses: ruby/setup-ruby@v1
4848
with:

.github/workflows/hatchet_app_cleaner.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Hatchet app cleaner
1+
name: Hatchet App Cleaner
22

33
on:
44
schedule:
@@ -19,7 +19,7 @@ jobs:
1919
HEROKU_DISABLE_AUTOUPDATE: 1
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
- name: Install Ruby and dependencies
2424
uses: ruby/setup-ruby@v1
2525
with:

.github/workflows/prepare-release.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Prepare Release
2+
3+
on:
4+
workflow_dispatch:
5+
6+
# Disable all GITHUB_TOKEN permissions, since the GitHub App token is used instead.
7+
permissions: {}
8+
9+
jobs:
10+
prepare-release:
11+
uses: heroku/languages-github-actions/.github/workflows/_classic-buildpack-prepare-release.yml@latest
12+
secrets: inherit

CHANGELOG.md

Lines changed: 218 additions & 125 deletions
Large diffs are not rendered by default.

Gemfile.lock

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
ast (2.4.2)
5-
diff-lcs (1.5.0)
5+
diff-lcs (1.5.1)
66
erubis (2.7.0)
7-
excon (0.99.0)
7+
excon (0.109.0)
88
heroics (0.1.2)
99
erubis (~> 2.0)
1010
excon
@@ -17,58 +17,58 @@ GEM
1717
rrrretry (~> 1)
1818
thor (~> 1)
1919
threaded (~> 0)
20-
json (2.6.3)
20+
json (2.7.1)
2121
language_server-protocol (3.17.0.3)
2222
moneta (1.0.0)
2323
multi_json (1.15.0)
24-
parallel (1.23.0)
24+
parallel (1.24.0)
2525
parallel_split_test (0.10.0)
2626
parallel (>= 0.5.13)
2727
rspec-core (>= 3.9.0)
28-
parser (3.2.2.3)
28+
parser (3.3.0.5)
2929
ast (~> 2.4.1)
3030
racc
31-
platform-api (3.5.0)
31+
platform-api (3.6.0)
3232
heroics (~> 0.1.1)
3333
moneta (~> 1.0.0)
3434
rate_throttle_client (~> 0.1.0)
35-
racc (1.7.1)
35+
racc (1.7.3)
3636
rainbow (3.1.1)
3737
rate_throttle_client (0.1.2)
38-
regexp_parser (2.8.1)
38+
regexp_parser (2.9.0)
3939
rexml (3.2.6)
4040
rrrretry (1.0.0)
41-
rspec-core (3.12.2)
42-
rspec-support (~> 3.12.0)
43-
rspec-expectations (3.12.3)
41+
rspec-core (3.13.0)
42+
rspec-support (~> 3.13.0)
43+
rspec-expectations (3.13.0)
4444
diff-lcs (>= 1.2.0, < 2.0)
45-
rspec-support (~> 3.12.0)
46-
rspec-support (3.12.0)
47-
rubocop (1.55.1)
45+
rspec-support (~> 3.13.0)
46+
rspec-support (3.13.0)
47+
rubocop (1.60.2)
4848
json (~> 2.3)
4949
language_server-protocol (>= 3.17.0)
5050
parallel (~> 1.10)
51-
parser (>= 3.2.2.3)
51+
parser (>= 3.3.0.2)
5252
rainbow (>= 2.2.2, < 4.0)
5353
regexp_parser (>= 1.8, < 3.0)
5454
rexml (>= 3.2.5, < 4.0)
55-
rubocop-ast (>= 1.28.1, < 2.0)
55+
rubocop-ast (>= 1.30.0, < 2.0)
5656
ruby-progressbar (~> 1.7)
5757
unicode-display_width (>= 2.4.0, < 3.0)
58-
rubocop-ast (1.29.0)
58+
rubocop-ast (1.30.0)
5959
parser (>= 3.2.1.0)
60-
rubocop-capybara (2.18.0)
60+
rubocop-capybara (2.20.0)
6161
rubocop (~> 1.41)
62-
rubocop-factory_bot (2.23.1)
63-
rubocop (~> 1.33)
64-
rubocop-rspec (2.23.0)
65-
rubocop (~> 1.33)
62+
rubocop-factory_bot (2.25.1)
63+
rubocop (~> 1.41)
64+
rubocop-rspec (2.26.1)
65+
rubocop (~> 1.40)
6666
rubocop-capybara (~> 2.17)
6767
rubocop-factory_bot (~> 2.22)
6868
ruby-progressbar (1.13.0)
69-
thor (1.2.1)
69+
thor (1.3.0)
7070
threaded (0.0.4)
71-
unicode-display_width (2.4.2)
71+
unicode-display_width (2.5.0)
7272
webrick (1.8.1)
7373

7474
PLATFORMS
@@ -86,4 +86,4 @@ RUBY VERSION
8686
ruby 3.2.1p31
8787

8888
BUNDLED WITH
89-
2.4.6
89+
2.5.4

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ A `requirements.txt` must be present at the root of your application's repositor
4242

4343
To specify your python version, you also need a `runtime.txt` file - unless you are using the default Python runtime version.
4444

45-
Current default Python Runtime: Python 3.11.4
45+
Current default Python Runtime: Python 3.12.2
4646

4747
Alternatively, you can provide a `setup.py` file, or a `Pipfile`.
4848
Using `pipenv` will generate `runtime.txt` at build time if one of the field `python_version` or `python_full_version` is specified in the `requires` section of your `Pipfile`.
@@ -60,7 +60,8 @@ Specify a Python Runtime
6060

6161
Supported runtime options include:
6262

63-
- `python-3.11.4` on all [supported stacks](https://devcenter.heroku.com/articles/stack#stack-support-details)
64-
- `python-3.10.12` on all [supported stacks](https://devcenter.heroku.com/articles/stack#stack-support-details)
65-
- `python-3.9.17` on all [supported stacks](https://devcenter.heroku.com/articles/stack#stack-support-details)
66-
- `python-3.8.17` on Heroku-20 only
63+
- `python-3.12.2` on all [supported stacks](https://devcenter.heroku.com/articles/stack#stack-support-details)
64+
- `python-3.11.8` on all [supported stacks](https://devcenter.heroku.com/articles/stack#stack-support-details)
65+
- `python-3.10.13` on all [supported stacks](https://devcenter.heroku.com/articles/stack#stack-support-details)
66+
- `python-3.9.18` on all [supported stacks](https://devcenter.heroku.com/articles/stack#stack-support-details)
67+
- `python-3.8.18` on Heroku-20 only

0 commit comments

Comments
 (0)