From 38810796ba4d261958c60e4ce8c1652358fc2e60 Mon Sep 17 00:00:00 2001 From: JoeLametta Date: Sat, 27 Aug 2016 17:33:18 +0200 Subject: [PATCH] Remove thomasvs' python-deps (#31) * Crude removal of thomasvs' python-deps * Fix previous commit --- .gitmodules | 3 -- bin/rip.in | 7 ---- morituri/common/Makefile.am | 1 - morituri/common/deps.py | 75 ------------------------------------- morituri/extern/Makefile.am | 8 ---- morituri/extern/deps | 1 - morituri/extern/python-deps | 1 - morituri/rip/main.py | 5 --- 8 files changed, 101 deletions(-) delete mode 100644 morituri/common/deps.py delete mode 120000 morituri/extern/deps delete mode 160000 morituri/extern/python-deps diff --git a/.gitmodules b/.gitmodules index 27ca16e..59e679e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "morituri/extern/flog"] path = morituri/extern/flog url = git://github.com/Flumotion/flog -[submodule "morituri/extern/python-deps"] - path = morituri/extern/python-deps - url = git://github.com/thomasvs/python-deps diff --git a/bin/rip.in b/bin/rip.in index 6f7cccf..7dac0ab 100755 --- a/bin/rip.in +++ b/bin/rip.in @@ -33,10 +33,6 @@ and assure it doesn't raise an exception. h = None try: - from morituri.common import deps - from morituri.extern.deps import deps as edeps - h = deps.DepsHandler() - h.validate() from morituri.rip import main sys.exit(main.main(sys.argv[1:])) except ImportError, e: @@ -45,6 +41,3 @@ except ImportError, e: raise h.handleImportError(e) sys.exit(1) -except edeps.DependencyError: - sys.stderr.write('rip: please fix the dependency and try again.\n') - sys.exit(1) diff --git a/morituri/common/Makefile.am b/morituri/common/Makefile.am index 14c8c95..2a8e4cb 100644 --- a/morituri/common/Makefile.am +++ b/morituri/common/Makefile.am @@ -9,7 +9,6 @@ morituri_PYTHON = \ cache.py \ common.py \ config.py \ - deps.py \ directory.py \ drive.py \ encode.py \ diff --git a/morituri/common/deps.py b/morituri/common/deps.py deleted file mode 100644 index e99aa53..0000000 --- a/morituri/common/deps.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- Mode: Python -*- -# vi:si:et:sw=4:sts=4:ts=4 - -import os -import urllib - -from morituri.extern.deps import deps - - -class DepsHandler(deps.DepsHandler): - - def __init__(self, name='morituri'): - deps.DepsHandler.__init__(self, name) - - self.add(GStPython()) - self.add(CDDB()) - self.add(SetupTools()) - self.add(PyCDIO()) - - def report(self, summary): - reporter = os.environ.get('EMAIL_ADDRESS', None) - get = "summary=%s" % urllib.quote(summary) - if reporter: - get += "&reporter=%s" % urllib.quote(reporter) - return 'http://thomas.apestaart.org/morituri/trac/newticket?' + get - - -class GStPython(deps.Dependency): - module = 'gst' - name = "GStreamer Python bindings" - homepage = "http://gstreamer.freedesktop.org" - - def Fedora_install(self, distro): - return self.Fedora_yum('gstreamer-python') - - #def Ubuntu_install(self, distro): - # pass - - -class CDDB(deps.Dependency): - module = 'CDDB' - name = "python-CDDB" - homepage = "http://cddb-py.sourceforge.net/" - - def Fedora_install(self, distro): - return self.Fedora_yum('python-CDDB') - - def Ubuntu_install(self, distro): - return self.Ubuntu_apt('python-cddb') - - -class SetupTools(deps.Dependency): - module = 'pkg_resources' - name = "python-setuptools" - homepage = "http://pypi.python.org/pypi/setuptools" - - def Fedora_install(self, distro): - return self.Fedora_yum('python-setuptools') - - -class PyCDIO(deps.Dependency): - - module = 'pycdio' - name = "pycdio" - homepage = "http://www.gnu.org/software/libcdio/" - egg = 'pycdio' - - def Fedora_install(self, distro): - return self.Fedora_yum('pycdio') - - def validate(self): - version = self.version() - if version == '0.18': - return '''pycdio 0.18 does not work. -See http://savannah.gnu.org/bugs/?38185''' diff --git a/morituri/extern/Makefile.am b/morituri/extern/Makefile.am index 68bdce4..b592595 100644 --- a/morituri/extern/Makefile.am +++ b/morituri/extern/Makefile.am @@ -18,14 +18,6 @@ command_PYTHON = \ command/__init__.py \ command/command.py -depsdir = $(PYTHONLIBDIR)/morituri/extern/deps - -deps_PYTHON = \ - deps/__init__.py \ - deps/deps.py \ - deps/distro.py - - taskdir = $(PYTHONLIBDIR)/morituri/extern/task task_PYTHON = \ diff --git a/morituri/extern/deps b/morituri/extern/deps deleted file mode 120000 index 1beefc1..0000000 --- a/morituri/extern/deps +++ /dev/null @@ -1 +0,0 @@ -python-deps/deps \ No newline at end of file diff --git a/morituri/extern/python-deps b/morituri/extern/python-deps deleted file mode 160000 index 48b505a..0000000 --- a/morituri/extern/python-deps +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 48b505ab5a10037d50d03311f15f8a3a8aab75ed diff --git a/morituri/rip/main.py b/morituri/rip/main.py index 5523ffa..3693636 100644 --- a/morituri/rip/main.py +++ b/morituri/rip/main.py @@ -29,11 +29,6 @@ def main(argv): log.debug('mapping distributions %r', distributions) map(pkg_resources.working_set.add, distributions) - # validate dependencies - from morituri.common import deps - h = deps.DepsHandler() - h.validate() - # set user agent import musicbrainzngs musicbrainzngs.set_useragent("morituri", configure.version,