Skip to content

Commit

Permalink
Fix conditional dependencies in core setup.py. (#7701)
Browse files Browse the repository at this point in the history
  • Loading branch information
tjprescott authored Oct 29, 2018
1 parent 3029992 commit 3faf4cf
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions src/azure-cli-core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,6 @@
'azure-mgmt-resource==2.0.0'
]

if sys.version_info < (3, 4):
DEPENDENCIES.append('enum34')

if sys.version_info < (2, 7, 9):
DEPENDENCIES.append('pyopenssl')
DEPENDENCIES.append('ndg-httpsclient')
DEPENDENCIES.append('pyasn1')

if sys.version_info < (3, 0):
DEPENDENCIES.append('antlr4-python2-runtime')
else:
DEPENDENCIES.append('antlr4-python3-runtime')

with open('README.rst', 'r', encoding='utf-8') as f:
README = f.read()
with open('HISTORY.rst', 'r', encoding='utf-8') as f:
Expand All @@ -113,6 +100,12 @@
'azure.cli.core.profiles',
],
install_requires=DEPENDENCIES,
extras_require={
":python_version<'3.4'": ['enum34'],
":python_version<'2.7.9'": ['pyopenssl', 'ndg-httpsclient', 'pyasn1'],
":python_version<'3.0'": ['antlr4-python2-runtime'],
":python_version>='3.0'": ['antlr4-python3-runtime']
},
package_data={'azure.cli.core': ['auth_landing_pages/*.html']},
cmdclass=cmdclass
)

0 comments on commit 3faf4cf

Please sign in to comment.