diff --git a/Formula/ansible@2.9.rb b/Formula/ansible@2.9.rb index eb1110c6d56..d8c26b4b374 100644 --- a/Formula/ansible@2.9.rb +++ b/Formula/ansible@2.9.rb @@ -3,8 +3,8 @@ class AnsibleAT29 < Formula desc "Automate deployment, configuration, and upgrading" homepage "https://www.ansible.com/" - url "https://files.pythonhosted.org/packages/d9/fd/a1420f0f6f2c2e3f045172acb1098b7932f601dab27093e3adcf659d532b/ansible-2.9.24.tar.gz" - sha256 "0c2f53b7be73ddc3423d9658fcd19079897d5b1fc533c4ad550db58b179aeb8a" + url "https://files.pythonhosted.org/packages/dc/bb/989db37e94c3e162e9932b614cc856e2207677480379208c73115555f0bf/ansible-2.9.25.tar.gz" + sha256 "8bcf2c2f5c609e5b91114ca8b0e4226d603b87f2be71dcb338e8b7d3adbaa28f" license "GPL-3.0-or-later" # The newest PyPI release won't be a 2.9.x version, so we match versions from @@ -29,6 +29,7 @@ class AnsibleAT29 < Formula depends_on "libyaml" depends_on "openssl@1.1" depends_on "python@3.9" + depends_on "six" uses_from_macos "krb5" uses_from_macos "libffi" @@ -49,7 +50,6 @@ class AnsibleAT29 < Formula # kerberos (Windows) # boto3 (AWS) # apache-libcloud (Google GCE) - # python-keyczar (Accelerated Mode) # passlib (htpasswd core module) # zabbix-api (Zabbix extras module) # junos-eznc (Juniper device support) @@ -78,19 +78,24 @@ class AnsibleAT29 < Formula sha256 "ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb" end + resource "autopage" do + url "https://files.pythonhosted.org/packages/b9/bf/db4efe85bfc10ed5598999a10dd2dd2da6d2daafb8a26c0005fcb31201e9/autopage-0.4.0.tar.gz" + sha256 "18f511d8ef2e4d3cc22a986d345eab0e03f95b9fa80b74ca63b7fb001551dc42" + end + resource "bcrypt" do url "https://files.pythonhosted.org/packages/d8/ba/21c475ead997ee21502d30f76fd93ad8d5858d19a3fad7cd153de698c4dd/bcrypt-3.2.0.tar.gz" sha256 "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29" end resource "boto3" do - url "https://files.pythonhosted.org/packages/46/b0/a658ee66fcffb20e9e5e979a3f0ab927cba9e4c0c346f1a8ad9fbad0d001/boto3-1.18.4.tar.gz" - sha256 "7079b40bd6621c54a0385a8fc11240cff4318a4d487292653e393e18254f5d94" + url "https://files.pythonhosted.org/packages/f0/98/087ccee8a3605e97885e25cd17d6200a25f4c72a35473f4810f22d88b827/boto3-1.18.35.tar.gz" + sha256 "ba9587a6ee53741b4136e0c6cda2a23f99439ed755b29e7e8e4b55044b6a7478" end resource "botocore" do - url "https://files.pythonhosted.org/packages/45/bb/1f429d5d3ef6860782eabb66e3850bc3c665a5bd21088f27eb9771b925fd/botocore-1.21.4.tar.gz" - sha256 "317d441c8f3f03591761e3478de6ab34b22b333038d819bc24f2e74b64f22201" + url "https://files.pythonhosted.org/packages/e7/32/2404a93f072fcb7466825dff4d46faa31bf6d4d54dbb3434ae4837053906/botocore-1.21.35.tar.gz" + sha256 "f60f8e10292dd509c5576eb42628656b72157375295d7f92120989b9f103857d" end resource "cachetools" do @@ -109,13 +114,13 @@ class AnsibleAT29 < Formula end resource "charset-normalizer" do - url "https://files.pythonhosted.org/packages/37/fd/05a04d7e14548474d30d90ad0db5d90ee2ba55cd967511a354cf88b534f1/charset-normalizer-2.0.3.tar.gz" - sha256 "c46c3ace2d744cfbdebceaa3c19ae691f53ae621b39fd7570f59d14fb7f2fd12" + url "https://files.pythonhosted.org/packages/e7/4e/2af0238001648ded297fb54ceb425ca26faa15b341b4fac5371d3938666e/charset-normalizer-2.0.4.tar.gz" + sha256 "f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3" end resource "cliff" do - url "https://files.pythonhosted.org/packages/cd/ba/da7f1c8f63e6171b3cdf38afc103574d27c885e007352e35bba01b235263/cliff-3.8.0.tar.gz" - sha256 "8dd215d0a84c9a3ab2fa2aa700849f4e7b786639f66caa0ad4108c85dca95a7c" + url "https://files.pythonhosted.org/packages/a4/c3/b9c47664219610a890edeb74d0c47e304e4324d2e1e283705d9a4e8eda3a/cliff-3.9.0.tar.gz" + sha256 "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3" end resource "cmd2" do @@ -129,8 +134,8 @@ class AnsibleAT29 < Formula end resource "cryptography" do - url "https://files.pythonhosted.org/packages/9b/77/461087a514d2e8ece1c975d8216bc03f7048e6090c5166bc34115afdaa53/cryptography-3.4.7.tar.gz" - sha256 "3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713" + url "https://files.pythonhosted.org/packages/cc/98/8a258ab4787e6f835d350639792527d2eb7946ff9fc0caca9c3f4cf5dcfe/cryptography-3.4.8.tar.gz" + sha256 "94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c" end resource "debtcollector" do @@ -159,8 +164,8 @@ class AnsibleAT29 < Formula end resource "dogpile.cache" do - url "https://files.pythonhosted.org/packages/99/d3/36efc44d13ec2eca3fb3aa918844a941a4d3bb6619d46d609a641c0ab3d6/dogpile.cache-1.1.3.tar.gz" - sha256 "6f0bcf97c73bfec1a7bf14e5a248488cee00c2d494bf63f3789ea6d95a57c1cf" + url "https://files.pythonhosted.org/packages/a4/5a/2735b2db3b704f4fa134360842560456e7aea509c4519ada9a0333b6c236/dogpile.cache-1.1.4.tar.gz" + sha256 "ea09bebf24bb7c028caf98963785fe9ad0bd397305849a3303bc5380d468d813" end resource "future" do @@ -169,8 +174,8 @@ class AnsibleAT29 < Formula end resource "google-auth" do - url "https://files.pythonhosted.org/packages/4d/71/b0cfe841fb477554438a1c16983213c897c5e22f425c4698df6b0ed3e9d9/google-auth-1.33.1.tar.gz" - sha256 "7665c04f2df13cc938dc7d9066cddb1f8af62b038bc8b2306848c1b23121865f" + url "https://files.pythonhosted.org/packages/b3/a8/23d17642bd87fb896ba035a36c84aeb81af359f2ee7f1cf2eae6999c277f/google-auth-2.0.2.tar.gz" + sha256 "104475dc4d57bbae49017aea16fffbb763204fa2d6a70f1f3cc79962c1a383a4" end resource "idna" do @@ -264,8 +269,8 @@ class AnsibleAT29 < Formula end resource "ntc-templates" do - url "https://files.pythonhosted.org/packages/22/1a/e0fc1d7016500986639d6f9a3470fd91ac6e4732c61ecbf4e892dc01673f/ntc_templates-2.1.0.tar.gz" - sha256 "6ce17e48d951d531afa83ad3b68fda822a3d8937e8c955387053c501edfec41f" + url "https://files.pythonhosted.org/packages/75/e1/70cea5caccff5ef9bd8f922136d0a513fb2be6166a0d37ffa38781e12149/ntc_templates-2.3.1.tar.gz" + sha256 "78423ae2cd513551cdcb677f46ef429e0dafab70834780a1bb3eecf4bce9b47e" end resource "ntlm-auth" do @@ -284,8 +289,8 @@ class AnsibleAT29 < Formula end resource "openstacksdk" do - url "https://files.pythonhosted.org/packages/9c/11/1d366df84f002de860754becea31b21455437a56532c3cbffed0c59a407f/openstacksdk-0.58.0.tar.gz" - sha256 "d8368d1728f686114213d22cc8e3eef71629fae1424b2ad2c5d22a7b9a04a278" + url "https://files.pythonhosted.org/packages/c3/23/30cd6b7e710980234be264270a60b0b26ed9eca88119d23cd50de404dd1d/openstacksdk-0.59.0.tar.gz" + sha256 "3df760cd272398abfac8cebe62eeb82cbc497bb25d4dd707576f74a8ce9abf0d" end resource "os-client-config" do @@ -299,8 +304,8 @@ class AnsibleAT29 < Formula end resource "osc-lib" do - url "https://files.pythonhosted.org/packages/68/7f/9acfaf98c2073a5104716983db550d6422e7307d0211243387c162bb760e/osc-lib-2.4.1.tar.gz" - sha256 "257ef0cda902664605a850a858172306acb2b08b0e7e32d7a5b4f12dc6bc56c5" + url "https://files.pythonhosted.org/packages/ca/9f/8ba3627e2ebebb663aaa8874e3c218cbb3ec9509624665823fa8acc1edf6/osc-lib-2.4.2.tar.gz" + sha256 "d6b530e3e50646840a6a5ef134e00f285cc4a04232c163f28585226ed40cc968" end resource "oslo.config" do @@ -309,8 +314,8 @@ class AnsibleAT29 < Formula end resource "oslo.context" do - url "https://files.pythonhosted.org/packages/00/3b/9088add726eb883c3e7950c9875a3a1b3f88801b738c00ef8c585f9cb402/oslo.context-3.3.0.tar.gz" - sha256 "d83f098e79ee0731c352fe2d59a82c16b213e2cf3259958c019defabf510fc08" + url "https://files.pythonhosted.org/packages/49/8b/200b710df1cfcfd2ec0aaacb4249b5865cc5ad6be0355c240f1a3e90bc4a/oslo.context-3.3.1.tar.gz" + sha256 "f578ea38569cf0a677e2167178196b21a54175471358c4320ddfd5c97c52f4d1" end resource "oslo.i18n" do @@ -324,13 +329,13 @@ class AnsibleAT29 < Formula end resource "oslo.serialization" do - url "https://files.pythonhosted.org/packages/0a/85/9af1feeff44ee56868145674e0c2e6654e8ff2241c5bc178bb9539065c3d/oslo.serialization-4.1.0.tar.gz" - sha256 "cecc7794df806c85cb70dbd6c2b3af19bc68047ad29e3c6442be90a0a4de5379" + url "https://files.pythonhosted.org/packages/d0/47/d99242e79519e7667fa12b287dc7e352aefc63f6a1739feac90999b8295e/oslo.serialization-4.2.0.tar.gz" + sha256 "3007e1b017ad3754cce54def894054cbcd05887e85928556657434b0fc7e4d83" end resource "oslo.utils" do - url "https://files.pythonhosted.org/packages/4c/8d/53957d87c9aa14bdad33858c5c3dd79c2131679b871f18de837e4a6b2e8a/oslo.utils-4.9.2.tar.gz" - sha256 "20db285734ff6c3b50d5a6afcb2790ade0c7ba02fbc876feed43733f2c41a5c9" + url "https://files.pythonhosted.org/packages/81/18/1ff06ea155e0902c329bcc096c4649b49b3d45d4e70b248704c180cbf27c/oslo.utils-4.10.0.tar.gz" + sha256 "9646e6570ed08a79f21b03acfb60d32a3ac453d76304f8759b1211a59ce372cb" end resource "packaging" do @@ -359,8 +364,8 @@ class AnsibleAT29 < Formula end resource "prettytable" do - url "https://files.pythonhosted.org/packages/d4/c6/d388b3d4992acf413d1b67101107b7f4651cc2835abd0bbd6661678eb2c1/prettytable-2.1.0.tar.gz" - sha256 "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0" + url "https://files.pythonhosted.org/packages/00/8d/95441120aa870aa800f8b4c6cf650bf0739d7a41883fe81769ab593556c9/prettytable-2.2.0.tar.gz" + sha256 "bd81678c108e6c73d4f1e47cd4283de301faaa6ff6220bcd1d4022038c56b416" end resource "ptyprocess" do @@ -428,11 +433,6 @@ class AnsibleAT29 < Formula sha256 "0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86" end - resource "python-keyczar" do - url "https://files.pythonhosted.org/packages/c8/14/3ffb68671fef927fa5b60f21c43a04a4a007acbe939a26ba08b197fea6b3/python-keyczar-0.716.tar.gz" - sha256 "f9b614112dc8248af3d03b989da4aeca70e747d32fe7e6fce9512945365e3f83" - end - resource "python-keystoneclient" do url "https://files.pythonhosted.org/packages/0d/17/aaaa6e508ca437360eb348486d6ac7cf17e434400acd222548361959b4bd/python-keystoneclient-4.2.0.tar.gz" sha256 "0248426e483b95de395086482c077d48e45990d3b1a3e334b2ec8b2e108f5a8a" @@ -499,8 +499,8 @@ class AnsibleAT29 < Formula end resource "ruamel.yaml" do - url "https://files.pythonhosted.org/packages/83/59/4f576abb336d30b3d47061717224be714a9dc39c774061c34cb41c1795cf/ruamel.yaml-0.17.10.tar.gz" - sha256 "106bc8d6dc6a0ff7c9196a47570432036f41d556b779c6b4e618085f57e39e67" + url "https://files.pythonhosted.org/packages/71/81/f597606e81f53eb69330e3f8287e9b5a3f7ed0481824036d550da705cd82/ruamel.yaml-0.17.16.tar.gz" + sha256 "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33" end resource "ruamel.yaml.clib" do @@ -524,23 +524,23 @@ class AnsibleAT29 < Formula end resource "simplejson" do - url "https://files.pythonhosted.org/packages/2f/58/2bc9d908d3b52bc53876b438055ff129e28cc8b1a83a669ccc87e515c0a5/simplejson-3.17.3.tar.gz" - sha256 "da72a452bcf4349fc467a12b54ab0e63e654a571cacc44084826d52bde12b6ee" - end - - resource "six" do - url "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz" - sha256 "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926" + url "https://files.pythonhosted.org/packages/01/52/41c71718f941c9a5abebfaa24e3c14e3c0229327b7ebd21348989845ed8f/simplejson-3.17.5.tar.gz" + sha256 "91cfb43fb91ff6d1e4258be04eee84b51a4ef40a28d899679b9ea2556322fb50" end resource "stevedore" do - url "https://files.pythonhosted.org/packages/95/bc/dc386a920942dbdfe480c8a4d953ff77ed3dec99ce736634b6ec4f2d97c1/stevedore-3.3.0.tar.gz" - sha256 "3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee" + url "https://files.pythonhosted.org/packages/f9/57/328653fd8a631d81b2d71261e471a102d5b64a95c1b1dda1a55b053bf0db/stevedore-3.4.0.tar.gz" + sha256 "59b58edb7f57b11897f150475e7bc0c39c5381f0b8e3fa9f5c20ce6c89ec4aa1" + end + + resource "textfsm" do + url "https://files.pythonhosted.org/packages/9f/53/fa46575d30be6aa591712aa9c44caa7fa9f057f3bb726fe42519a5ae2d8e/textfsm-1.1.2.tar.gz" + sha256 "85a450b441aff04b1cac726bdb36f35534a5b196cca08c8bc14fddd879c4255c" end resource "transitions" do - url "https://files.pythonhosted.org/packages/ee/ca/8e6eafd9f2d1af7f0bee4af9add66ea633c82519d3d2c40701fa5fb66ad6/transitions-0.8.8.tar.gz" - sha256 "e7a86b31a161a76133f189b3ae9dad2755a80ea4c1e0eee1805648d021fb677d" + url "https://files.pythonhosted.org/packages/d5/68/c39c6e7e21c44e3468aca2524035989a2b64eee67936c19a75846d094c05/transitions-0.8.9.tar.gz" + sha256 "fc2ec6d6b6f986cd7e28e119eeb9ba1c9cc51ab4fbbdb7f2dedad01983fd2de0" end resource "urllib3" do @@ -554,8 +554,8 @@ class AnsibleAT29 < Formula end resource "websocket-client" do - url "https://files.pythonhosted.org/packages/58/0d/af54f4732115a20c370f43f179523d189a5cb75711c60ba00b41e163a065/websocket-client-1.1.0.tar.gz" - sha256 "b68e4959d704768fa20e35c9d508c8dc2bbc041fd8d267c0d7345cffe2824568" + url "https://files.pythonhosted.org/packages/4e/8f/b5c45af5a1def38b07c09a616be932ad49c35ebdc5e3cbf93966d7ed9750/websocket-client-1.2.1.tar.gz" + sha256 "8dfb715d8a992f5712fff8c843adae94e22b22a99b2c5e6b0ec4a1a981cc4e0d" end resource "wrapt" do @@ -578,24 +578,6 @@ class AnsibleAT29 < Formula sha256 "2d6c62001cb79a7de6fe286424967276edaca09d3833b72fb04f7863f29fce4b" end - # Manually updated resources - resource "pycrypto" do - url "https://files.pythonhosted.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-2.6.1.tar.gz" - sha256 "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" - - # Fix warnings "SyntaxWarning: "is" with a literal. Did you mean "=="?" for python 3.8 - # Patch can be removed and resource can be set to auto update if v2.7.1 is ever released in pypi - patch do - url "https://github.com/dlitz/pycrypto/commit/4e4cc0beefbb316db2a8750e747e697df0b754d7.patch?full_index=1" - sha256 "f82fedee6cf73c868b55af3ab2b7d2d029b84960be0dc3baf85bb4bf541e1451" - end - end - - resource "textfsm" do - url "https://github.com/google/textfsm/archive/v1.1.2.tar.gz" - sha256 "9ec13fa5389a3a3b7ab73881475ec3d6f8d16a602894fdde2b2d93207cc8a8ea" - end - def install ENV.prepend_path "PATH", Formula["python@3.9"].opt_libexec/"bin" diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index 4bcd4ebbc25..c5309fe9e2f 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -13,10 +13,10 @@ "ansible@2.9": { "extra_packages": [ "apache-libcloud", "boto3", "dnspython", "docker-py", "junos-eznc", "jxmlease", "kerberos", "ntc-templates", - "openshift", "passlib", "pexpect", "pysphere3", "python-consul", "python-keyczar", "python-neutronclient", + "openshift", "passlib", "pexpect", "pysphere3", "python-consul", "python-neutronclient", "pywinrm", "requests-credssp", "shade", "zabbix-api" ], - "exclude_packages": ["textfsm", "pycrypto"] + "exclude_packages": ["pycrypto", "six"] }, "athenacli": { "exclude_packages": ["six", "tabulate"]