subliminal 0.7.5

Closes #37725.

1 files changed, 65 insertions, 49 deletions

diff --git a/Library/Formula/subliminal.rb b/Library/Formula/subliminal.rb
index 2af350fdf..ad8d5279b 100644
--- a/Library/Formula/subliminal.rb
+++ b/Library/Formula/subliminal.rb
@@ -1,9 +1,7 @@
-require "formula"
-
 class Subliminal < Formula
   homepage "https://subliminal.readthedocs.org"
-  url "https://github.com/Diaoul/subliminal/archive/0.7.4.tar.gz"
-  sha1 "1aa91ed944bbf14793f0c7f689a336df75f467f7"
+  url "https://github.com/Diaoul/subliminal/archive/0.7.5.tar.gz"
+  sha256 "ade34adc8085feba51cf056410e38bea0042e5956732e430baa5295e6522daa1"
 
   bottle do
     cellar :any
@@ -15,93 +13,111 @@ class Subliminal < Formula
 
   depends_on :python if MacOS.version <= :snow_leopard
 
-  resource "charade" do
-    url "https://pypi.python.org/packages/source/c/charade/charade-1.0.3.tar.gz"
-    sha1 "6bf65ae4b60d13e89bd7afe1704eef5bd0b787bc"
+  resource "requests" do
+    url "https://pypi.python.org/packages/source/r/requests/requests-2.6.0.tar.gz"
+    sha256 "1cdbed1f0e236f35ef54e919982c7a338e4fea3786310933d3a7887a04b74d75"
   end
 
-  # Don't upgrade >0.7.0 - Package incompatible with above.
-  resource "guessit" do
-    url "https://pypi.python.org/packages/source/g/guessit/guessit-0.6.2.tar.gz"
-    sha1 "74e09f1821ef0df85b55355e22c9651db397e2f5"
+  resource "argparse" do
+    url "https://pypi.python.org/packages/source/a/argparse/argparse-1.3.0.tar.gz"
+    sha256 "b3a79a23d37b5a02faa550b92cbbbebeb4aa1d77e649c3eb39c19abf5262da04"
   end
 
-  resource "six" do
-    url "https://pypi.python.org/packages/source/s/six/six-1.8.0.tar.gz"
-    sha1 "aa3b0659cbc85c6c7a91efc51f2d1007040070cd"
+  resource "babelfish" do
+    url "https://pypi.python.org/packages/source/b/babelfish/babelfish-0.5.4.tar.gz"
+    sha256 "6e4f41f185b30b81232589c10b059546f3320cc440c5987f182ee82ab1778b47"
   end
 
-  resource "pysrt" do
-    url "https://pypi.python.org/packages/source/p/pysrt/pysrt-1.0.1.tar.gz"
-    sha1 "b31e5e407a34dfd5ca3b7a340b3379c47bfdd1ee"
+  resource "pip" do
+    url "https://pypi.python.org/packages/source/p/pip/pip-6.0.8.tar.gz"
+    sha256 "0d58487a1b7f5be2e5e965c11afbea1dc44ecec8069de03491a4d0d6c85f4551"
   end
 
-  resource "html5lib" do
-    url "https://pypi.python.org/packages/source/h/html5lib/html5lib-0.999.tar.gz"
-    sha1 "bc30bb7132c06d9241a672f40b3ade32d7eab12d"
+  resource "pbr" do
+    url "https://pypi.python.org/packages/source/p/pbr/pbr-0.10.8.tar.gz"
+    sha256 "a741650c697abe9dd3da00039a57a45a15a6eed017a16f6b7e4c0161fae2b4b2"
   end
 
-  resource "enzyme" do
-    url "https://pypi.python.org/packages/source/e/enzyme/enzyme-0.4.1.tar.gz"
-    sha1 "7f798c481d292fe3a9f7d0a07a8cd661e9c6d8af"
+  resource "six" do
+    url "https://pypi.python.org/packages/source/s/six/six-1.9.0.tar.gz"
+    sha256 "e24052411fc4fbd1f672635537c3fc2330d9481b18c0317695b46259512c91d5"
   end
 
   resource "chardet" do
     url "https://pypi.python.org/packages/source/c/chardet/chardet-2.3.0.tar.gz"
-    sha1 "50af8f8771ecbeb7a22567129c6c281b8bec3b1c"
+    sha256 "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"
+  end
+
+  resource "pysrt" do
+    url "https://pypi.python.org/packages/source/p/pysrt/pysrt-1.0.1.tar.gz"
+    sha256 "5300a1584c8d15a1c49ef8880fa1ef7a4274ce3f24dde83ad581d12d875f6784"
   end
 
   resource "dogpile.core" do
     url "https://pypi.python.org/packages/source/d/dogpile.core/dogpile.core-0.4.1.tar.gz"
