From 74169d7f3a0c57d3c68c3fea451f2c198e8e9204 Mon Sep 17 00:00:00 2001 From: odscjen Date: Thu, 25 Jul 2024 16:34:04 +0100 Subject: [PATCH 1/6] minor text updates to sustainability.md and sustainability.yaml --- docs/cost/ids/sustainability.md | 27 ++++++++++++++------------- mapping/sustainability.yaml | 31 ++++++++++++++----------------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/docs/cost/ids/sustainability.md b/docs/cost/ids/sustainability.md index dbadc3a0..88b8a5d5 100644 --- a/docs/cost/ids/sustainability.md +++ b/docs/cost/ids/sustainability.md @@ -460,7 +460,7 @@ Project level: :columns: 4 CoST IDS element ^^^ -Disclose the maintenance plan or program. +Disclose the maintenance plan or program. This is the documentation that describes work to prevent the breakdown or malfunctioning of an asset. ```` ````{grid-item-card} @@ -1499,7 +1499,7 @@ CoST IDS element ^^^ Disclose dates for project approval: -- submission date +- submission date - approval date ```` @@ -1692,12 +1692,13 @@ Map to [`environment.abatementCost`](project-schema.json,,environment/abatementC :columns: 4 CoST IDS element ^^^ -Identify potential non-climate impacts that have been factored into the project planning. Select from the list: +Disclose and provide further details on the potential non-climate impacts that have been factored into the project planning. This can comprise, without limitation the following: - economic - social - environmental - gender empowerment. +- others (explain) ```` ````{grid-item-card} @@ -1751,7 +1752,7 @@ See [public consultation meetings (social module)](social-public-consultation-me :columns: 4 CoST IDS element ^^^ -Disbursements dates according to financial agreement versus actual disbursements dates. +Disclose disbursements dates according to financial agreement versus actual disbursements dates. ```` ````{grid-item-card} @@ -2566,20 +2567,20 @@ Map to [`social.landCompensationBudget`](project-schema.json,/definitions/Social ````` -(social-labour-obligations)= +(social-labor-obligations)= `````{grid} 2 -````{grid-item-card} Labour obligations +````{grid-item-card} Labor obligations :columns: 4 CoST IDS element ^^^ -Disclose labour obligations in the construction contract. This can include, without limitation, the following: +Disclose labor obligations in the construction contract. This can include, without limitation, the following: - minimum wage - overtime -- prohibition of forced labour -- prohibition of child labour +- prohibition of forced labor +- prohibition of child labor - equal opportunity - non-discrimination - freedom of association @@ -2645,15 +2646,15 @@ Contracting process level: ````` -(social-labour-budget)= +(social-labor-budget)= `````{grid} 2 -````{grid-item-card} Labour budget +````{grid-item-card} Labor budget :columns: 4 CoST IDS element ^^^ -Disclose the amount allocated by the main contractor to cover for labour costs. +Disclose the amount allocated by the main contractor to cover for labor costs. ```` ````{grid-item-card} @@ -2773,7 +2774,7 @@ Publish summary statistics on worker fatalities: :columns: 4 CoST IDS element ^^^ -Disclose labour related certifications issued in relation to project contractors and subcontractors such as ISO 45001 for Health and Safety. +Disclose labor related certifications issued in relation to project contractors and subcontractors such as ISO 45001 for Health and Safety. ```` ````{grid-item-card} diff --git a/mapping/sustainability.yaml b/mapping/sustainability.yaml index f4cb79e9..b7be5f69 100644 --- a/mapping/sustainability.yaml +++ b/mapping/sustainability.yaml @@ -381,7 +381,7 @@ title: Maintenance plan or program module: Economic and fiscal indicator: Economic viability - disclosure format: Disclose the maintenance plan or program. + disclosure format: Disclose the maintenance plan or program. This is the documentation that describes work to prevent the breakdown or malfunctioning of an asset. mapping: 'Project Level: [Add a project document](../common.md#add-a-project-document) and set its [`.documentType`](project-schema.json,/definitions/Document,documentType) to ''maintenancePlan''.' example: |- { @@ -1259,11 +1259,7 @@ title: Project approval period module: Climate finance indicator: Accessibility - disclosure format: |- - Disclose dates for project approval: - - - submission date - - approval date + disclosure format: "Disclose dates for project approval:\n\n- submission date \n- approval date" mapping: |- Project level: @@ -1438,12 +1434,13 @@ module: Climate finance indicator: Non-climate impact disclosure format: |- - Identify potential non-climate impacts that have been factored into the project planning. Select from the list: + Disclose and provide further details on the potential non-climate impacts that have been factored into the project planning. This can comprise, without limitation the following: - economic - social - environmental - gender empowerment. + - others (explain) mapping: |- Project level: @@ -1490,7 +1487,7 @@ title: Disbursement records module: Climate finance indicator: Efficiency - disclosure format: Disbursements dates according to financial agreement versus actual disbursements dates. + disclosure format: Disclose disbursements dates according to financial agreement versus actual disbursements dates. mapping: |- For each planned disbursement: @@ -2210,16 +2207,16 @@ - /social/landCompensationBudget/currency refs: '' - id: '4.6' - title: Labour obligations + title: Labor obligations module: Social - indicator: Labour compliance + indicator: Labor compliance disclosure format: |- - Disclose labour obligations in the construction contract. This can include, without limitation, the following: + Disclose labor obligations in the construction contract. This can include, without limitation, the following: - minimum wage - overtime - - prohibition of forced labour - - prohibition of child labour + - prohibition of forced labor + - prohibition of child labor - equal opportunity - non-discrimination - freedom of association @@ -2288,10 +2285,10 @@ - /contractingProcesses/summary/documents/url refs: '' - id: '4.7' - title: Labour budget + title: Labor budget module: Social - indicator: Labour compliance - disclosure format: Disclose the amount allocated by the main contractor to cover for labour costs. + indicator: Labor compliance + disclosure format: Disclose the amount allocated by the main contractor to cover for labor costs. mapping: |- Contracting process level: @@ -2402,7 +2399,7 @@ title: Health and safety certifications module: Social indicator: Health and Safety - disclosure format: Disclose labour related certifications issued in relation to project contractors and subcontractors such as ISO 45001 for Health and Safety. + disclosure format: Disclose labor related certifications issued in relation to project contractors and subcontractors such as ISO 45001 for Health and Safety. mapping: |- Contracting process level: From 4472f62f77468f4a0bbc8cb10ef1a158dd5e0c01 Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 24 Sep 2024 14:27:49 +0100 Subject: [PATCH 2/6] update Maintenance plan or program disclosure format --- docs/cost/ids/sustainability.md | 2 +- mapping/sustainability.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/cost/ids/sustainability.md b/docs/cost/ids/sustainability.md index 88b8a5d5..ef772308 100644 --- a/docs/cost/ids/sustainability.md +++ b/docs/cost/ids/sustainability.md @@ -460,7 +460,7 @@ Project level: :columns: 4 CoST IDS element ^^^ -Disclose the maintenance plan or program. This is the documentation that describes work to prevent the breakdown or malfunctioning of an asset. +Disclose the maintenance plan or program. This is the documentation that describes work to slow the deterioration of the asset. ```` ````{grid-item-card} diff --git a/mapping/sustainability.yaml b/mapping/sustainability.yaml index b7be5f69..3e633c82 100644 --- a/mapping/sustainability.yaml +++ b/mapping/sustainability.yaml @@ -381,7 +381,7 @@ title: Maintenance plan or program module: Economic and fiscal indicator: Economic viability - disclosure format: Disclose the maintenance plan or program. This is the documentation that describes work to prevent the breakdown or malfunctioning of an asset. + disclosure format: Disclose the maintenance plan or program. This is the documentation that describes work to slow the deterioration of the asset. mapping: 'Project Level: [Add a project document](../common.md#add-a-project-document) and set its [`.documentType`](project-schema.json,/definitions/Document,documentType) to ''maintenancePlan''.' example: |- { From 06393a60a89ce1a56d7bffe8bc042b294242bb28 Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 24 Sep 2024 13:31:28 +0000 Subject: [PATCH 3/6] [github-actions] pre-commit autoupdate --- common-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-requirements.txt b/common-requirements.txt index 58eb4028..87976ff6 100644 --- a/common-requirements.txt +++ b/common-requirements.txt @@ -160,7 +160,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -standard-theme @ git+https://github.com/open-contracting/standard_theme.git@0d9d89f7b150105fd366a7f626e57d3103090230#egg=standard_theme +standard-theme @ git+https://github.com/open-contracting/standard_theme.git@07ca0e39979a244656dd6df0658f2ead428184b9#egg=standard_theme # via -r common-requirements.in starlette==0.38.4 # via sphinx-autobuild From d3aa9c80246b90e2739221e75fe9371386599165 Mon Sep 17 00:00:00 2001 From: odscjen Date: Tue, 24 Sep 2024 15:24:03 +0100 Subject: [PATCH 4/6] sustainability.yaml: update indigenous land url --- docs/cost/ids/sustainability.md | 2 +- mapping/sustainability.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/cost/ids/sustainability.md b/docs/cost/ids/sustainability.md index ef772308..7fb54f44 100644 --- a/docs/cost/ids/sustainability.md +++ b/docs/cost/ids/sustainability.md @@ -2435,7 +2435,7 @@ Project level: :columns: 4 CoST IDS element ^^^ -Identify whether the project is located or cut through indigenous land. Use the information at the [LandMark - Global Platform of Indigenous and Community Lands](https://www.landmarkmap.org/) on both databases Indigenous Lands Acknowledged by Government and Not Acknowledged by Government (customary tenure or with formal land claim submitted) to disclose the information. +Identify whether the project is located or cut through indigenous land. Use the information at the [LandMark - Global Platform of Indigenous and Community Lands](https://www.landmarkmap.org/map/#x=-102.46&y=13.47&l=3&a=community_FormalDoc%2Ccommunity_NoDoc%2Ccommunity_FormalClaim%2Ccommunity_Occupied%2Cindigenous_FormalDoc%2Cindigenous_NoDoc%2Cindigenous_FormalClaim%2Cindigenous_Occupied) on both databases Indigenous Lands Acknowledged by Government and Not Acknowledged by Government (customary tenure or with formal land claim submitted) to disclose the information. ```` ````{grid-item-card} diff --git a/mapping/sustainability.yaml b/mapping/sustainability.yaml index 3e633c82..e29932d6 100644 --- a/mapping/sustainability.yaml +++ b/mapping/sustainability.yaml @@ -2085,7 +2085,7 @@ title: Indigenous land module: Social indicator: Indigenous populations - disclosure format: Identify whether the project is located or cut through indigenous land. Use the information at the [LandMark - Global Platform of Indigenous and Community Lands](https://www.landmarkmap.org/) on both databases Indigenous Lands Acknowledged by Government and Not Acknowledged by Government (customary tenure or with formal land claim submitted) to disclose the information. + disclosure format: Identify whether the project is located or cut through indigenous land. Use the information at the [LandMark - Global Platform of Indigenous and Community Lands](https://www.landmarkmap.org/map/#x=-102.46&y=13.47&l=3&a=community_FormalDoc%2Ccommunity_NoDoc%2Ccommunity_FormalClaim%2Ccommunity_Occupied%2Cindigenous_FormalDoc%2Cindigenous_NoDoc%2Cindigenous_FormalClaim%2Cindigenous_Occupied) on both databases Indigenous Lands Acknowledged by Government and Not Acknowledged by Government (customary tenure or with formal land claim submitted) to disclose the information. mapping: |- Project level: From 5f507dce12b7d0fedca09651191bd049c02f2381 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:10:01 -0400 Subject: [PATCH 5/6] fix: Fix _get_definition_references calls --- manage.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/manage.py b/manage.py index c3cbc5d6..bbff0b20 100755 --- a/manage.py +++ b/manage.py @@ -155,7 +155,7 @@ def _get_definition_references(schema, defn, parents=None, project_schema=None, defn, [*parents, key, "0"], project_schema, - include_nested, + include_nested=include_nested, ) ) elif "$ref" in value: @@ -168,17 +168,21 @@ def _get_definition_references(schema, defn, parents=None, project_schema=None, defn, [*parents, key], project_schema, - include_nested, + include_nested=include_nested, ) ) elif "properties" in value: references.extend( - _get_definition_references(value, defn, [*parents, key], project_schema, include_nested) + _get_definition_references( + value, defn, [*parents, key], project_schema, include_nested=include_nested + ) ) if "definitions" in schema: for key, value in schema["definitions"].items(): - references.extend(_get_definition_references(value, defn, [key], project_schema, include_nested)) + references.extend( + _get_definition_references(value, defn, [key], project_schema, include_nested=include_nested) + ) return references From c13486f42e57a1d3f16722b56b5937741a1886cc Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:39:43 -0400 Subject: [PATCH 6/6] build: Update to latest profile template --- .pre-commit-config.yaml | 2 ++ common-requirements.txt | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a0ecf500..39422067 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,8 @@ ci: autoupdate_schedule: quarterly skip: [pip-compile] +default_language_version: + python: python3.10 repos: - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.6.3 diff --git a/common-requirements.txt b/common-requirements.txt index 87976ff6..6c5b859a 100644 --- a/common-requirements.txt +++ b/common-requirements.txt @@ -88,15 +88,15 @@ mdurl==0.1.2 # via markdown-it-py myst-parser==0.18.1 # via -r common-requirements.in -ocds-babel==0.3.1 +ocds-babel==0.3.6 # via -r common-requirements.in -ocdsextensionregistry==0.3.8 +ocdsextensionregistry==0.4.0 # via -r common-requirements.in ocdsindex==0.2.0 # via -r common-requirements.in outcome==1.1.0 # via trio -packaging==21.3 +packaging==24.1 # via # pytest # sphinx @@ -106,8 +106,6 @@ pluggy==0.13.1 # via pytest pygments==2.15.1 # via sphinx -pyparsing==2.4.7 - # via packaging pysocks==1.7.1 # via urllib3 pytest==7.2.0