Skip to content

Commit adc8b11

Browse files
committed
chore: Run script/update
1 parent 4e10416 commit adc8b11

15 files changed

+166
-127
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

.github/workflows/lint.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
name: Lint
22
on: [push, pull_request]
3-
env:
4-
BASEDIR: https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/main
53
jobs:
6-
build:
7-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
8-
runs-on: ubuntu-latest
9-
steps:
10-
- uses: actions/checkout@v3
11-
- uses: actions/setup-python@v4
12-
with:
13-
python-version: '3.10'
14-
cache: pip
15-
cache-dependency-path: '**/requirements*.txt'
16-
- shell: bash
17-
run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
18-
- shell: bash
19-
run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
4+
lint:
5+
uses: open-contracting/.github/.github/workflows/lint.yml@main
6+
permissions:
7+
contents: write
8+
secrets:
9+
personal-access-token: ${{ secrets.PAT }}
10+
with:
11+
python-version: '3.10'

.github/workflows/shell.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
name: Lint Shell
22
on: [push, pull_request]
33
jobs:
4-
build:
5-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
6-
runs-on: ubuntu-latest
7-
steps:
8-
- uses: actions/checkout@v3
9-
- name: Install shellcheck
10-
run: |
11-
sudo apt update
12-
sudo apt install shellcheck
13-
- run: sudo snap install shfmt
14-
- run: shellcheck $(shfmt -f .)
15-
- run: shfmt -d -i 4 -sr $(shfmt -f .)
4+
lint:
5+
uses: open-contracting/.github/.github/workflows/shell.yml@main

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
/*.pdf
77
/build
88
/cache.sqlite
9-
/chromedriver
10-
/chromedriver_linux64.zip
11-
/chromedriver_mac64.zip
12-
/chromedriver_win32.zip
139
/docs/_static/patched
1410
/src
1511
*.pyc

.pre-commit-config.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
ci:
2+
autoupdate_schedule: quarterly
3+
skip: [pip-compile]
4+
default_language_version:
5+
python: python3.10
6+
repos:
7+
- repo: https://github.com/astral-sh/ruff-pre-commit
8+
rev: v0.8.6
9+
hooks:
10+
- id: ruff
11+
- id: ruff-format
12+
- repo: https://github.com/astral-sh/uv-pre-commit
13+
rev: 0.5.14
14+
hooks:
15+
- id: pip-compile
16+
name: pip-compile common-requirements.in
17+
args: [common-requirements.in, -o, common-requirements.txt]
18+
files: ^common-requirements\.(in|txt)$

.python-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.10

common-requirements.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,4 @@ selenium
1919

2020
# Development
2121
click
22-
pip-tools
2322
sphinx-autobuild

common-requirements.txt

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,42 @@
22
# uv pip compile common-requirements.in -o common-requirements.txt
33
alabaster==0.7.12
44
# via sphinx
5+
anyio==4.4.0
6+
# via
7+
# starlette
8+
# watchfiles
59
async-generator==1.10
610
# via
711
# trio
812
# trio-websocket
9-
attrs==20.3.0
13+
attrs==23.1.0
1014
# via
15+
# cattrs
1116
# outcome
1217
# pytest
18+
# requests-cache
1319
# trio
1420
babel==2.9.1
1521
# via
1622
# sphinx
1723
# sphinx-intl
18-
build==0.10.0
19-
# via pip-tools
20-
certifi==2022.12.7
24+
cattrs==23.1.2
25+
# via requests-cache
26+
certifi==2024.7.4
2127
# via
2228
# elastic-transport
2329
# requests
24-
# urllib3
25-
cffi==1.15.0
26-
# via cryptography
30+
# selenium
2731
charset-normalizer==3.1.0
2832
# via requests
2933
click==8.1.3
3034
# via
3135
# -r common-requirements.in
3236
# ocdsindex
33-
# pip-tools
3437
# sphinx-intl
35-
colorama==0.4.4
38+
# uvicorn
39+
colorama==0.4.6
3640
# via sphinx-autobuild
37-
cryptography==41.0.1
38-
# via
39-
# pyopenssl
40-
# urllib3
4141
docutils==0.18
4242
# via
4343
# myst-parser
@@ -46,15 +46,20 @@ elastic-transport==8.4.0
4646
# via elasticsearch
4747
elasticsearch==8.6.2
4848
# via ocdsindex
49-
exceptiongroup==1.0.0
50-
# via pytest
49+
exceptiongroup==1.2.2
50+
# via
51+
# anyio
52+
# cattrs
53+
# pytest
5154
h11==0.13.0
52-
# via wsproto
53-
idna==2.10
5455
# via
56+
# uvicorn
57+
# wsproto
58+
idna==3.7
59+
# via
60+
# anyio
5561
# requests
5662
# trio
57-
# urllib3
5863
imagesize==1.4.1
5964
# via sphinx
6065
iniconfig==1.1.1
@@ -69,8 +74,6 @@ jsonref==1.0.0.post1
6974
# via ocdsextensionregistry
7075
linkify-it-py==1.0.1
7176
# via -r common-requirements.in
72-
livereload==2.6.3
73-
# via sphinx-autobuild
7477
lxml==4.9.1
7578
# via ocdsindex
7679
markdown-it-py==2.2.0
@@ -85,61 +88,50 @@ mdurl==0.1.2
8588
# via markdown-it-py
8689
myst-parser==0.18.1
8790
# via -r common-requirements.in
88-
ocds-babel==0.3.1
91+
ocds-babel==0.3.6
8992
# via -r common-requirements.in
90-
ocdsextensionregistry==0.1.12
93+
ocdsextensionregistry==0.6.5
9194
# via -r common-requirements.in
9295
ocdsindex==0.2.0
9396
# via -r common-requirements.in
9497
outcome==1.1.0
9598
# via trio
96-
packaging==21.3
99+
packaging==24.1
97100
# via
98-
# build
99101
# pytest
100102
# sphinx
101-
pip==25.0
102-
# via pip-tools
103-
pip-tools==6.13.0
104-
# via -r common-requirements.in
103+
platformdirs==3.9.1
104+
# via requests-cache
105105
pluggy==0.13.1
106106
# via pytest
107-
pycparser==2.21
108-
# via cffi
109-
pygments==2.13.0
107+
pygments==2.15.1
110108
# via sphinx
111-
pyopenssl==22.0.0
112-
# via urllib3
113-
pyparsing==2.4.7
114-
# via packaging
115-
pyproject-hooks==1.0.0
116-
# via build
117109
pysocks==1.7.1
118110
# via urllib3
119111
pytest==7.2.0
120112
# via -r common-requirements.in
121113
pytz==2021.1
122114
# via babel
123-
pyyaml==5.4.1
115+
pyyaml==6.0.1
124116
# via myst-parser
125-
requests==2.31.0
117+
requests==2.32.2
126118
# via
127119
# elasticsearch
128120
# ocdsextensionregistry
129121
# requests-cache
130122
# sphinx
131-
requests-cache==0.5.2
123+
requests-cache==1.1.0
132124
# via ocdsextensionregistry
133-
selenium==4.1.3
125+
selenium==4.11.2
134126
# via -r common-requirements.in
135-
setuptools==75.8.0
136-
# via
137-
# pip-tools
138-
# sphinx-intl
139-
six==1.15.0
140-
# via livereload
127+
setuptools==75.2.0
128+
# via sphinx-intl
129+
six==1.16.0
130+
# via url-normalize
141131
sniffio==1.2.0
142-
# via trio
132+
# via
133+
# anyio
134+
# trio
143135
snowballstemmer==2.1.0
144136
# via sphinx
145137
sortedcontainers==2.4.0
@@ -150,9 +142,9 @@ sphinx==5.3.0
150142
# myst-parser
151143
# sphinx-autobuild
152144
# sphinx-intl
153-
sphinx-autobuild==2021.3.14
145+
sphinx-autobuild==2024.9.3
154146
# via -r common-requirements.in
155-
sphinx-intl==2.1.0
147+
sphinx-intl==2.2.0
156148
# via -r common-requirements.in
157149
sphinxcontrib-applehelp==1.0.2
158150
# via sphinx
@@ -166,31 +158,39 @@ sphinxcontrib-qthelp==1.0.3
166158
# via sphinx
167159
sphinxcontrib-serializinghtml==1.1.5
168160
# via sphinx
169-
standard-theme @ git+https://github.com/open-contracting/standard_theme.git@d56505d69fceeb43535a3387172b2024eead536e#egg=standard_theme
161+
standard-theme @ git+https://github.com/open-contracting/standard_theme.git@5de343d1d8e342b5f2a42c6132db37aebe382e36#egg=standard_theme
170162
# via -r common-requirements.in
163+
starlette==0.40.0
164+
# via sphinx-autobuild
171165
tomli==2.0.1
172-
# via
173-
# build
174-
# pyproject-hooks
175-
# pytest
176-
tornado==6.3.2
177-
# via livereload
166+
# via pytest
178167
trio==0.20.0
179168
# via
180169
# selenium
181170
# trio-websocket
182171
trio-websocket==0.9.2
183172
# via selenium
184173
typing-extensions==4.4.0
185-
# via myst-parser
174+
# via
175+
# anyio
176+
# cattrs
177+
# myst-parser
178+
# uvicorn
186179
uc-micro-py==1.0.1
187180
# via linkify-it-py
188-
urllib3==1.26.5
181+
url-normalize==1.4.3
182+
# via requests-cache
183+
urllib3==1.26.19
189184
# via
190185
# elastic-transport
191186
# requests
187+
# requests-cache
192188
# selenium
193-
wheel==0.38.4
194-
# via pip-tools
189+
uvicorn==0.30.6
190+
# via sphinx-autobuild
191+
watchfiles==0.24.0
192+
# via sphinx-autobuild
193+
websockets==13.0.1
194+
# via sphinx-autobuild
195195
wsproto==1.1.0
196196
# via trio-websocket

include/common.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# See https://github.com/datamade/data-making-guidelines
22

3-
# See http://clarkgrubb.com/makefile-style-guide#phony-target-arg
3+
# See https://clarkgrubb.com/makefile-style-guide#phony-target-arg
44
FORCE:
55

6-
# http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
6+
# https://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
77
COMMA := ,
88
SPACE :=
99
SPACE +=
1010
COMMA_SEPARATED_TRANSLATIONS=$(subst $(SPACE),$(COMMA),$(TRANSLATIONS:.%=%))
1111

12-
# See http://clarkgrubb.com/makefile-style-guide#phony-targets
12+
# See https://clarkgrubb.com/makefile-style-guide#phony-targets
1313
.PHONY: clean
1414
clean:
1515
rm -rf $(BUILD_DIR)
@@ -45,7 +45,7 @@ extract_schema: $(POT_DIR)
4545

4646
# The codelist CSV files and JSON Schema files must be present for the `csv-table-no-translate` and `jsonschema`
4747
# directives to succeed, but the contents of the files have no effect on the generated .pot files.
48-
# See http://www.sphinx-doc.org/en/stable/builders.html#sphinx.builders.gettext.MessageCatalogBuilder
48+
# See https://www.sphinx-doc.org/en/master/usage/builders/index.html#sphinx.builders.gettext.MessageCatalogBuilder
4949
.PHONY: extract_markdown
5050
extract_markdown: current_lang.en
5151
sphinx-build -nW --keep-going -q -b gettext $(DOCS_DIR) $(POT_DIR)
@@ -110,7 +110,7 @@ clean_current_lang:
110110
### Build
111111

112112
# Build the source documentation.
113-
# See http://www.sphinx-doc.org/en/stable/builders.html#sphinx.builders.html.DirectoryHTMLBuilder
113+
# See https://www.sphinx-doc.org/en/master/usage/builders/index.html#sphinx.builders.html.DirectoryHTMLBuilder
114114
.PHONY: build_source
115115
build_source: current_lang.en
116116
sphinx-build -nW --keep-going -q -b dirhtml $(DOCS_DIR) $(BUILD_DIR)/en

include/prologue.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://clarkgrubb.com/makefile-style-guide#prologue
1+
# See https://clarkgrubb.com/makefile-style-guide#prologue
22
MAKEFLAGS += --warn-undefined-variables
33
SHELL := bash
44
.SHELLFLAGS := -eu -o pipefail -c

0 commit comments

Comments
 (0)