Control: retitle -1 unblock: distro-info-data/0.49
And we have unrelated change, tweaking Ubuntu EoL dates. With test
coverage:
distro-info-data (0.49) unstable; urgency=medium
.
* Move Ubuntu EoLs off weekends.
* Validate that Ubuntu EoLs occur during the week.
Updated debdiff against testing, attached.
unblock distro-info-data/0.49
SR
--
Stefano Rivera
http://tumbleweed.org.za/
+1 415 683 3272
diff -Nru distro-info-data-0.47/debian/changelog
distro-info-data-0.49/debian/changelog
--- distro-info-data-0.47/debian/changelog 2021-04-22 10:30:18.000000000
-0400
+++ distro-info-data-0.49/debian/changelog 2021-06-15 13:46:40.000000000
-0400
@@ -1,6 +1,21 @@
+distro-info-data (0.49) unstable; urgency=medium
+
+ * Move Ubuntu EoLs off weekends.
+ * Validate that Ubuntu EoLs occur during the week.
+
+ -- Stefano Rivera <stefa...@debian.org> Tue, 15 Jun 2021 13:46:40 -0400
+
+distro-info-data (0.48) unstable; urgency=medium
+
+ * Correct typo in changelog.
+ * Set a release date for Debian bullseye (and bookworm creation), based on
+ the release team's tentative estimate.
+
+ -- Stefano Rivera <stefa...@debian.org> Mon, 14 Jun 2021 17:47:09 -0400
+
distro-info-data (0.47) unstable; urgency=medium
- * Add Ubuntu 21.04, Impish Indri.
+ * Add Ubuntu 21.10, Impish Indri.
-- Stefano Rivera <stefa...@debian.org> Thu, 22 Apr 2021 10:30:18 -0400
diff -Nru distro-info-data-0.47/debian.csv distro-info-data-0.49/debian.csv
--- distro-info-data-0.47/debian.csv 2021-04-22 10:30:18.000000000 -0400
+++ distro-info-data-0.49/debian.csv 2021-06-15 13:46:40.000000000 -0400
@@ -14,8 +14,8 @@
8,Jessie,jessie,2013-05-04,2015-04-25,2018-06-17,2020-06-30,2022-06-30
9,Stretch,stretch,2015-04-25,2017-06-17,2020-07-06,2022-06-30
10,Buster,buster,2017-06-17,2019-07-06,2022-07-06,2024-06-30
-11,Bullseye,bullseye,2019-07-06
-12,Bookworm,bookworm,2021-08-01
+11,Bullseye,bullseye,2019-07-06,2021-07-31,2024-07-31
+12,Bookworm,bookworm,2021-07-31
13,Trixie,trixie,2023-08-01
,Sid,sid,1993-08-16
,Experimental,experimental,1993-08-16
diff -Nru distro-info-data-0.47/ubuntu.csv distro-info-data-0.49/ubuntu.csv
--- distro-info-data-0.47/ubuntu.csv 2021-04-22 10:30:18.000000000 -0400
+++ distro-info-data-0.49/ubuntu.csv 2021-06-15 13:46:40.000000000 -0400
@@ -22,7 +22,7 @@
14.10,Utopic Unicorn,utopic,2014-04-17,2014-10-23,2015-07-23
15.04,Vivid Vervet,vivid,2014-10-23,2015-04-23,2016-02-04
15.10,Wily Werewolf,wily,2015-04-23,2015-10-22,2016-07-28
-16.04 LTS,Xenial
Xerus,xenial,2015-10-22,2016-04-21,2021-04-21,2021-04-21,2024-04-21
+16.04 LTS,Xenial
Xerus,xenial,2015-10-22,2016-04-21,2021-04-21,2021-04-21,2024-04-23
16.10,Yakkety Yak,yakkety,2016-04-21,2016-10-13,2017-07-20
17.04,Zesty Zapus,zesty,2016-10-13,2017-04-13,2018-01-13
17.10,Artful Aardvark,artful,2017-04-13,2017-10-19,2018-07-19
@@ -32,5 +32,5 @@
19.10,Eoan Ermine,eoan,2019-04-18,2019-10-17,2020-07-17
20.04 LTS,Focal
Fossa,focal,2019-10-17,2020-04-23,2025-04-23,2025-04-23,2030-04-23
20.10,Groovy Gorilla,groovy,2020-04-23,2020-10-22,2021-07-22
-21.04,Hirsute Hippo,hirsute,2020-10-22,2021-04-22,2022-01-22
+21.04,Hirsute Hippo,hirsute,2020-10-22,2021-04-22,2022-01-20
21.10,Impish Indri,impish,2021-04-22,2021-10-14,2022-07-14
diff -Nru distro-info-data-0.47/validate-csv-data
distro-info-data-0.49/validate-csv-data
--- distro-info-data-0.47/validate-csv-data 2021-04-22 10:30:18.000000000
-0400
+++ distro-info-data-0.49/validate-csv-data 2021-06-15 13:46:40.000000000
-0400
@@ -21,6 +21,7 @@
import csv
import sys
+from datetime import date
from lib.tools import convert_date, main
@@ -142,6 +143,17 @@
)
error(filename, csvreader.line_num, msg, date1, date2)
failures += 1
+ # Check that Ubuntu EOL lands on a weekday
+ if distro == 'ubuntu':
+ for column, eol_date in row.items():
+ if not column.startswith('eol'):
+ continue
+ if not eol_date:
+ continue
+ if eol_date.weekday() > 5 and eol_date >= date(2021, 1, 1):
+ msg = '%s for %s lands on a weekend (%s)'
+ error(filename, csvreader.line_num, msg, column,
+ row['codename'], date)
return failures == 0
