Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Antlr to 4.11 and vendor the runtime #1114

Merged
merged 51 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
ab63619
replace antlr binary
Aug 9, 2023
3bc6bd5
Update references to antler 4.9 to 4.11
Aug 9, 2023
bc4949b
add news fragment
Jasha10 Aug 19, 2023
ec1dd16
Add helper script for vendoring antlr4
jlopezpena Oct 10, 2023
635e01a
missing file
jlopezpena Oct 10, 2023
1040c72
cleanups
jlopezpena Oct 10, 2023
09ce997
Fix imports in omegaconf and remove antlr dep from base.txt
jlopezpena Oct 10, 2023
62c2b13
Fix imports on generated parsers
jlopezpena Oct 10, 2023
9b9272d
unused f-string
jlopezpena Oct 10, 2023
b234191
typo in comment
jlopezpena Oct 10, 2023
7267356
Mention vendoring in the news item
jlopezpena Oct 10, 2023
024cef1
Add vendored files (just to test CI, revert if we decide to pull at b…
jlopezpena Oct 10, 2023
5531cf0
Add readme to vendor folder
jlopezpena Oct 10, 2023
e85bade
ignore mypy errors in vendored code
jlopezpena Oct 10, 2023
5708f94
Add vendored package to setup.py
jlopezpena Oct 10, 2023
8b18374
ignore vendored in coverage, flake, and isort
jlopezpena Oct 10, 2023
a155f80
make import relative
jlopezpena Oct 10, 2023
b4a939f
More relative imports
jlopezpena Oct 10, 2023
7d39143
refactor
jlopezpena Oct 10, 2023
e318d35
make all vendored imports relative
jlopezpena Oct 10, 2023
ade65b7
Revert "make all vendored imports relative"
jlopezpena Oct 10, 2023
6db19b9
make all vendored imports relative
jlopezpena Oct 11, 2023
cfa2d55
cleaner relative imports
jlopezpena Oct 11, 2023
981cfe1
more fixes to relative paths
jlopezpena Oct 11, 2023
709fd21
docbuild
jlopezpena Oct 11, 2023
43e5b8f
typing for mypy
jlopezpena Oct 11, 2023
f33f5e4
missing import
jlopezpena Oct 11, 2023
9ad1a6e
typing for helper function
jlopezpena Oct 11, 2023
eb2ac3e
unused imports
jlopezpena Oct 11, 2023
4c2cafe
add path to tutorial notebook for CI
jlopezpena Oct 11, 2023
6ed9fa7
mypy errors
jlopezpena Oct 11, 2023
bd81d49
Ignore typing.py from coverage
jlopezpena Oct 11, 2023
8046828
isort fixes
jlopezpena Oct 11, 2023
17b8ba4
isort issues in helper scripts
jlopezpena Oct 11, 2023
8b4da00
isort issues on tests
jlopezpena Oct 11, 2023
2bd8d25
ignore vendored in black checks
jlopezpena Oct 11, 2023
6f49e20
black fix
jlopezpena Oct 11, 2023
c59b725
flake8 fixes
jlopezpena Oct 11, 2023
42008af
ignore import location in docs conf
jlopezpena Oct 11, 2023
382fef3
trailing comma
jlopezpena Oct 11, 2023
5302c30
Add typing extensions dep for python < 3.10
jlopezpena Oct 11, 2023
39cef95
Merge remote-tracking branch 'origin/master' into antlr411
jlopezpena Oct 11, 2023
3f81322
Add comment about type alias
jlopezpena Nov 21, 2023
ebb8ae2
Recursively add vendored packages to install
jlopezpena Nov 22, 2023
2d049a2
reformat
jlopezpena Nov 22, 2023
d21a1df
we don't want __pycache__ listed as a package...
jlopezpena Nov 22, 2023
ce28524
linting
jlopezpena Nov 22, 2023
e46f93a
typing tripping python 3.8
jlopezpena Nov 22, 2023
919dd9e
reformatting again
jlopezpena Nov 22, 2023
9dae39e
Dont break things on Windows
jlopezpena Nov 29, 2023
1691e64
bump dev version -> 2.4.0.dev2
Jasha10 Feb 15, 2024
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
Binary file added build_helpers/bin/antlr-4.11.1-complete.jar
Binary file not shown.
Binary file removed build_helpers/bin/antlr-4.9.3-complete.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion build_helpers/build_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def run(self) -> None:
command = [
"java",
"-jar",
str(build_dir / "bin" / "antlr-4.9.3-complete.jar"),
str(build_dir / "bin" / "antlr-4.11.1-complete.jar"),
"-Dlanguage=Python3",
"-o",
str(project_root / "omegaconf" / "grammar" / "gen"),
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
antlr4-python3-runtime==4.9.*
antlr4-python3-runtime==4.11.*
PyYAML>=5.1.0
# Use dataclasses backport for Python 3.6.
dataclasses;python_version=='3.6'