diff --git a/Formula/awscli.rb b/Formula/awscli.rb index 63732a9720d20..4f4e502edc339 100644 --- a/Formula/awscli.rb +++ b/Formula/awscli.rb @@ -6,6 +6,7 @@ class Awscli < Formula # awscli should only be updated every 10 releases on multiples of 10 url "https://github.com/aws/aws-cli/archive/1.16.310.tar.gz" sha256 "2a8fa13b03714fd1f503b2c4a696c5cf433a2bc07ea5d262387a2f176e8f535e" + revision 1 head "https://github.com/aws/aws-cli.git", :branch => "develop" bottle do @@ -17,7 +18,7 @@ class Awscli < Formula # Some AWS APIs require TLS1.2, which system Python doesn't have before High # Sierra - depends_on "python" + depends_on "python@3.8" def install venv = virtualenv_create(libexec, "python3") diff --git a/Formula/conjure-up.rb b/Formula/conjure-up.rb index 4de3f86c1b578..161a702904ef1 100644 --- a/Formula/conjure-up.rb +++ b/Formula/conjure-up.rb @@ -5,6 +5,7 @@ class ConjureUp < Formula homepage "https://conjure-up.io/" url "https://github.com/conjure-up/conjure-up/archive/2.6.9.tar.gz" sha256 "b5ebba187d27b3474b36acd715df015b198c0e5df8aefb32200ba4f3f3de17f4" + revision 1 bottle do cellar :any @@ -18,7 +19,7 @@ class ConjureUp < Formula depends_on "juju-wait" depends_on "libyaml" depends_on "pwgen" - depends_on "python" + depends_on "python@3.8" depends_on "redis" # list generated from the 'requirements.txt' file in the repository root @@ -28,8 +29,8 @@ class ConjureUp < Formula end resource "asn1crypto" do - url "https://files.pythonhosted.org/packages/fc/f1/8db7daa71f414ddabfa056c4ef792e1461ff655c2ae2928a2b675bfed6b4/asn1crypto-0.24.0.tar.gz" - sha256 "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49" + url "https://files.pythonhosted.org/packages/9f/3d/8beae739ed8c1c8f00ceac0ab6b0e97299b42da869e24cf82851b27a9123/asn1crypto-1.3.0.tar.gz" + sha256 "5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d" end resource "bcrypt" do @@ -53,8 +54,8 @@ class ConjureUp < Formula end resource "cryptography" do - url "https://files.pythonhosted.org/packages/c2/95/f43d02315f4ec074219c6e3124a87eba1d2d12196c2767fadfdc07a83884/cryptography-2.7.tar.gz" - sha256 "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6" + url "https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4/cryptography-2.8.tar.gz" + sha256 "3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651" end resource "env" do @@ -95,6 +96,13 @@ class ConjureUp < Formula resource "macaroonbakery" do url "https://files.pythonhosted.org/packages/d0/22/ca60ef57ad0ea904292daaa1cb0f1e991303667f70794a97674f4a3695fa/macaroonbakery-1.2.3.tar.gz" sha256 "bd27e7d2d98cb3dc1973d7b67b2a0c475fb005c0f9c35c04dbf9b272e98939ec" + + # Python 3.8 compatibility platform.linux_distribution + # Remove in next release + patch do + url "https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/75.patch?full_index=1" + sha256 "70b36abee3f9d93afee7fb4d4cb9018370aad83f16a2ab7c5b5770aa1178be86" + end end resource "MarkupSafe" do diff --git a/Formula/juju-wait.rb b/Formula/juju-wait.rb index e390cb29a66c7..45d62a9224448 100644 --- a/Formula/juju-wait.rb +++ b/Formula/juju-wait.rb @@ -3,8 +3,8 @@ class JujuWait < Formula desc "Juju plugin for waiting for deployments to settle" homepage "https://launchpad.net/juju-wait" - url "https://files.pythonhosted.org/packages/4c/ee/1a4b3298afd01f276e37dbd3f8d5a42478fb049f08f6255ca2742f7aab9f/juju-wait-2.6.4.tar.gz" - sha256 "c1dd38c2525fc26d1e89739f9a932aebfd2c1e238e96c980f26527522e7111bf" + url "https://files.pythonhosted.org/packages/d6/01/381cc24aabf820ff306b738a01b11aed5ac365a6438d46792f9fee2fe5f8/juju-wait-2.7.0.tar.gz" + sha256 "1e00cb75934defa50a2cc404574d4b633049f1fa011a197dfac33e3071840e98" bottle do cellar :any @@ -16,11 +16,11 @@ class JujuWait < Formula depends_on "juju" depends_on "libyaml" - depends_on "python" + depends_on "python@3.8" resource "PyYAML" do - url "https://files.pythonhosted.org/packages/9e/a3/1d13970c3f36777c583f136c136f804d70f500168edc1edea6daa7200769/PyYAML-3.13.tar.gz" - sha256 "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf" + url "https://files.pythonhosted.org/packages/3d/d9/ea9816aea31beeadccd03f1f8b625ecf8f645bd66744484d162d84803ce5/PyYAML-5.3.tar.gz" + sha256 "e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615" end def install