Merge pull request #1638 from open-contracting/1.1-dev

Merge 1.1-dev into 1.1

common-requirements.txt

@@ -21,24 +21,26 @@ babel==2.9.1
     # via
     #   sphinx
     #   sphinx-intl
+build==0.10.0
+    # via pip-tools
 certifi==2022.12.7
     # via
     #   elastic-transport
     #   requests
     #   urllib3
 cffi==1.15.0
     # via cryptography
-chardet==4.0.0
+charset-normalizer==3.1.0
     # via requests
-click==7.1.2
+click==8.1.3
     # via
     #   -r common-requirements.in
     #   ocdsindex
     #   pip-tools
     #   sphinx-intl
 colorama==0.4.4
     # via sphinx-autobuild
-cryptography==39.0.1
+cryptography==41.0.1
     # via
     #   pyopenssl
     #   urllib3
@@ -99,11 +101,10 @@ outcome==1.1.0
     # via trio
 packaging==21.3
     # via
+    #   build
     #   pytest
     #   sphinx
-pep517==0.10.0
-    # via pip-tools
-pip-tools==6.6.0
+pip-tools==6.13.0
     # via -r common-requirements.in
 pluggy==0.13.1
     # via pytest
@@ -115,6 +116,8 @@ pyopenssl==22.0.0
     # via urllib3
 pyparsing==2.4.7
     # via packaging
+pyproject-hooks==1.0.0
+    # via build
 pysocks==1.7.1
     # via urllib3
 pytest==7.2.0
@@ -123,7 +126,7 @@ pytz==2021.1
     # via babel
 pyyaml==5.4.1
     # via myst-parser
-requests==2.25.1
+requests==2.31.0
     # via
     #   elasticsearch
     #   ocdsextensionregistry
@@ -163,11 +166,12 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-toml==0.10.2
-    # via pep517
 tomli==2.0.1
-    # via pytest
-tornado==6.1
+    # via
+    #   build
+    #   pyproject-hooks
+    #   pytest
+tornado==6.3.2
     # via livereload
 trio==0.20.0
     # via

docs/guidance/map/framework_agreements.md

@@ -222,7 +222,7 @@ The National Procurement Agency in Chile (Chile Compra) wants to establish a fra
 
 #### Invitation to participate in the first stage of a framework agreement procedure
 
-Chile Compra publishes a [tender notice](https://www.mercadopublico.cl/Procurement/Modules/RFB/DetailsAcquisition.aspx?qs=TLr0Si6+0YXBLbyobaRgPQ==) inviting suppliers to participate in the framework agreement. The tender notice specifies that multiple suppliers can join the framework agreement. The framework agreement is open, since all the framework agreements in Chile involve the setting up of a dynamic purchasing system. The framework agreement is for multiple buyers, since the tender notice specifies two contracting authorities.
+Chile Compra publishes a [tender notice](https://www.mercadopublico.cl/Procurement/Modules/RFB/DetailsAcquisition.aspx?qs=TLr0Si6+0YXBLbyobaRgPQ==) inviting suppliers to participate in the framework agreement. The tender notice specifies that multiple suppliers can join the framework agreement. The framework agreement is open, since all the framework agreements in Chile involve the setting up of a dynamic purchasing system. The framework agreement is for multiple buyers, since the tender notice specifies two buyers.
 
 The notice is modelled as an OCDS release with a `tag` of 'tender' and the following properties:
 

docs/guidance/map/localization.md

@@ -20,7 +20,7 @@ You can use the [field-level mapping template](https://www.open-contracting.org/
 
 To localize a field title or description, edit the values columns C or D. We recommend that you keep the original title or description in brackets after your localized version. For example:
 
-```{csv-table}
+```{csv-table-no-translate}
 :header-rows: 1
 :widths: auto
 :file: ../../examples/language_localization/localization.csv

docs/guidance/map/pre-qualification.md

@@ -4,12 +4,25 @@ In single-stage procedures, procuring entities invite suppliers to bid without s
 
 But, many jurisdictions also use multi-stage procedures. Such procedures follow a process like:
 
-```{csv-table}
-:header-rows: 1
-:widths: auto
-:file: ../../examples/pre-qualification/multi-stage.csv
+````{grid} 1 2 2 2
+:gutter: 2
+
+```{grid-item-card} First stage
+* The procuring entity issues an invitation to participate in the process
+* Suppliers submit requests to participate
+* The procuring entity assess suppliers based on their submissions
+* The procuring entity establishes a list of qualified or selected suppliers
 ```
 
+```{grid-item-card} Second stage
+* The procuring entity issues an invitation to bid to the suppliers on the list
+* Suppliers submit bids
+* The procuring entity evaluates the bids
+* The procuring entity awards a contract to the successful supplier(s)
+```
+
+````
+
 This worked example describes 3 types of multi-stage procedure and explains how to model them in OCDS.
 
 ## Definitions

docs/guidance/publish/quality.md

@@ -36,7 +36,7 @@ All OCDS publications ought to meet the following criteria:
 1. **Reviewable**: The [OCDS Data Review Tool](https://standard.open-contracting.org/review/) is able to report results on the data.
 1. **Appropriate**: Concepts are published in semantic accordance with the rules of the OCDS (or registered extensions) rather than using a non-OCDS field or code.
 1. **Active**: For each publisher, there is an OCDS release with a top-level `date` field value within the last 12 months.
-1. **Parity**: For each publisher, for the _time period_ and _contracting authorities_ covered by the data, there isn’t another dataset by the same publisher that covers more than 25% more contracting processes.
+1. **Parity**: For each publisher, for the _time period_ and _buyers_ covered by the data, there isn’t another dataset by the same publisher that covers more than 25% more contracting processes.
 
 The Data Support Team is happy to review draft and newly published OCDS data and can work with publishers with advice to meet the above criteria. A publication that does not meet this minimum threshold will not be listed as a publisher by OCP as part of [OCP’s regular reporting](https://www.open-contracting.org/why-open-contracting/learning/).
 
@@ -51,7 +51,7 @@ Improvement on the below indicators demonstrate that the published information i
 1. Publish subsequent releases per OCID to show how the contracting process is progressing over time
 1. Increase the publication of historical information (based on a minimal set of date fields that appear across all sources, e.g. `tender.tenderPeriod`, `awards.date`, and `contracts.dateSigned`)
 1. Increase the average coverage of fields per compiled release, for example either new fields not previously published in any release, or an increase in the use of a field across releases (e.g. very little data was published about direct awards and now more is being published about direct awards)
-1. Increase the number of contracting authorities covered in the publication
+1. Increase the number of buyers covered in the publication
 1. Increase the number of concepts covered relative to non-OCDS data
 
 ### Correctness

docs/locale/es/LC_MESSAGES/guidance/map/framework_agreements.po

@@ -943,7 +943,7 @@ msgid ""
 "The framework agreement is open, since all the framework agreements in Chile"
 " involve the setting up of a dynamic purchasing system. The framework "
 "agreement is for multiple buyers, since the tender notice specifies two "
-"contracting authorities."
+"buyers."
 msgstr ""
 "Chile Compra publica un [aviso de "
 "licitación](https://www.mercadopublico.cl/Procurement/Modules/RFB/DetailsAcquisition.aspx?qs=TLr0Si6+0YXBLbyobaRgPQ==)"