Merge pull request #121 from open-contracting/confpy

Use shared code, and fix a variety of issues

.babel_codelists

@@ -1,3 +1,2 @@
-[codelists_ppp_text: compiledCodelists/*.csv]
-
+[codelists_text: compiledCodelists/*.csv]
 [codelists_text: docs/extensions/codelists/*.csv]

.gitignore

@@ -1,9 +1,9 @@
-docs/_build
-.ve
-*.swp
-build
-build_locale
 *.mo
-docs/_static/ppp-release-schema.json
-docs/_static/codelists/
-docs/extensions/codelists_translated/
+*.swp
+.ve
+
+/build
+/docs/_build
+/docs/_static/codelists
+/docs/_static/ppp-release-schema.json
+/docs/extensions/codelists_translated

.travis.yml

@@ -10,15 +10,8 @@ addons:
 deploy:
   skip_cleanup: true
   provider: script
-  script: curl https://raw.githubusercontent.com/OpenDataServices/opendataservices-deploy/master/open-contracting-profile-deploy.sh | bash -
+  script: curl -Ss https://raw.githubusercontent.com/OpenDataServices/opendataservices-deploy/master/open-contracting-profile-deploy.sh | bash -
   on:
     all_branches: true
 script:
-  - |
-    mkdir build
-    cd docs
-    for lang in en es; do
-        make -e SPHINXOPTS="-D language='$lang'" dirhtml
-        mv _build/dirhtml ../build/$lang
-    done
-    cd ..
+  - make

Makefile

@@ -0,0 +1,4 @@
+# Update this file from a profile with:
+# curl -O https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/Makefile
+
+include include/prologue.mk include/config.mk include/common.mk

README.md

@@ -4,14 +4,14 @@ The Open Contracting Data Standard for Public Private Partnerships release draws
 
 Full documentation is available at [http://standard.open-contracting.org/profiles/ppp/latest/en/](http://standard.open-contracting.org/profiles/ppp/latest/en/)
 
-This extension provides a number of fields and building blocks that are currenetly seen as specific to PPP disclosure against the World Bank PPP Disclosure Framework.
+This extension provides a number of fields and building blocks that are currently seen as specific to PPP disclosure against the World Bank PPP Disclosure Framework.
 
 ### Project level information
 
 Building on the [Budget and Projects extension](https://github.com/open-contracting/ocds_budget_projects_extension) this adds to project with:
 
 * Sector classifications - using the [UN Classifications of the Functions of Government](http://unstats.un.org/unsd/cr/registry/regcst.asp?Cl=4)
-* Additional classifications - allowing arbitrary additional project categorisation
+* Additional classifications - allowing arbitrary additional project categorization
 * Project location - with options for gazetteer or point location
 
 An example is shown below:

codelists/+milestoneType.csv

@@ -1,3 +1,3 @@
-Code,Title,Description,Source
-procurement,Procurement,"Events taking place during the procurement which are not captured by fields in core OCDS, such as additional enquiry periods or draft tender submissions in a competitive dialogue process",
-contractClose,Contract close,Events such as commercial and financial close,https://github.com/open-contracting/public-private-partnerships/issues/25
+Code,Title,Description,Source
+procurement,Procurement,"Events taking place during the procurement which are not captured by fields in core OCDS, such as additional enquiry periods or draft tender submissions in a competitive dialogue process",
+contractClose,Contract close,Events such as commercial and financial close,https://github.com/open-contracting/public-private-partnerships/issues/25

codelists/+partyRole.csv

@@ -1,16 +1,16 @@
-Code,Title,Description,Source
-publicAuthority,Public authority,The unit/body/department within a government that is tendering and contracting the project. The public counterpart in the PPP contract.,https://ppp-certification.com/ppp-certification-guide/glossary
-bidder,Bidder,"The company or a group of companies, such as a consortium, that submits a bid in response to a RFP. A bidder could be a single party or a consortium of parties, each responsible for a specific element, such as constructing the infrastructure, supplying the equipment, or operating the business.",https://ppp-certification.com/ppp-certification-guide/glossary
-qualifiedBidder,Qualified bidder,Those parties invited to submit a proposal in response to a Request for Proposal (RFP) for a project in which the government only allows a limited number of pre-qualified bidders to proceed to the RFP phase.,https://ppp-certification.com/ppp-certification-guide/glossary
-preferredBidder,Preferred bidder,The bidder identified at the end of the tender evaluation process as being the government’s preferred partner to enter into (or enter into final negotiations for) a PPP contract. The preferred bidder is awarded the contract and called to contract signature.,https://ppp-certification.com/ppp-certification-guide/glossary
-privateParty,Private party,"The counter party of the procuring authority in the PPP contract. A private entity which has been granted the contract to construct and operate a government asset, and which is usually created under the form of a Special Purpose Vehicle or SPV.",https://ppp-certification.com/ppp-certification-guide/glossary
-leadBank,Lead bank,A lead bank is a bank that oversees the arrangement of a loan syndication,
-lender,Lender,"The APMG PPP Certification Program defines lenders as ""Institutions that provide lending to the project: mainly banks and institutional investors through project bonds""",
-equityInvestor,Equity investor,"The APMG PPP Certification Program defines equity investors as ""Investors who finance a portion of the project’s capital expenditures (Capex), typically as share capital or subordinated debt""",
-consortiaMember,Consortia member,One of a group of companies that has joined together to bid for a project.,
-interestedParty ,Interested party,"A party which has expressed an interest in the project, for example by purchasing tender documents or submitted clarification questions, but has not yet formally submitted a bid.",
-grantor,Grantor,"The party which grants a concession, a license or some other right.",https://ppp-certification.com/ppp-certification-guide/glossary
-disqualifiedBidder,Disqualified bidder,A bidder which either did not pass the qualification stage of the evaluation process or did not pass the pre-qualification stage of the process. ,
-socialWitness,Social witness,A social witness participates as an external observer in a public procurements process. They have a formal role as an observer.,
-otherWitness,Other witness,A witness attends one or more stages of the procurement process to observe proceedings.,
-notary,Notary,"A person authorized to perform certain legal formalities, especially to certify documents and proceedings.",
+Code,Title,Description,Source
+publicAuthority,Public authority,The unit/body/department within a government that is tendering and contracting the project. The public counterpart in the PPP contract.,https://ppp-certification.com/ppp-certification-guide/glossary
+bidder,Bidder,"The company or a group of companies, such as a consortium, that submits a bid in response to a RFP. A bidder could be a single party or a consortium of parties, each responsible for a specific element, such as constructing the infrastructure, supplying the equipment, or operating the business.",https://ppp-certification.com/ppp-certification-guide/glossary
+qualifiedBidder,Qualified bidder,Those parties invited to submit a proposal in response to a Request for Proposal (RFP) for a project in which the government only allows a limited number of pre-qualified bidders to proceed to the RFP phase.,https://ppp-certification.com/ppp-certification-guide/glossary
+preferredBidder,Preferred bidder,The bidder identified at the end of the tender evaluation process as being the government’s preferred partner to enter into (or enter into final negotiations for) a PPP contract. The preferred bidder is awarded the contract and called to contract signature.,https://ppp-certification.com/ppp-certification-guide/glossary
+privateParty,Private party,"The counter party of the procuring authority in the PPP contract. A private entity which has been granted the contract to construct and operate a government asset, and which is usually created under the form of a Special Purpose Vehicle or SPV.",https://ppp-certification.com/ppp-certification-guide/glossary
+leadBank,Lead bank,A lead bank is a bank that oversees the arrangement of a loan syndication,
+lender,Lender,"The APMG PPP Certification Program defines lenders as ""Institutions that provide lending to the project: mainly banks and institutional investors through project bonds""",
+equityInvestor,Equity investor,"The APMG PPP Certification Program defines equity investors as ""Investors who finance a portion of the project’s capital expenditures (Capex), typically as share capital or subordinated debt""",
+consortiaMember,Consortia member,One of a group of companies that has joined together to bid for a project.,
+interestedParty,Interested party,"A party which has expressed an interest in the project, for example by purchasing tender documents or submitted clarification questions, but has not yet formally submitted a bid.",
+grantor,Grantor,"The party which grants a concession, a license or some other right.",https://ppp-certification.com/ppp-certification-guide/glossary
+disqualifiedBidder,Disqualified bidder,A bidder which either did not pass the qualification stage of the evaluation process or did not pass the pre-qualification stage of the process.,
+socialWitness,Social witness,A social witness participates as an external observer in a public procurements process. They have a formal role as an observer.,
+otherWitness,Other witness,A witness attends one or more stages of the procurement process to observe proceedings.,
+notary,Notary,"A person authorized to perform certain legal formalities, especially to certify documents and proceedings.",

codelists/-partyRole.csv

@@ -1,6 +1,6 @@
-code
-buyer
-procuringEntity
-supplier
-tenderer
-funder
+Code
+buyer
+procuringEntity
+supplier
+tenderer
+funder

codelists/README.md

@@ -1,3 +1,3 @@
 # Codelists
 
-The codelists in this folder are customised for OCDS for PPPs. These will be applied after all other extensions codelists have been applied.
+The codelists in this folder are customized for OCDS for PPPs. These will be applied after all other extensions codelists have been applied.

codelists/documentType.csv

@@ -21,25 +21,25 @@ II.1,tender,minutes,Minutes,"Minutes of pre-bid meetings, or other relevant meet
 II.1,tender,shortlistedFirms,Shortlisted Firms,Documentation providing information on shortlisted firms. Structured versions of this information can be provided using the bids extension.,No
 II.1,tender,negotiationParameters,Negotiation Parameters,A description of the parameters for negotiation with the preferred proponent,Yes
 III.1,contract,riskProvisions,Provisions for management of risks and liabilities,Documentation covering how risks will be managed as part of this contracting process.,No
-IV.1,award,evaluationReports,Evaluation report,"Documentation on the evaluation of the bids and the application of the evaluation criteria, including the justification fo the award",No
+IV.1,award,evaluationReports,Evaluation report,"Documentation on the evaluation of the bids and the application of the evaluation criteria, including the justification for the award",No
 IV.2,award,riskComparison,Risk comparison,Risk comparison of other financing methods,Yes
 IV.2.2,award,discountRate,Discount rate and risk premium,"An explanation of the discount rate, and any risk premium used, including information on project-specific circumstances that justify the risk premium rate used.",Yes
 V.4,contract,equityTransferCaps,Equity transfer caps,"Details of any restrictions on the transfer of equity by shareholders or other relevant participants in the project. Certain contracts provide for caps on equity transfer in different stages of the contract, especially during the construction stage and for a few years thereafter.",Yes
 V.8,contract,financeArrangements,Security and step in arrangements,,Yes
 VI.1,contract,contractGuarantees,Guarantees,Documentation of guarantees relating to a contracting process or contract.,Yes
 VI.1,contract,guaranteeReports,Fiscal commitment and continent liabilities disclosure reports,,No
-VI.2,"contract, implementation",grants,Grants,"Information on grants given to support the project. Grant information should detail the total value of subsidy, and/or the valie of subsidy as a proportion of the overall project value, as well as providing information on the nature of the grant. For capital subsidies paid during construction of a project, or operating subsidies paid during operation, details of periodicity of grant payments, and particular grant milestones, should be provided.",Yes
+VI.2,"contract, implementation",grants,Grants,"Information on grants given to support the project. Grant information should detail the total value of subsidy, and/or the value of subsidy as a proportion of the overall project value, as well as providing information on the nature of the grant. For capital subsidies paid during construction of a project, or operating subsidies paid during operation, details of periodicity of grant payments, and particular grant milestones, should be provided.",Yes
 VI.3,"contract, implementation",servicePayments,Service payments,"Service payments are payments made by the public authority or purchaser to the private provider for infrastructure services (applicable in some types of Public Private Partnership projects). The documentation should cover the total number of payments and their periodicity, as well as the methodology used for calculating payments and the indexation used.",Yes
-VI.4,"contract, implementation",landTransfer,Land transfer,"Details of land transferred on lease or other basis by governemnt, including details of property numbers with the quantum of land transferred, zoning information and conditions of transfer.",Yes
+VI.4,"contract, implementation",landTransfer,Land transfer,"Details of land transferred on lease or other basis by government, including details of property numbers with the quantum of land transferred, zoning information and conditions of transfer.",Yes
 VI.4,"contract, implementation",assetTransfer,Asset Transfer,"Details of asset, human resource of personnel transfers, including documentation of the conditions of transfer.",Yes
 VI.5,"contract, implementation",revenueShare,Revenue Share,"Documentation of any revenue share arrangements, including revenue share on the base-case and upside for a public private partnership project.",Yes
-VI.5,contract,otherGovernmentSupport,Other government support,"Documentation of any other government support, including non-complete clauses or provision for revenue shortfall loans. ",Yes
-VII.2,contract,tariffMethod,Tariff method,"For summarising the method by which tariffs are set, and linking to detailed documentation of the methods for setting tariffs. This may include written documentation, and spreadsheets providing the models used to calculate tariffs. This should make clear who sets the tariff and on what basis.",Yes
-VII.3,contract,tariffReview,Tariff review,"For summarising the arrangements for the review and regulation of tariffs, and linking to detailed documentation that covers how tariffs are regulated. This is important to explain to users why they are paying what they are paying, and the scope for changes to payment structures.",Yes
-VII.1,contract/implementation,tariffs,Tariffs,For providing tariff and pricing schedules.,No
-VII.4,contract/implementation,tariffIllustration,Tariff illustrations,"For linking to graphs and reports on the change over time in tariff prices. Use the relevant image media type when linking to PNG, JPEG or GIF graphs to allow applications to directly display this content. ",No
-VIII.1,contract/implementation,defaultEvents,Defaults,Information on events of default,No
-VIII.1,contract/implementation,termination,Termination,Information on contract termination,No
+VI.5,contract,otherGovernmentSupport,Other government support,"Documentation of any other government support, including non-complete clauses or provision for revenue shortfall loans.",Yes
+VII.2,contract,tariffMethod,Tariff method,"For summarizing the method by which tariffs are set, and linking to detailed documentation of the methods for setting tariffs. This may include written documentation, and spreadsheets providing the models used to calculate tariffs. This should make clear who sets the tariff and on what basis.",Yes
+VII.3,contract,tariffReview,Tariff review,"For summarizing the arrangements for the review and regulation of tariffs, and linking to detailed documentation that covers how tariffs are regulated. This is important to explain to users why they are paying what they are paying, and the scope for changes to payment structures.",Yes
+VII.1,"contract, implementation",tariffs,Tariffs,For providing tariff and pricing schedules.,No
+VII.4,"contract, implementation",tariffIllustration,Tariff illustrations,"For linking to graphs and reports on the change over time in tariff prices. Use the relevant image media type when linking to PNG, JPEG or GIF graphs to allow applications to directly display this content.",No
+VIII.1,"contract, implementation",defaultEvents,Defaults,Information on events of default,No
+VIII.1,"contract, implementation",termination,Termination,Information on contract termination,No
 VIII.2,"contract, implementation",handover,Handover,"Contractual provisions for, or reporting on, handover of assets back to the state, including details of condition of assets and any other conditions of handover.",Yes
-X.2,contract/implementation,financialStatement,Financial statement,Audited financial statements of the project company,No
-X.6,contract/implementation,performanceReport,Performance report,Performance assessment reports,Yes
+X.2,"contract, implementation",financialStatement,Financial statement,Audited financial statements of the project company,No
+X.6,"contract, implementation",performanceReport,Performance report,Performance assessment reports,Yes

codelists/metricID.csv

@@ -1,4 +1,4 @@
-Code,Title,Description
-demand,Demand,For reporting on forecast or actual demand
-revenue,Revenue,For reporting on forecast or actual revenues
-IRR,Internal Rate of Return,For reporting on forecast or actual project IRR
+Code,Title,Description
+demand,Demand,For reporting on forecast or actual demand
+revenue,Revenue,For reporting on forecast or actual revenues
+IRR,Internal Rate of Return,For reporting on forecast or actual project IRR