|
19 | 19 | from setuptools import setup |
20 | 20 |
|
21 | 21 |
|
22 | | -DEPENDENCIES = ("pyasn1-modules>=0.2.1",) |
| 22 | +DEPENDENCIES = ( |
| 23 | + "pyasn1-modules>=0.2.1", |
| 24 | + "cryptography >= 38.0.3", |
| 25 | + # TODO: remove rsa from dependencies in next release (replaced with cryptography) |
| 26 | + "rsa>=3.1.4,<5", |
| 27 | +) |
23 | 28 |
|
24 | | -cryptography_base_require = [ |
| 29 | +# Note: cryptography was made into a required dependency. Extra is kept for backwards compatibility |
| 30 | +cryptography_extra_require = [ |
25 | 31 | "cryptography >= 38.0.3", |
26 | 32 | ] |
27 | 33 |
|
28 | | -# TODO: rsa is archived. Remove optional dependency in future release |
29 | | -rsa_extra_require = ["rsa>=3.1.4,<5"] |
30 | | - |
31 | 34 | requests_extra_require = ["requests >= 2.20.0, < 3.0.0"] |
32 | 35 |
|
33 | 36 | aiohttp_extra_require = ["aiohttp >= 3.6.2, < 4.0.0", *requests_extra_require] |
34 | 37 |
|
35 | | -pyjwt_extra_require = ["pyjwt>=2.0", *cryptography_base_require] |
| 38 | +pyjwt_extra_require = ["pyjwt>=2.0"] |
36 | 39 |
|
37 | 40 | reauth_extra_require = ["pyu2f>=0.1.5"] |
38 | 41 |
|
39 | 42 | # TODO(https://github.com/googleapis/google-auth-library-python/issues/1738): Add bounds for cryptography and pyopenssl dependencies. |
40 | 43 | enterprise_cert_extra_require = ["cryptography", "pyopenssl"] |
41 | 44 |
|
42 | | -pyopenssl_extra_require = ["pyopenssl>=20.0.0", cryptography_base_require] |
| 45 | +pyopenssl_extra_require = ["pyopenssl>=20.0.0"] |
43 | 46 |
|
44 | 47 | # TODO(https://github.com/googleapis/google-auth-library-python/issues/1739): Add bounds for urllib3 and packaging dependencies. |
45 | 48 | urllib3_extra_require = ["urllib3", "packaging"] |
|
71 | 74 | # TODO(https://github.com/googleapis/google-auth-library-python/issues/1722): `test_aiohttp_requests` depend on |
72 | 75 | # aiohttp < 3.10.0 which is a bug. Investigate and remove the pinned aiohttp version. |
73 | 76 | "aiohttp < 3.10.0", |
74 | | - *rsa_extra_require, |
75 | 77 | ] |
76 | 78 |
|
77 | 79 | extras = { |
78 | | - "cryptography": cryptography_base_require, |
79 | | - "rsa": rsa_extra_require, |
| 80 | + "cryptography": cryptography_extra_require, |
80 | 81 | "aiohttp": aiohttp_extra_require, |
81 | 82 | "enterprise_cert": enterprise_cert_extra_require, |
82 | 83 | "pyopenssl": pyopenssl_extra_require, |
|
0 commit comments