From 5e4b092c53ddb81514d859a74bbfb25fd1f2e45f Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 6 Sep 2023 09:33:12 +0200 Subject: [PATCH] Rename extra-atcs key to extra-acs We have agreed to use term Active Contrubitor rather then Active Technical Contributor, which means it's high time we've aligned naming in our tools and releases documentation to align on term to use. Moreover, it makes even more sense with Extra ACs, since these are designed for ones, who do not contribute in gerrit but with other means, which are usually non-technical. Needed-By: https://review.opendev.org/c/openstack/releases/+/893833 Needed-By: https://review.opendev.org/c/openstack/election/+/893810 Change-Id: Id9f2d182d93a9fbe1357e9ecd4814d49d6eb962f --- .zuul.yaml | 8 ++++---- doc/source/_exts/{atcs.py => acs.py} | 16 ++++++++-------- doc/source/_exts/teams.py | 6 +++--- doc/source/conf.py | 2 +- openstack_governance/projects_schema.yaml | 2 +- reference/sigs-repos.yaml | 2 +- tools/{validate_atcs.py => validate_acs.py} | 20 ++++++++++---------- tox.ini | 6 +++--- 8 files changed, 31 insertions(+), 31 deletions(-) rename doc/source/_exts/{atcs.py => acs.py} (91%) rename tools/{validate_atcs.py => validate_acs.py} (89%) diff --git a/.zuul.yaml b/.zuul.yaml index c952324f0..a20c3f6cc 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,12 +1,12 @@ - job: - name: openstack-tox-validate_atcs + name: openstack-tox-validate_acs parent: openstack-tox-linters description: | - Run the ATC checking to show if the current ATCs are still valid. + Run the AC checking to show if the current ACs are still valid. Foundation membership can change anytime, and we don't want our linter jobs to fail due to this, but we want to be informed at all times. vars: - tox_envlist: validate_atcs + tox_envlist: validate_acs - job: name: governance-validate-legacy @@ -28,7 +28,7 @@ check: jobs: - governance-validate-legacy - - openstack-tox-validate_atcs: + - openstack-tox-validate_acs: voting: false - openstack-tox-linters: required-projects: diff --git a/doc/source/_exts/atcs.py b/doc/source/_exts/acs.py similarity index 91% rename from doc/source/_exts/atcs.py rename to doc/source/_exts/acs.py index 0c72e2525..ccd95e5d5 100644 --- a/doc/source/_exts/atcs.py +++ b/doc/source/_exts/acs.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Show information about extra ATCs managed in this repo. +"""Show information about extra ACs managed in this repo. """ import operator @@ -27,8 +27,8 @@ import projects LOG = logging.getLogger(__name__) -class ExtraATCsTable(tables.Table): - """List the extra ATCs for the given project. +class ExtraACsTable(tables.Table): + """List the extra ACs for the given project. """ HEADERS = ('Full Name', 'Email', 'Expires In') @@ -47,7 +47,7 @@ class ExtraATCsTable(tables.Table): project = self.options.get('project') if not project: error = self.state_machine.reporter.error( - 'No project set for extra-atcs table', + 'No project set for extra-acs table', nodes.literal_block(self.block_text, self.block_text), line=self.lineno) return [error] @@ -71,9 +71,9 @@ class ExtraATCsTable(tables.Table): team_data = all_teams[project] except KeyError: raise ValueError('No project %r in projects.yaml' % (project,)) - project_members = team_data.get('extra-atcs', []) + project_members = team_data.get('extra-acs', []) - # If we have no extra ATCs, skip building the table. + # If we have no extra ACs, skip building the table. if not project_members: return [] @@ -139,5 +139,5 @@ _PATTERN = re.compile(r'(?P.+):\s+(?P.+)\s\((?P.+)\)\s\[(? def setup(app): - LOG.info('loading atcs extension') - app.add_directive('extraatcstable', ExtraATCsTable) + LOG.info('loading acs extension') + app.add_directive('extraacstable', ExtraACsTable) diff --git a/doc/source/_exts/teams.py b/doc/source/_exts/teams.py index f5fb0df7e..45f771409 100644 --- a/doc/source/_exts/teams.py +++ b/doc/source/_exts/teams.py @@ -123,10 +123,10 @@ def _team_to_rst(name, info): else: yield 'None' yield '' - if info.get('extra-atcs', []): - yield 'Extra ATCs' + if info.get('extra-acs', []): + yield 'Extra ACs' yield '-----------' - yield '.. extraatcstable::' + yield '.. extraacstable::' yield ' :project: %s' % name yield '' diff --git a/doc/source/conf.py b/doc/source/conf.py index 1f8a6711e..001b13f3f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -33,7 +33,7 @@ extensions = [ 'sphinx.ext.extlinks', 'sphinx.ext.todo', 'openstackdocstheme', - 'atcs', + 'acs', 'members', 'projects', 'teams', diff --git a/openstack_governance/projects_schema.yaml b/openstack_governance/projects_schema.yaml index 723951d4c..b9740cbbc 100644 --- a/openstack_governance/projects_schema.yaml +++ b/openstack_governance/projects_schema.yaml @@ -112,7 +112,7 @@ additionalProperties: - external deprecated: type: "string" - extra-atcs: + extra-acs: type: "array" items: type: "object" diff --git a/reference/sigs-repos.yaml b/reference/sigs-repos.yaml index dbbc70a79..a7a783d54 100644 --- a/reference/sigs-repos.yaml +++ b/reference/sigs-repos.yaml @@ -17,7 +17,7 @@ Hardware Vendor: - repo: openstack/sushy-oem-idrac i18n: - repo: openstack/i18n - extra-atcs: + extra-acs: - name: suhartono email: cloudsuhartono@gmail.com expires-in: Feb 2022 diff --git a/tools/validate_atcs.py b/tools/validate_acs.py similarity index 89% rename from tools/validate_atcs.py rename to tools/validate_acs.py index 92057d55c..14febbc5f 100755 --- a/tools/validate_atcs.py +++ b/tools/validate_acs.py @@ -114,24 +114,24 @@ def main(): exit_code = 0 for project_name, project_data in sorted(projects.items()): - atcs = project_data.get('extra-atcs', []) - for atc in atcs: + acs = project_data.get('extra-acs', []) + for ac in acs: try: - member = lookup_member(atc['email']) + member = lookup_member(ac['email']) except Exception as e: - print('ERROR: {}: Could not validate ATC {}: {}'.format( - project_name, atc, e)) + print('ERROR: {}: Could not validate AC {}: {}'.format( + project_name, ac, e)) else: if not member: - # NOTE(mnaser): The ATC membership checks were not - # enforced for all ATCs expiring before + # NOTE(mnaser): The AC membership checks were not + # enforced for all ACs expiring before # January 2020. This should be removed # after January 2020. - expires = datetime.strptime(atc['expires-in'], "%B %Y") + expires = datetime.strptime(ac['expires-in'], "%B %Y") if expires <= datetime(2020, 1, 1): - msg = 'Skipping {} from validation'.format(atc) + msg = 'Skipping {} from validation'.format(ac) else: - msg = 'Unable to find membership: {}'.format(atc) + msg = 'Unable to find membership: {}'.format(ac) exit_code = 1 print('{}: {}'.format(project_name, msg)) diff --git a/tox.ini b/tox.ini index c7f77c1d2..f51e986a7 100644 --- a/tox.ini +++ b/tox.ini @@ -47,10 +47,10 @@ allowlist_externals = commands = {toxinidir}/tools/validate-legacy.py -[testenv:validate_atcs] +[testenv:validate_acs] allowlist_externals = - {toxinidir}/tools/validate_atcs.py -commands = {toxinidir}/tools/validate_atcs.py + {toxinidir}/tools/validate_acs.py +commands = {toxinidir}/tools/validate_acs.py [testenv:pep8] commands =