Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,10 @@ To run the tests locally, **you will need the following dependencies**:

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

With all three installed, the remaining dependencies can be installed using
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ on:
- 'archive/k/kotlin/*.kt'
- 'archive/p/python/*.py'
- 'archive/r/ruby/*.rb'
- 'archive/s/swift/*.swift'
- 'archive/t/typescript/*.ts'
pull_request:
branches:
Expand All @@ -47,7 +46,6 @@ on:
- 'archive/k/kotlin/*.kt'
- 'archive/p/python/*.py'
- 'archive/r/ruby/*.rb'
- 'archive/s/swift/*.swift'
- 'archive/t/typescript/*.ts'
schedule:
# Run every Thursday at 4:53 UTC (randomly chosen)
Expand Down Expand Up @@ -132,7 +130,7 @@ jobs:
- name: Run Poetry Image
uses: abatilo/actions-poetry@v3
with:
poetry-version: "1.8.5"
poetry-version: "2.1.1"

- name: Install Dependencies
run: poetry install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: true
matrix:
python-version: ["3.11"]
poetry-version: ["1.8.5"]
poetry-version: ["2.1.1"]
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
fail-fast: true
matrix:
python-version: ["3.11"]
poetry-version: ["1.8.5"]
poetry-version: ["2.1.1"]
os: [ubuntu-latest]
num_batches: [6]

Expand Down
694 changes: 377 additions & 317 deletions poetry.lock

Large diffs are not rendered by default.

39 changes: 21 additions & 18 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
[tool.poetry]
[project]
name = "sample-programs"
version = "2023.05.04"
version = "2025.03.10"
description = "Sample Programs in Every Programming Language"
readme = "README.md"
readme = ".github/README.md"
requires-python = ">=3.9,<4.0"
license = "MIT"
package-mode = false

dependencies = [
"ronbun (>=0.8.1,<0.9)",
"glotter2 (>=0.10,<0.11)"
]

# Initiator of the collection
authors = [
"Jeremy Grifski <[email protected]>"
{name = "Jeremy Grifski", email = "[email protected]>"}
]

# Major contributors along the way
maintainers = [
"auroq",
"rzuckerm",
"stuin",
"noah11012",
"heksterb",
"msj2",
"chrboe",
"2Clutch",
"alope107"
{name = "auroq"},
{name = "rzuckerm"},
{name = "stuin"},
{name = "noah11012"},
{name = "heksterb"},
{name = "msj2"},
{name = "chrboe"},
{name = "2Clutch"},
{name = "alope107"}
]

[tool.poetry.dependencies]
python = "^3.8"
ronbun = "^0.8.1"
glotter2 = "^0.9.0"
[tool.poetry]
package-mode = false

[tool.pytest.ini_options]
console_output_style = "count"
1 change: 0 additions & 1 deletion scripts/build_codeql_language.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"c#": "c-sharp",
"java": "java",
"kotlin": "kotlin",
"swift": "swift",
}


Expand Down
1 change: 0 additions & 1 deletion scripts/get_codeql_languages.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class LanguageInfo:
"archive/k/kotlin/*.kt": LanguageInfo(language="kotlin", build_mode="manual"),
"archive/p/python/*.py": LanguageInfo(language="python"),
"archive/r/ruby/*.rb": LanguageInfo(language="ruby"),
"archive/s/swift/*.swift": LanguageInfo(language="swift", build_mode="manual", os=MACOS),
"archive/t/typescript/*.ts": LanguageInfo(language="typescript"),
}
ALL_CODEQL_LANGUAGES_FILES = {
Expand Down