Skip to content

Commit

Permalink
Merge pull request #1640 from open-contracting/1621-deprecate-package…
Browse files Browse the repository at this point in the history
…-metadata

Deprecate package metadata, improve packaging documentation, refactor record package schema
  • Loading branch information
duncandewhurst authored Nov 7, 2023
2 parents eecca97 + 2963d21 commit e778a95
Show file tree
Hide file tree
Showing 97 changed files with 307 additions and 905 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
BASEDIR: https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/main
jobs:
build:
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
if: github.event_name == 'pull_request' || startsWith(github.event.ref, 'refs/tags/') || startsWith(github.event.ref, 'refs/heads/1.1') || startsWith(github.event.ref, 'refs/heads/1.2')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
/docs/_static/patched
/src
*.pyc
.python-version
6 changes: 0 additions & 6 deletions docs/examples/amendments/contract.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856",
"publisher": {
"name": "Department of Finance"
},
"publishedDate": "2019-02-17T00:00:00Z",
"license": "https://creativecommons.org/licenses/by/3.0/au/",
"version": "1.1",
"records": [
{
Expand Down
6 changes: 0 additions & 6 deletions docs/examples/amendments/easy_releases.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-d2phr6-1000035663",
"publisher": {
"name": "Department of Finance"
},
"publishedDate": "",
"license": "https://creativecommons.org/licenses/by/3.0/au/",
"version": "1.1",
"records": [
{
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/amendments/tender.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00002.json",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2016-02-05T10:30:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"records": [
{
Expand Down
5 changes: 0 additions & 5 deletions docs/examples/beneficial_ownership/award.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"uri": "https://www.contractsfinder.service.gov.uk/Published/Notice/releases/87d46d06-3abf-4f48-9f1d-ff3381fcb29a.json",
"publishedDate": "2021-06-08T14:14:33Z",
"publisher": {
"name": "UK SHARED BUSINESS SERVICES LIMITED"
},
"version": "1.1",
"releases": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"uri": "https://public.mtender.gov.md/ocds/tenders/ocds-b3wdp1-MD-1602178295495",
"publishedDate": "2020-10-08T17:31:35Z",
"publisher": {
"name": "M-Tender"
},
"version": "1.1",
"extensions": [
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_beneficialOwners_extension/master/extension.json"
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/award.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json",
"publishedDate": "2010-05-10T09:30:00Z",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.2",
"extensions": [],
"releases": [
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/contract.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json",
"publishedDate": "2010-06-10T10:30:00Z",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.2",
"extensions": [],
"releases": [
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/contractAmendment.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-07-contractAmendment.json",
"publishedDate": "2011-04-05T13:30:00Z",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.2",
"extensions": [],
"releases": [
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/implementation.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-06-implementation.json",
"publishedDate": "2011-01-10T09:30:00Z",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.2",
"extensions": [],
"releases": [
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/records/award.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2010-05-10T09:30:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"records": [
{
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/records/contract.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2010-06-10T10:30:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"records": [
{
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/records/contractAmendment.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2011-04-05T13:30:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"records": [
{
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/records/implementation.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2011-01-10T09:30:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"records": [
{
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/records/tender.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2010-03-15T09:30:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"records": [
{
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/records/tenderUpdate.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2010-03-20T09:45:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"records": [
{
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/tender.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json",
"publishedDate": "2010-03-01T09:30:00Z",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.2",
"extensions": [],
"releases": [
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/tenderAmendment.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderAmendment.json",
"publishedDate": "2010-03-20T10:45:00Z",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"extensions": [],
"releases": [
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/change_history/tenderUpdate.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderUpdate.json",
"publishedDate": "2010-03-20T09:45:00Z",
"publisher": {
"scheme": "GB-COH",
"uid": "09506232",
"name": "Open Data Services Co-operative Limited",
"uri": "https://standard.open-contracting.org/examples/"
},
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.2",
"extensions": [],
"releases": [
Expand Down
5 changes: 0 additions & 5 deletions docs/examples/contract_suspension/suspended_contract.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"uri": "https://standard.open-contracting.org/examples/release/ocds-afalqw-601848b51321e56ae2593b1b",
"publisher": {
"name": "National Procurement Authority, Afghanistan"
},
"publishedDate": "2021-02-01T23:00:13+04:30",
"version": "1.1",
"releases": [
{
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/easy_releases/worked_example1/award.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"uri": "https://standard.open-contracting.org/examples/",
"version": "1.1",
"publisher": {
"uid": "80048717-6",
"name": "Direccion Nacional de Contrataciones Públicas",
"scheme": "PY-RUC",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2019-12-27T14:42:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"releases": [
{
"date": "2019-12-27T14:42:00Z",
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/easy_releases/worked_example1/contract.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"uri": "https://standard.open-contracting.org/examples/",
"version": "1.1",
"publisher": {
"uid": "80048717-6",
"name": "Direccion Nacional de Contrataciones Públicas",
"scheme": "PY-RUC",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2020-01-11T07:53:50Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"releases": [
{
"date": "2020-01-11T07:53:50Z",
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/easy_releases/worked_example1/tender.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"uri": "https://standard.open-contracting.org/examples/",
"version": "1.1",
"publisher": {
"uid": "80048717-6",
"name": "Direccion Nacional de Contrataciones Públicas",
"scheme": "PY-RUC",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2019-12-01T09:00:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"releases": [
{
"date": "2019-12-01T09:00:00Z",
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/easy_releases/worked_example1/tender_update.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"uri": "https://standard.open-contracting.org/examples/",
"version": "1.1",
"publisher": {
"uid": "80048717-6",
"name": "Direccion Nacional de Contrataciones Públicas",
"scheme": "PY-RUC",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2019-12-04T09:00:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"releases": [
{
"date": "2019-12-03T09:00:00Z",
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/easy_releases/worked_example2/award.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"uri": "https://standard.open-contracting.org/examples/",
"version": "1.1",
"publisher": {
"uid": "80048717-6",
"name": "Direccion Nacional de Contrataciones Públicas",
"scheme": "PY-RUC",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2019-12-27T14:42:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"releases": [
{
"date": "2019-12-27T14:42:00Z",
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/easy_releases/worked_example2/contract.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"uri": "https://standard.open-contracting.org/examples/",
"version": "1.1",
"publisher": {
"uid": "80048717-6",
"name": "Direccion Nacional de Contrataciones Públicas",
"scheme": "PY-RUC",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2020-01-11T07:53:50Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"releases": [
{
"date": "2020-01-11T07:53:50Z",
Expand Down
10 changes: 0 additions & 10 deletions docs/examples/easy_releases/worked_example2/tender.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"uri": "https://standard.open-contracting.org/examples/",
"version": "1.1",
"publisher": {
"uid": "80048717-6",
"name": "Direccion Nacional de Contrataciones Públicas",
"scheme": "PY-RUC",
"uri": "https://standard.open-contracting.org/examples/"
},
"publishedDate": "2019-12-01T09:00:00Z",
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"releases": [
{
"date": "2019-12-01T09:00:00Z",
Expand Down
Loading

0 comments on commit e778a95

Please sign in to comment.