Remove source package validator queue experiment

3 files changed, 0 insertions, 77 deletions

diff --git a/calm/calm.py b/calm/calm.py
index 889204b..b43f65d 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -71,7 +71,6 @@ from . import irk
 from . import maintainers
 from . import package
 from . import pkg2html
-from . import queue
 from . import setup_exe
 from . import uploads
 from . import utils
@@ -161,9 +160,6 @@ def process_uploads(args, state):
                     skip_maintainer = True
                     continue
 
-                # queue for source package validator
-                queue.add(args, scan_result[arch].to_relarea, os.path.join(m.homedir()))
-
             # if there are no added or removed files for this maintainer, we
             # don't have anything to do
             if not any([scan_result[a].to_relarea or scan_result[a].to_vault for a in scan_result]):
@@ -664,7 +660,6 @@ def main():
     setupdir_default = common_constants.HTDOCS
     vault_default = common_constants.VAULT
     logdir_default = '/sourceware/cygwin-staging/logs'
-    queuedir_default = '/sourceware/cygwin-staging/queue'
 
     parser = argparse.ArgumentParser(description='Upset replacement')
     parser.add_argument('-d', '--daemon', action='store', nargs='?', const=pidfile_default, help="daemonize (PIDFILE defaults to " + pidfile_default + ")", metavar='PIDFILE')
@@ -676,7 +671,6 @@ def main():
     parser.add_argument('--logdir', action='store', metavar='DIR', help="log directory (default: '" + logdir_default + "')", default=logdir_default)
     parser.add_argument('--orphanmaint', action='store', metavar='NAMES', help="orphan package maintainers (default: '" + orphanmaint_default + "')", default=orphanmaint_default)
     parser.add_argument('--pkglist', action='store', metavar='FILE', help="package maintainer list (default: " + pkglist_default + ")", default=pkglist_default)
-    parser.add_argument('--queuedir', action='store', nargs='?', metavar='DIR', help="queue directory (default: '" + queuedir_default + "')", const=queuedir_default)
     parser.add_argument('--release', action='store', help='value for setup-release key (default: cygwin)', default='cygwin')
     parser.add_argument('--releasearea', action='store', metavar='DIR', help="release directory (default: " + relarea_default + ")", default=relarea_default, dest='rel_area')
     parser.add_argument('--setupdir', action='store', metavar='DIR', help="setup executable directory (default: " + setupdir_default + ")", default=setupdir_default)
diff --git a/calm/queue.py b/calm/queue.py
deleted file mode 100644
index 94ad04c..0000000
--- a/calm/queue.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2016 Jon Turney
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-
-import logging
-import os
-import re
-
-from . import uploads
-
-QUEUE = 'package_queue'
-
-
-#
-#
-#
-
-def add(args, movelist, fromdir):
-    if not getattr(args, 'queuedir', None):
-        return
-
-    queue_root = os.path.join(args.queuedir, 'dirq')
-    upload_root = os.path.join(args.queuedir, 'uploads')
-
-    from dirq.QueueSimple import QueueSimple
-    dirq = QueueSimple(os.path.join(queue_root, QUEUE))
-
-    # clean up empty directories
-    dirq.purge()
-    os.system('find %s -depth -mindepth 1 -type d -empty -delete' % upload_root)
-
-    # are there any source packages in the filelist?
-    srcpkgs = []
-    for p in movelist:
-        for f in movelist[p]:
-            if re.search(r'-src.tar.(bz2|gz|lzma|xz)$', f):
-                srcpkgs.append(os.path.join(p, f))
-
-    # if so...
-    #
-    # XXX: really this should break things up into the set of files for each
-    # source file
-    if len(srcpkgs) >= 1:
-        # keep all the files for comparison
-        uploads.copy(args, movelist, fromdir, upload_root)
-
-        # queue any srcpkgs
-        for p in srcpkgs:
-            if not args.dryrun:
-                logging.debug("queuing source package %s for validation" % (p))
-                dirq.add(p)
diff --git a/requirements.txt b/requirements.txt
index 2363fcf..3e80396 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-dirq
 flake8
 flake8-blind-except
 flake8-bugbear ; python_version >= "3.5"