Skip to content

Commit 6819df5

Browse files
authored
Upgraded Poetry to 2.1.1 (#4539)
* Changed format of poetry file to match 2.0 format * Updated minimum required version * Updated workflow versions * Removed swift from the code ql script * Removed swift from the CodeQL workflow * Updated glotter2 version to 0.10.1 * Updated version requirements in contributing document * Update .github/CONTRIBUTING.md
1 parent 507dce8 commit 6819df5

File tree

8 files changed

+403
-344
lines changed

8 files changed

+403
-344
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,10 @@ To run the tests locally, **you will need the following dependencies**:
303303

304304
- **Docker**: as there are so many languages in this project, we use docker to
305305
automatically generate consistent, stable build/test environments.
306-
- **Python 3.8+**: our build system is constructed with Python given that
306+
- **Python 3.9+**: our build system is constructed with Python given that
307307
testing is built with glotter, a Python testing library that leverages docker.
308308
- **Poetry**: our build system is managed and versioned using Poetry. Make sure
309-
to use version **1.8.0** or later. If you are using an older version, please
309+
to use version **2.1.1** or later. If you are using an older version, please
310310
update to the latest.
311311

312312
With all three installed, the remaining dependencies can be installed using

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ on:
2828
- 'archive/k/kotlin/*.kt'
2929
- 'archive/p/python/*.py'
3030
- 'archive/r/ruby/*.rb'
31-
- 'archive/s/swift/*.swift'
3231
- 'archive/t/typescript/*.ts'
3332
pull_request:
3433
branches:
@@ -47,7 +46,6 @@ on:
4746
- 'archive/k/kotlin/*.kt'
4847
- 'archive/p/python/*.py'
4948
- 'archive/r/ruby/*.rb'
50-
- 'archive/s/swift/*.swift'
5149
- 'archive/t/typescript/*.ts'
5250
schedule:
5351
# Run every Thursday at 4:53 UTC (randomly chosen)
@@ -132,7 +130,7 @@ jobs:
132130
- name: Run Poetry Image
133131
uses: abatilo/actions-poetry@v3
134132
with:
135-
poetry-version: "1.8.5"
133+
poetry-version: "2.1.1"
136134

137135
- name: Install Dependencies
138136
run: poetry install

.github/workflows/readme.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: true
2222
matrix:
2323
python-version: ["3.11"]
24-
poetry-version: ["1.8.5"]
24+
poetry-version: ["2.1.1"]
2525
os: [ubuntu-latest]
2626

2727
runs-on: ${{ matrix.os }}

.github/workflows/test-suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
fail-fast: true
6969
matrix:
7070
python-version: ["3.11"]
71-
poetry-version: ["1.8.5"]
71+
poetry-version: ["2.1.1"]
7272
os: [ubuntu-latest]
7373
num_batches: [6]
7474

poetry.lock

Lines changed: 377 additions & 317 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
1-
[tool.poetry]
1+
[project]
22
name = "sample-programs"
3-
version = "2023.05.04"
3+
version = "2025.03.10"
44
description = "Sample Programs in Every Programming Language"
5-
readme = "README.md"
5+
readme = ".github/README.md"
6+
requires-python = ">=3.9,<4.0"
67
license = "MIT"
7-
package-mode = false
8+
9+
dependencies = [
10+
"ronbun (>=0.8.1,<0.9.0)",
11+
"glotter2 (>=0.10.1,<0.11.0)"
12+
]
813

914
# Initiator of the collection
1015
authors = [
11-
"Jeremy Grifski <[email protected]>"
16+
{name = "Jeremy Grifski", email = "[email protected]>"}
1217
]
1318

1419
# Major contributors along the way
1520
maintainers = [
16-
"auroq",
17-
"rzuckerm",
18-
"stuin",
19-
"noah11012",
20-
"heksterb",
21-
"msj2",
22-
"chrboe",
23-
"2Clutch",
24-
"alope107"
21+
{name = "auroq"},
22+
{name = "rzuckerm"},
23+
{name = "stuin"},
24+
{name = "noah11012"},
25+
{name = "heksterb"},
26+
{name = "msj2"},
27+
{name = "chrboe"},
28+
{name = "2Clutch"},
29+
{name = "alope107"}
2530
]
2631

27-
[tool.poetry.dependencies]
28-
python = "^3.8"
29-
ronbun = "^0.8.1"
30-
glotter2 = "^0.9.0"
32+
[tool.poetry]
33+
package-mode = false
3134

3235
[tool.pytest.ini_options]
3336
console_output_style = "count"

scripts/build_codeql_language.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"c#": "c-sharp",
1414
"java": "java",
1515
"kotlin": "kotlin",
16-
"swift": "swift",
1716
}
1817

1918

scripts/get_codeql_languages.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class LanguageInfo:
2929
"archive/k/kotlin/*.kt": LanguageInfo(language="kotlin", build_mode="manual"),
3030
"archive/p/python/*.py": LanguageInfo(language="python"),
3131
"archive/r/ruby/*.rb": LanguageInfo(language="ruby"),
32-
"archive/s/swift/*.swift": LanguageInfo(language="swift", build_mode="manual", os=MACOS),
3332
"archive/t/typescript/*.ts": LanguageInfo(language="typescript"),
3433
}
3534
ALL_CODEQL_LANGUAGES_FILES = {

0 commit comments

Comments
 (0)