diff --git a/Formula/ansible.rb b/Formula/ansible.rb index d92836ce290..d407d60c8d6 100644 --- a/Formula/ansible.rb +++ b/Formula/ansible.rb @@ -3,8 +3,8 @@ class Ansible < Formula desc "Automate deployment, configuration, and upgrading" homepage "https://www.ansible.com/" - url "https://files.pythonhosted.org/packages/42/c6/e97fbab98d4d80f423cfdb3f82ed2d6461d9e608cd93422242b072d47b1a/ansible-4.1.0.tar.gz" - sha256 "f561cca7fbc4daa14d98e18cd0cb74bd8b173f1501b8fa11543f6ef002de3167" + url "https://files.pythonhosted.org/packages/04/09/382825821ac527ee1aaa6457c76c327f638417cc6ae11e8c98d55d4eb2e0/ansible-4.2.0.tar.gz" + sha256 "737d819ffbd7a80c28795b4edd93e59ad21e6e6d53af0d19f57412814f9260d0" license "GPL-3.0-or-later" head "https://github.com/ansible/ansible.git", branch: "devel" @@ -25,22 +25,15 @@ class Ansible < Formula uses_from_macos "libffi" uses_from_macos "libxslt" - # The second (short) block of resources can't be automatically updated and should be cared for manually. - # The first (long) block can be updated by two slightly different methods. - # A) run `brew update-python-resources ansible --print-only` and replace the resource block manually. - # B) temporarily comment out the "Manually updated resources" block and run - # `brew update-python-resources ansible`. - # # This will collect requirements from: # ansible - # docker-py + # docker # python-neutronclient (OpenStack) # shade (OpenStack) # pywinrm (Windows) # 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) @@ -80,13 +73,13 @@ class Ansible < Formula end resource "boto3" do - url "https://files.pythonhosted.org/packages/cd/16/90930985c3f2db2a8d412f6f05b68c80ee7417d8a630c27f94bb032131c1/boto3-1.17.98.tar.gz" - sha256 "fccfa81cda69bb2317ed97e7149d7d84d19e6ec3bfbe3f721139e7ac0c407c73" + url "https://files.pythonhosted.org/packages/e2/08/e912d1cafbfd01ece23fb5f429f3a2dee9519b6d0f3cfafccc27a7932bc5/boto3-1.17.103.tar.gz" + sha256 "b50067fc63c519387fc3ec46c05a78e5c7e25c1a1ec0d07a40103c4a47544fd4" end resource "botocore" do - url "https://files.pythonhosted.org/packages/28/f4/3dc9e36d0b73341f14a5112561f7540fd76f0a692c7dcc83a3be5d7436de/botocore-1.20.98.tar.gz" - sha256 "b2a49de4ee04b690142c8e7240f0f5758e3f7673dd39cf398efe893bf5e11c3f" + url "https://files.pythonhosted.org/packages/78/6d/2e55d9e717ea19f1e8ffb2dc919928974c5018cfa07ef7d5f3294bf35548/botocore-1.20.103.tar.gz" + sha256 "afbfe10fcd580224016d652330db21e7d89099181a437c9ec588b5b7cb3ea644" end resource "cachetools" do @@ -144,14 +137,9 @@ class Ansible < Formula sha256 "e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4" end - resource "docker-py" do - url "https://files.pythonhosted.org/packages/fa/2d/906afc44a833901fc6fed1a89c228e5c88fbfc6bd2f3d2f0497fdfb9c525/docker-py-1.10.6.tar.gz" - sha256 "4c2a75875764d38d67f87bc7d03f7443a3895704efc57962bdf6500b8d4bc415" - end - - resource "docker-pycreds" do - url "https://files.pythonhosted.org/packages/c5/e6/d1f6c00b7221e2d7c4b470132c931325c8b22c51ca62417e300f5ce16009/docker-pycreds-0.4.0.tar.gz" - sha256 "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4" + resource "docker" do + url "https://files.pythonhosted.org/packages/fa/a2/e46d7c1b51394a09271a3b07c3a68deb3a669429beafd444d9553ed52868/docker-5.0.0.tar.gz" + sha256 "3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61c0a9a5" end resource "dogpile.cache" do @@ -165,8 +153,8 @@ class Ansible < Formula end resource "google-auth" do - url "https://files.pythonhosted.org/packages/25/c9/2891b5885fc47ea7a5b534ef6e9decead403c2392116291d5eadd321c7db/google-auth-1.32.0.tar.gz" - sha256 "e34e5f5de5610b202f9b40ebd9f8b27571d5c5537db9afed3a72b2db5a345039" + url "https://files.pythonhosted.org/packages/a5/76/7302823a61f723296e8d21cffac8f341cd826627a52ec95d91a6701bf8c8/google-auth-1.32.1.tar.gz" + sha256 "c7c215c74348ef24faef2f7b62f6d8e6b38824fe08b1e7b7b09a02d397eda7b3" end resource "idna" do @@ -260,8 +248,8 @@ class Ansible < Formula end resource "ntc-templates" do - url "https://files.pythonhosted.org/packages/26/0e/bb9c80ec638facbabf68dc338e7a7aa4b33dd165dff08d96d5e776d4b6f4/ntc_templates-2.0.0.tar.gz" - sha256 "32d3b371dfe5aecd4c36f56184f109f1f75e4768e6087d234c0371cbefe82bcd" + url "https://files.pythonhosted.org/packages/22/1a/e0fc1d7016500986639d6f9a3470fd91ac6e4732c61ecbf4e892dc01673f/ntc_templates-2.1.0.tar.gz" + sha256 "6ce17e48d951d531afa83ad3b68fda822a3d8937e8c955387053c501edfec41f" end resource "ntlm-auth" do @@ -275,8 +263,8 @@ class Ansible < Formula end resource "openshift" do - url "https://files.pythonhosted.org/packages/39/2b/7ff97fa8874de0d65f1bbb9c881eb0a40bf1c9b72a8ada187680758a61ee/openshift-0.12.0.tar.gz" - sha256 "6a08119c3e20a226493e9e1c9e0a7c008ac90bf578eb7efc7305127eaf179a5e" + url "https://files.pythonhosted.org/packages/bf/61/395013f4378b12f4755522d50fc3649a774a1d6b1d95d4682bade4abeba1/openshift-0.12.1.tar.gz" + sha256 "a38957684b17ad0e140a87226249bf26de7267db0c83a6d512b48be258052e1a" end resource "openstacksdk" do @@ -424,11 +412,6 @@ class Ansible < Formula sha256 "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c" 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" @@ -500,13 +483,13 @@ class Ansible < Formula end resource "ruamel.yaml" do - url "https://files.pythonhosted.org/packages/ea/7f/4bcd7276603b4324ac12839a949b3e58f03cda1d87218c89a8a1efe31c1a/ruamel.yaml-0.17.9.tar.gz" - sha256 "374373b4743aee9f6d9f40bea600fe020a7ac7ae36b838b4a6a93f72b584a14c" + url "https://files.pythonhosted.org/packages/83/59/4f576abb336d30b3d47061717224be714a9dc39c774061c34cb41c1795cf/ruamel.yaml-0.17.10.tar.gz" + sha256 "106bc8d6dc6a0ff7c9196a47570432036f41d556b779c6b4e618085f57e39e67" end resource "ruamel.yaml.clib" do - url "https://files.pythonhosted.org/packages/fa/a1/f9c009a633fce3609e314294c7963abe64934d972abea257dce16a15666f/ruamel.yaml.clib-0.2.2.tar.gz" - sha256 "2d24bd98af676f4990c4d715bcdc2a60b19c56a3fb3a763164d2d8ca0e806ba7" + url "https://files.pythonhosted.org/packages/b7/81/c04fb9be62657d4dce8aa2d99fde258a3af1cd77ec72af525593e9560127/ruamel.yaml.clib-0.2.4.tar.gz" + sha256 "f997f13fd94e37e8b7d7dbe759088bb428adc6570da06b64a913d932d891ac8d" end resource "s3transfer" do @@ -515,8 +498,8 @@ class Ansible < Formula end resource "scp" do - url "https://files.pythonhosted.org/packages/78/ab/3c8a6160786eff8032deb55b72fa4e74484e9a5723510475395baeaa64cc/scp-0.13.4.tar.gz" - sha256 "e60948dd3e1aa13da21aa1bf8a025fabbbc2816ed04f1a1272410247d1a86f15" + url "https://files.pythonhosted.org/packages/d2/35/392dde4dc4a1cb48f90fc7137104ac3246654c73aafd81efde5bd0078b12/scp-0.13.5.tar.gz" + sha256 "0ab2ee9178b8be53dc5c9fe2f33761e01a2435087f5c9fb5b54519873c650d60" end resource "shade" do @@ -539,14 +522,19 @@ class Ansible < Formula sha256 "3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee" 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" end resource "urllib3" do - url "https://files.pythonhosted.org/packages/94/40/c396b5b212533716949a4d295f91a4c100d51ba95ea9e2d96b6b0517e5a5/urllib3-1.26.5.tar.gz" - sha256 "a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098" + url "https://files.pythonhosted.org/packages/4f/5a/597ef5911cb8919efe4d86206aa8b2658616d676a7088f0825ca08bd7cb8/urllib3-1.26.6.tar.gz" + sha256 "f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f" end resource "wcwidth" do @@ -579,24 +567,6 @@ class Ansible < 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.1.tar.gz" - sha256 "9299d54544b679ef2a477c9256ec5e906c649f8f79593b71d2bb56e1c96e6601" - 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 0e6e6ce5d5a..0b9786faa55 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -4,11 +4,10 @@ }, "ansible": { "extra_packages": [ - "apache-libcloud", "boto3", "dnspython", "docker-py", "junos-eznc", "jxmlease", "kerberos", "ntc-templates", - "openshift", "passlib", "pexpect", "pysphere3", "python-consul", "python-keyczar", "python-neutronclient", + "apache-libcloud", "boto3", "dnspython", "docker", "junos-eznc", "jxmlease", "kerberos", "ntc-templates", + "openshift", "passlib", "pexpect", "pysphere3", "python-consul", "python-neutronclient", "pywinrm", "requests-credssp", "shade", "zabbix-api" - ], - "exclude_packages": ["textfsm", "pycrypto"] + ] }, "ansible@2.8": false, "ansible@2.9": {