-    sha1 "68365e1ee870a55cb4a09a30ea4cafb0d264aecb"
+    sha256 "be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9dbed76"
   end
 
-  resource "requests" do
-    url "https://pypi.python.org/packages/source/r/requests/requests-2.4.3.tar.gz"
-    sha1 "411f1bfa44556f7dd0f34cd822047c31baa7d741"
+  resource "dogpile.cache" do
+    url "https://pypi.python.org/packages/source/d/dogpile.cache/dogpile.cache-0.5.6.tar.gz"
+    sha256 "f80544c5555f66cf7b5fc99f15431f3b35f78009bc6b03b58fe1724236bbc57b"
   end
 
-  # Don't upgrade >0.5.0 - Package incompatible with above.
-  resource "babelfish" do
-    url "https://pypi.python.org/packages/source/b/babelfish/babelfish-0.4.0.tar.gz"
-    sha1 "646bbeb8b8df1936c34ad693f7bba6c192a77ded"
+  resource "charade" do
+    url "https://pypi.python.org/packages/source/c/charade/charade-1.0.3.tar.gz"
+    sha256 "a607146d151005904f3fd8335e3dc89af214453f0d3a29580e1eb0e67e6c3d7f"
   end
 
   resource "beautifulsoup4" do
     url "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.2.tar.gz"
-    sha1 "8ff340de807ae5038bd4e6cc1b1e5b6c16d49ed0"
+    sha256 "a2b29bd048ca2fe54a046b29770964738872a9747003a371344a93eedf7ad58e"
   end
 
-  resource "dogpile.cache" do
-    url "https://pypi.python.org/packages/source/d/dogpile.cache/dogpile.cache-0.5.4.tar.gz"
-    sha1 "bc1dff9b2f1bbe2a09ca5e16d0d160a730ef8732"
+  resource "enzyme" do
+    url "https://pypi.python.org/packages/source/e/enzyme/enzyme-0.4.1.tar.gz"
+    sha256 "f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb"
+  end
+
+  resource "html5lib" do
+    url "https://pypi.python.org/packages/source/h/html5lib/html5lib-0.999.tar.gz"
+    sha256 "c3887f7e2875d7666107fa8bee761ff95b9391acdcc7cd1b5fd57a23b5fbc49e"
+  end
+
+  resource "stevedore" do
+    url "https://pypi.python.org/packages/source/s/stevedore/stevedore-1.3.0.tar.gz"
+    sha256 "beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5"
   end
 
   resource "python-dateutil" do
-    url "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.2.tar.gz"
-    sha1 "fbafcd19ea0082b3ecb17695b4cb46070181699f"
+    url "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.4.1.tar.gz"
+    sha256 "23fd0a7c228d9c298c562245290a3f82999586c87aae71250f95f9894cb22c7c"
   end
 
-  resource "colorlog" do
-    url "https://pypi.python.org/packages/source/c/colorlog/colorlog-2.4.0.tar.gz"
-    sha1 "30b4a621ec372ba4ab367cb5446a4a4293f6e9ed"
+  resource "guessit" do
+    url "https://pypi.python.org/packages/source/g/guessit/guessit-0.9.4.tar.gz"
+    sha256 "88689713946faad4ae12467dff40a8f3daa629200328fbc5256093e96b1b0d19"
   end
 
   def install
-    ENV.prepend_create_path "PYTHONPATH", "#{libexec}/lib/python2.7/site-packages"
-    %w[six charade guessit pysrt html5lib enzyme chardet dogpile.core requests babelfish beautifulsoup4 dogpile.cache python-dateutil colorlog].each do |r|
-      resource(r).stage do
-        system "python", "setup.py", "install", "--prefix=#{libexec}", "--record=installed.txt"
+    ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
+    resources.each do |r|
+      r.stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
       end
     end
 
-    ENV.prepend_create_path "PYTHONPATH", "#{lib}/python2.7/site-packages"
-    system "python", "setup.py", "install", "--prefix=#{prefix}",
-           "--single-version-externally-managed", "--record=installed.txt"
-    bin.env_script_all_files(libexec+"bin", :PYTHONPATH => ENV["PYTHONPATH"])
+    # dogpile is a namespace package and .pth files aren't read from our
+    # vendor site-packages
+    touch libexec/"vendor/lib/python2.7/site-packages/dogpile/__init__.py"
+
+    ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python2.7/site-packages"
+    system "python", *Language::Python.setup_install_args(libexec)
+    bin.install Dir[libexec/"bin/*"]
+    bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end
 
   test do
+    mkdir_p "#{ENV["HOME"]}/.config"
     system "#{bin}/subliminal", "-l", "en", "--", "The.Big.Bang.Theory.S05E18.HDTV.x264-LOL.mp4"
   end
 end