Skip to content

{Monitor} Move antlr4-python3-runtime to src/azure-cli/setup.py #12917

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.

Sign up for GitHub

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

Merged
mmyyrroonn merged 2 commits into from
Apr 9, 2020
Merged

{Monitor} Move antlr4-python3-runtime to src/azure-cli/setup.py #12917

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7b5782
fix dependency
Apr 8, 2020
310b4da
drop python2 support
mmyyrroonn Apr 9, 2020
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
Next Next commit
fix dependency
  • Loading branch information
Myron committed Apr 8, 2020
commit a7b5782e539541973060a5d9e8151126459e95f9
2 changes: 0 additions & 2 deletions src/azure-cli-core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@
":python_version<'3.4'": ['enum34'],
":python_version<'2.7.9'": ['pyopenssl', 'ndg-httpsclient', 'pyasn1'],
':python_version<"3.0"': ['futures'],
":python_version<'3.0'": ['antlr4-python2-runtime'],
":python_version>='3.0'": ['antlr4-python3-runtime'],
"test": TESTS_REQUIRE,
},
tests_require=TESTS_REQUIRE,
Expand Down
4 changes: 4 additions & 0 deletions src/azure-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
]

DEPENDENCIES = [
'antlr4-python3-runtime~=4.7.2',
Copy link
Contributor Author

@mmyyrroonn mmyyrroonn Apr 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure. Is it the correct way to fix this issue? @fengzhou-msft Since python2 and python3 share the same namespace.

Copy link
Member

@fengzhou-msft fengzhou-msft Apr 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not support python 2 now, this is fine.

Copy link
Member

@fengzhou-msft fengzhou-msft Apr 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have any code that may have different handlings for py2 and py3 with this antlr4 dependency? You may also clean that code if yes.

Copy link
Contributor Author

@mmyyrroonn mmyyrroonn Apr 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no. They share same signature to us.

'azure-batch~=9.0',
'azure-cli-command_modules-nspkg~=2.0',
'azure-cli-core=={}.*'.format(VERSION),
Expand Down Expand Up @@ -169,6 +170,9 @@
],
packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
install_requires=DEPENDENCIES,
extras_require={
":python_version<'3.0'": ['antlr4-python2-runtime']
Copy link
Member

@jiasli jiasli Apr 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have dropped Python 2. We can safely remove this dependency. #11363

Copy link
Contributor Author

@mmyyrroonn mmyyrroonn Apr 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe something like ":python_version<'3.0'": ['antlr4-python2-runtime'==4.7.2]?

Copy link
Member

@jiasli jiasli Apr 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just delete this line.

},
package_data={
'azure.cli.core': ['auth_landing_pages/*.html'],
'azure.cli.command_modules.acr': ['*.json'],
Expand Down