From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E8FF139696 for ; Fri, 3 Mar 2017 23:50:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCF8121C08D; Fri, 3 Mar 2017 23:50:56 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9FBD421C08D for ; Fri, 3 Mar 2017 23:50:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC5A3341789 for ; Fri, 3 Mar 2017 23:50:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11D735B78 for ; Fri, 3 Mar 2017 23:50:54 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1488575018.a92c21c23496c06f0a7056f37db8d8f097f8aa1f.leio@gentoo> Subject: [gentoo-commits] proj/gentoo-bumpchecker:master commit in: modules/ X-VCS-Repository: proj/gentoo-bumpchecker X-VCS-Files: modules/gnome_module.py X-VCS-Directories: modules/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: a92c21c23496c06f0a7056f37db8d8f097f8aa1f X-VCS-Branch: master Date: Fri, 3 Mar 2017 23:50:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9addc3db-efd9-43e9-8934-61ac3571c6bf X-Archives-Hash: 448c157a8a47e9c617e790fd3bc94e57 commit: a92c21c23496c06f0a7056f37db8d8f097f8aa1f Author: Mart Raudsepp gentoo org> AuthorDate: Fri Mar 3 21:02:35 2017 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Fri Mar 3 21:03:38 2017 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-bumpchecker.git/commit/?id=a92c21c2 gnome: Remove some old scraping related code we won't need gnome includes a JSON file for each package with all the versions that many other tools rely on now, so we won't need full scraping again modules/gnome_module.py | 103 ------------------------------------------------ 1 file changed, 103 deletions(-) diff --git a/modules/gnome_module.py b/modules/gnome_module.py index 911391a..062fed7 100644 --- a/modules/gnome_module.py +++ b/modules/gnome_module.py @@ -34,10 +34,6 @@ class GNOME: self.gnome_release = ".".join(gnome_release_list[:2]) self.ftpserver = "download.gnome.org" - self.release_directories = ["admin/" + self.major_release + "/" + self.full_release + "/", - "platform/" + self.major_release + "/" + self.full_release + "/", - "desktop/" + self.major_release + "/" + self.full_release + "/", - "bindings/" + self.major_release + "/" + self.full_release + "/"] self.latest_versions_file_path = 'http://www.gnome.org/~vuntz/tmp/versions/' self.latest_versions_url = self.latest_versions_file_path + 'versions-' + self.gnome_release self.release_versions_file_path = 'https://download.gnome.org/teams/releng/' @@ -71,105 +67,6 @@ class GNOME: def generate_data_release(self): return self.generate_data_from_versions_markup(self.release_versions_file_path + self.full_release + '/versions') - """ We might want to modify this later to an extra fallback and/or for non-official modules whose tarballs are hosted on GNOME or compatible FTP - def generate_data_ftp(self): - # Deprecated: connect to ftp and get the list of all the packages in the release directories - walker = ftp_module.FTPWalker(self.ftpserver,"anonymous","test@test.com") - - files = [] - for directory in self.release_directories: - f_files = ftp_module.find_files(walker, directory,"","") - files.extend(f_files) - - # filter out bad files - files = self.filter_files(files) - - # create package objects for the files - release_packages = [] # the packages that are required for a release - for package_name in files: - release_package = package_module.Package(package_name) - release_packages.append(release_package) - - # while connected, find out the latest version of the packages that we found in the - # release directories - latest_packages = [] # the latest versions of packages on the gnome ftp. - for package in release_packages: - file_list = ftp_module.find_files(walker, "pub/GNOME/sources" + "/" + package.raw_name + "/" + package.major_minor,"","") - - # if maintainers release tarballs late, they will not get picked up - # therefore, if the tarball is 1 less than the y of the x.y you - # specify, lets also check to see if there are any files for - # the actual release number. - major = package.major_minor.split(".")[0] - minor = package.major_minor.split(".")[1] - options = clioptions_module.Options() - args = options.get_arguments() - release_minor = args.release_number.split(".")[1] - - if int(minor) == (int(release_minor) -1): - file_list_future = ftp_module.find_files(walker, "pub/GNOME/sources" + "/" + package.raw_name + "/" + major + "." + str(int(minor)+1),"","") - - # if there are results, replace the old list. - if len(file_list_future) > 0: - file_list = file_list_future - elif self.nextrev == True: - # Try to find minor+1 - file_list_future = ftp_module.find_files(walker, "pub/GNOME/sources" + "/" + package.raw_name + "/" + major + "." + str(int(minor)+1),"","") - - # if there are results, replace the old list. - if len(file_list_future) > 0: - file_list = file_list_future - - # make sure we don't try to do this on directories with no files, - # or on directories that don't exist - - # create package objects for the files - if len(file_list) > 0: - latest = self.filter_latest_only(file_list) - latest_package = package_module.Package(package.name + "-" + latest) - latest_packages.append(latest_package) - - # disconnect from the ftp - - # cache the results - cache = simple_cache_module.SimpleCache() - for release_package in release_packages: - latest_package = portage_module.findpackage(release_package.name, latest_packages) - if latest_package != None: - cache.write_to_queue(release_package.name_plus_version_plus_revision, latest_package.name_plus_version_plus_revision) - else: - print "No matching latest package!" + str(release_package.name) - cache.flush_queue() - - return (release_packages, latest_packages) - """ - - def filter_files(self, files): - # we want to filter out all the bad files. - newfiles = [] - for file in files: - # only keep files with .tar.bz2 ending. - if 0 < file.find(".tar.") and 0 < file.find(".bz2"): - file = file.replace(".tar.bz2", "") - newfiles.append(file) - - return newfiles - - # this needs to be fixed so that if a directory doesn't have LATEST-IS-, it returns an error - def filter_latest_only(self, lines): - latest_string = "LATEST-IS-" - latest = "" - for item in lines: - if 0 <= item.string.rfind(latest_string): - latest = item - - try: - return_latest = latest[10:] - except: - return_latest = "" - - return return_latest - import portage_module def compare_packages(release_packages, latest_packages, packages_in_portage): # we care about 5 cases