Skip to content

Commit

Permalink
Merge branch '1.2-dev' into 1700-add-subschema-descriptions
Browse files Browse the repository at this point in the history
  • Loading branch information
duncandewhurst committed Dec 23, 2024
2 parents 261d304 + 4236b79 commit a29b342
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 345 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ jobs:
uses: open-contracting/.github/.github/workflows/lint.yml@main
permissions:
contents: write
secrets:
personal-access-token: ${{ secrets.PAT }}
with:
python-version: '3.10'
4 changes: 2 additions & 2 deletions common-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ myst-parser==0.18.1
# via -r common-requirements.in
ocds-babel==0.3.6
# via -r common-requirements.in
ocdsextensionregistry==0.5.0
ocdsextensionregistry==0.6.5
# via -r common-requirements.in
ocdsindex==0.2.0
# via -r common-requirements.in
Expand Down Expand Up @@ -158,7 +158,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@c3cbd1b8ba6db24624e5d838ed18147db63f5d1b#egg=standard_theme
standard-theme @ git+https://github.com/open-contracting/standard_theme.git@5de343d1d8e342b5f2a42c6132db37aebe382e36#egg=standard_theme
# via -r common-requirements.in
starlette==0.40.0
# via sphinx-autobuild
Expand Down
1 change: 0 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@
"enquiries": default_extension_version,
"location": default_extension_version,
"lots": default_extension_version,
"milestone_documents": default_extension_version,
"participation_fee": default_extension_version,
"process_title": default_extension_version,
}
Expand Down
2 changes: 1 addition & 1 deletion docs/history/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ See the changelogs for:
* [Enquiries](https://extensions.open-contracting.org/en/extensions/enquiries/master/#changelog)
* [Location](https://extensions.open-contracting.org/en/extensions/location/master/#changelog)
* [Lots](https://extensions.open-contracting.org/en/extensions/lots/master/#changelog)
* [Milestone documents](https://extensions.open-contracting.org/en/extensions/milestone_documents/master/#changelog)
* [Milestone documents](https://github.com/open-contracting-extensions/ocds_milestone_documents_extension#changelog)
* [Participation fees](https://extensions.open-contracting.org/en/extensions/participation_fee/master/#changelog)
* [Process level title and description](https://extensions.open-contracting.org/en/extensions/process_title/master/#changelog)

Expand Down
6 changes: 2 additions & 4 deletions docs/locale/es/LC_MESSAGES/history/changelog.po
Original file line number Diff line number Diff line change
Expand Up @@ -792,11 +792,9 @@ msgstr ""

#: ../../docs/history/changelog.md:111
msgid ""
"[Milestone documents](https://extensions.open-"
"contracting.org/en/extensions/milestone_documents/master/#changelog)"
"[Milestone documents](https://github.com/open-contracting-extensions/ocds_milestone_documents_extension#changelog)"
msgstr ""
"[Documentos de hito](https://extensions.open-"
"contracting.org/en/extensions/milestone_documents/master/#changelog)"
"[Documentos de hito](https://github.com/open-contracting-extensions/ocds_milestone_documents_extension#changelog)"

#: ../../docs/history/changelog.md:112 ../../docs/history/changelog.md:190
msgid ""
Expand Down
3 changes: 1 addition & 2 deletions docs/locale/fr/LC_MESSAGES/history/changelog.po
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,7 @@ msgstr ""

#: ../../docs/history/changelog.md:110
msgid ""
"[Milestone documents](https://extensions.open-"
"contracting.org/en/extensions/milestone_documents/master/#changelog)"
"[Milestone documents](https://github.com/open-contracting-extensions/ocds_milestone_documents_extension#changelog)"
msgstr ""

#: ../../docs/history/changelog.md:111 ../../docs/history/changelog.md:189
Expand Down
4 changes: 0 additions & 4 deletions docs/schema/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -768,10 +768,6 @@ Each `Milestone` has the following fields:
:collapse: documents
```

```{extensionlist} The following extensions to milestone are available
:list: milestones
```

```{workedexamplelist} The following worked examples are available for milestones
:tag: milestone
```
Expand Down
Loading

0 comments on commit a29b342

Please sign in to comment.