[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1869982 - in /subversion/trunk/tools/dist: release-lines.yaml release.py
From:       julianfoad () apache ! org
Date:       2019-11-18 17:00:16
Message-ID: 20191118170016.830ED17A001 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: julianfoad
Date: Mon Nov 18 17:00:16 2019
New Revision: 1869982

URL: http://svn.apache.org/viewvc?rev=1869982&view=rev
Log:
Move release-lines metadata out of 'release.py' into a separate YAML file.

* tools/dist/release-lines.yaml
  New.

* tools/dist/release.py
  (tool_versions,
   recommended_release,
   supported_release_lines,
   lts_release_lines): Read from 'release-lines.yaml'.

Added:
    subversion/trunk/tools/dist/release-lines.yaml   (with props)
Modified:
    subversion/trunk/tools/dist/release.py

Added: subversion/trunk/tools/dist/release-lines.yaml
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release-lines.yaml?rev=1869982&view=auto
 ==============================================================================
--- subversion/trunk/tools/dist/release-lines.yaml (added)
+++ subversion/trunk/tools/dist/release-lines.yaml Mon Nov 18 17:00:16 2019
@@ -0,0 +1,29 @@
+# This file specifies metadata that may vary between release lines, that
+# is usually common to all releases in a release line, for all potentially
+# interesting release lines.
+---
+tool_versions:
+  '1.8':
+    autoconf: ['2.69', \
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'] +    libtool: \
['2.4.3', '36b4881c1843d7585de9c66c4c3d9a067ed3a3f792bc670beba21f5a4960acdf'] +    \
swig: ['2.0.9', '586954000d297fafd7e91d1ad31089cc7e249f658889d11a44605d3662569539'] + \
'1.9': +    autoconf: ['2.69', \
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'] +    libtool: \
['2.4.6', 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'] +    \
swig: ['2.0.12', '65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7'] \
+  '1.10': &TOOL_VERSIONS_1_10 +    autoconf: ['2.69', \
'954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'] +    libtool: \
['2.4.6', 'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'] +    \
swig: ['3.0.12', '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'] \
+  '1.11': *TOOL_VERSIONS_1_10 +  '1.12': *TOOL_VERSIONS_1_10
+  '1.13': *TOOL_VERSIONS_1_10
+  'trunk': *TOOL_VERSIONS_1_10
+
+# The version that is our current recommended release
+recommended_release: '1.13'
+# For clean-dist, a whitelist of artifacts to keep, by version.
+supported_release_lines: ['1.9', '1.10', '1.13']
+# Long-Term Support (LTS) versions
+lts_release_lines: ['1.9', '1.10', '1.14']
+

Propchange: subversion/trunk/tools/dist/release-lines.yaml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1869982&r1=1869981&r2=1869982&view=diff
 ==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Nov 18 17:00:16 2019
@@ -55,6 +55,7 @@ import itertools
 import subprocess
 import argparse       # standard in Python 2.7
 import io
+import yaml
 
 import backport.status
 
@@ -70,43 +71,22 @@ except ImportError:
     sys.path.remove(ezt_path)
 
 
+def get_dist_metadata_file_path():
+    return os.path.join(os.path.abspath(sys.path[0]), 'release-lines.yaml')
+
+# Read the dist metadata (about release lines)
+with open(get_dist_metadata_file_path(), 'r') as stream:
+    dist_metadata = yaml.load(stream)
+
 # Our required / recommended release tool versions by release branch
-tool_versions = {}
-tool_versions['1.8'] = {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.3',
-            '36b4881c1843d7585de9c66c4c3d9a067ed3a3f792bc670beba21f5a4960acdf'],
-            'swig'     : ['2.0.9',
-            '586954000d297fafd7e91d1ad31089cc7e249f658889d11a44605d3662569539'],
-  }
-tool_versions['1.9'] = {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.6',
-            'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
-            'swig'     : ['2.0.12',
-            '65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7'],
-  }
-tool_versions['1.10'] = {
-            'autoconf' : ['2.69',
-            '954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969'],
-            'libtool'  : ['2.4.6',
-            'e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3'],
-            'swig'     : ['3.0.12',
-            '7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d'],
-  }
-tool_versions['1.11'] = tool_versions['1.10']
-tool_versions['1.12'] = tool_versions['1.10']
-tool_versions['1.13'] = tool_versions['1.10']
-tool_versions['trunk'] = tool_versions['1.10']
+tool_versions = dist_metadata['tool_versions']
 
 # The version that is our current recommended release
-recommended_release = '1.13'
+recommended_release = dist_metadata['recommended_release']
 # For clean-dist, a whitelist of artifacts to keep, by version.
-supported_release_lines = frozenset({"1.9", "1.10", "1.13"})
+supported_release_lines = frozenset(dist_metadata['supported_release_lines'])
 # Long-Term Support (LTS) versions
-lts_release_lines = frozenset({"1.9", "1.10", "1.14"})
+lts_release_lines = frozenset(dist_metadata['lts_release_lines'])
 
 # Some constants
 svn_repos = os.getenv('SVN_RELEASE_SVN_REPOS',


[prev in list] [next in list] [prev in thread] [next in thread]