Skip to content

Commit

Permalink
enable identity for py27 (#22341)
Browse files Browse the repository at this point in the history
* enable identity for py27

* update
  • Loading branch information
xiangyan99 authored Jan 5, 2022
1 parent 3694201 commit 1d2eccb
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 8 deletions.
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-appconfiguration/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
classifiers=[
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down
3 changes: 3 additions & 0 deletions sdk/identity/azure-identity/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
import six
from azure.identity._constants import DEVELOPER_SIGN_ON_CLIENT_ID, EnvironmentVariables

if sys.version_info < (3, 5, 3):
collect_ignore_glob = ["*_async.py"]


RECORD_IMDS = "--record-imds"

Expand Down
3 changes: 2 additions & 1 deletion sdk/identity/azure-identity/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
../../core/azure-core
aiohttp>=3.0
aiohttp>=3.0; python_version >= '3.5'
mock;python_version<"3.3"
typing_extensions>=3.7.2
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
2 changes: 2 additions & 0 deletions sdk/identity/azure-identity/setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[bdist_wheel]
universal=1
23 changes: 22 additions & 1 deletion sdk/identity/azure-identity/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,21 @@
package_folder_path = PACKAGE_NAME.replace("-", "/")
namespace_name = PACKAGE_NAME.replace("-", ".")

# azure v0.x is not compatible with this package
# azure v0.x used to have a __version__ attribute (newer versions don't)
try:
import azure

try:
ver = azure.__version__ # type: ignore
raise Exception(
"This package is incompatible with azure=={}. ".format(ver) + 'Uninstall it with "pip uninstall azure".'
)
except AttributeError:
pass
except ImportError:
pass

with open(os.path.join(package_folder_path, "_version.py"), "r") as fd:
VERSION = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) # type: ignore
if not VERSION:
Expand All @@ -39,7 +54,10 @@
classifiers=[
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand All @@ -54,12 +72,15 @@
"azure",
]
),
python_requires=">=3.7",
install_requires=[
"azure-core<2.0.0,>=1.11.0",
"cryptography>=2.5",
"msal<2.0.0,>=1.12.0",
"msal-extensions~=0.3.0",
"six>=1.12.0",
],
extras_require={
":python_version<'3.0'": ["azure-nspkg"],
":python_version<'3.5'": ["typing"],
},
)
2 changes: 1 addition & 1 deletion sdk/synapse/azure-synapse-accesscontrol/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
classifiers=[
'Development Status :: 4 - Beta',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 3 :: Only",
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand Down
2 changes: 1 addition & 1 deletion sdk/synapse/azure-synapse-artifacts/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
classifiers=[
"Development Status :: 5 - Production/Stable",
'Programming Language :: Python',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 3 :: Only",
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand Down
2 changes: 1 addition & 1 deletion sdk/synapse/azure-synapse-managedprivateendpoints/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
classifiers=[
'Development Status :: 4 - Beta',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 3 :: Only",
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand Down
2 changes: 1 addition & 1 deletion sdk/synapse/azure-synapse-monitoring/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
classifiers=[
'Development Status :: 4 - Beta',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 3 :: Only",
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand Down
2 changes: 1 addition & 1 deletion sdk/synapse/azure-synapse-spark/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
classifiers=[
'Development Status :: 4 - Beta',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 3 :: Only",
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand Down

0 comments on commit 1d2eccb

Please sign in to comment.