From 2fdb00f7fda0b7b67fc23cee36818dc5bb0743ec Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Sep 29 2017 21:31:29 +0000 Subject: no Alpha for release schedule, drop the schedule --- diff --git a/build.d/build.py b/build.d/build.py index c88a05a..9806c36 100755 --- a/build.d/build.py +++ b/build.d/build.py @@ -148,40 +148,6 @@ def process_dir(dirpath, filenames): feedparse(feedurl[0]) continue; release_date = None - if schedule is not None: - release_date = schedule(globalvar.release['next_id']) - - # We need to localize the date format. First, set locale to the original format - locale.setlocale(locale.LC_ALL, 'en_US') - - # Then convert to time_struct - alpha = time.strptime(release_date[globalvar.release['next_id']]['alpha'], "%Y-%b-%d") - beta = time.strptime(release_date[globalvar.release['next_id']]['beta'], "%Y-%b-%d") - final = time.strptime(release_date[globalvar.release['next_id']]['final'], "%Y-%b-%d") - - # Stort the US format for further processing - alpha_us = time.strftime("%Y-%b-%d", alpha) - beta_us = time.strftime("%Y-%b-%d", beta) - final_us = time.strftime("%Y-%b-%d", final) - - # Let's slice the US date for the calendar png - - beta_cal = beta_us[-2:] - final_cal = final_us[-2:] - - # Move to the right locale (if known) - try: - locale.setlocale(locale.LC_ALL, locale.locale_alias[options.lang.lower()]) - except: - pass - - # Convert back! - alpha = convert_date(alpha) - beta = convert_date(beta) - final = convert_date(final) - - locale.setlocale(locale.LC_ALL, 'en_US') - release_date = {'alpha':alpha, 'beta':beta, 'final':final, 'alpha_us':alpha_us, 'beta_us':beta_us, 'final_us':final_us, 'beta_cal':beta_cal, 'final_cal':final_cal} ec2 = None if get_amis is not None: diff --git a/getfedora.org/build/release_schedule.py b/getfedora.org/build/release_schedule.py index 0c2e159..34849fb 100755 --- a/getfedora.org/build/release_schedule.py +++ b/getfedora.org/build/release_schedule.py @@ -16,13 +16,12 @@ def parse(cache, r): root = etree.fromstring(cache) date={} - alpha_release = root.xpath('//task[@id="f' + r + '.TestingPhase.alpha.alpha_drop"]/taskScenario/start/@humanReadable') beta_release = root.xpath('//task[@id="f' + r + '.TestingPhase.beta.beta_drop"]/taskScenario/start/@humanReadable') final_release = root.xpath('//task[@id="f' + r + '.LaunchPhase.final"]/taskScenario/start/@humanReadable') try: - date[r] = {'alpha':alpha_release[0], 'beta':beta_release[0], 'final':final_release[0]} + date[r] = {'beta':beta_release[0], 'final':final_release[0]} return date except IndexError: return {} @@ -52,11 +51,11 @@ def schedule(release): try: u = urllib2.urlopen('http://fedorapeople.org/groups/schedule/f-' + release + '/f-' + release + '-key-milestones.tjx') except HTTPError: - date[release] = {'alpha':'2014-jan-01', 'beta':'2014-jan-01', 'final':'2014-jan-01'} + date[release] = {'beta':'2014-jan-01', 'final':'2014-jan-01'} return date except URLError: - date[release] = {'alpha':'2014-jan-01', 'beta':'2014-jan-01', 'final':'2014-jan-01'} + date[release] = {'beta':'2014-jan-01', 'final':'2014-jan-01'} return date # Release is already present in date if we got HTTPError diff --git a/getfedora.org/data/content/server/prerelease/index.html b/getfedora.org/data/content/server/prerelease/index.html index 34d1e06..36102ca 100644 --- a/getfedora.org/data/content/server/prerelease/index.html +++ b/getfedora.org/data/content/server/prerelease/index.html @@ -36,28 +36,6 @@

${_('When is Fedora %s going to be released?') % global_variables.release['next_id']}

- - - - - - - - - - - - - - - - - - - - - -
${_('Release State')}${_('Release Date')}
${_('Alpha Release Public Availability')}${schedule['alpha']}
${_('Beta Release Public Availability')}${schedule['beta']}
${_('Final Release Public Availability (GA)')}${schedule['final']}
${_('Read all the key milestones of the release schedule...')}

${_('Verify your Image')}

diff --git a/getfedora.org/data/content/workstation/prerelease/index.html b/getfedora.org/data/content/workstation/prerelease/index.html index 2149161..e547c72 100644 --- a/getfedora.org/data/content/workstation/prerelease/index.html +++ b/getfedora.org/data/content/workstation/prerelease/index.html @@ -53,28 +53,6 @@

${_('When is Fedora %s going to be released?') % global_variables.release['next_id']}

- - - - - - - - - - - - - - - - - - - - - -
${_('Release State')}${_('Release Date')}
${_('Alpha Release Public Availability')}${schedule['alpha']}
${_('Beta Release Public Availability')}${schedule['beta']}
${_('Final Release Public Availability (GA)')}${schedule['final']}
${_('Read all the key milestones of the release schedule...')}