From 3cb5b67302d2b83c3751a493251d40dc19529912 Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Mon, 13 Mar 2023 11:50:51 +0000 Subject: [PATCH 1/4] Update dependencies with pip-compile --- Makefile | 6 ++++-- requirements.in | 6 ++++++ requirements.txt | 9 ++------- 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 requirements.in diff --git a/Makefile b/Makefile index 04f5ed9a..54ff3425 100644 --- a/Makefile +++ b/Makefile @@ -55,5 +55,7 @@ clean: update-project-template: npx update-template https://github.com/googlefonts/googlefonts-project-template/ -update: - pip install --upgrade $(dependency); pip freeze > requirements.txt +update: venv + venv/bin/pip install --upgrade pip-tools + venv/bin/pip-compile --upgrade --resolver=backtracking requirements.in + venv/bin/pip-sync requirements.txt diff --git a/requirements.in b/requirements.in new file mode 100644 index 00000000..25d651b1 --- /dev/null +++ b/requirements.in @@ -0,0 +1,6 @@ +fontmake>=3.9.0 +gftools[qa]>=0.9.54 +drawbot-skia>=0.5.0 +sh>=2.0.6 +bumpfontversion>=0.4.1 +diffenator2>=0.3.8 diff --git a/requirements.txt b/requirements.txt index 6cad8a15..5dc91024 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,2 @@ -fontmake>=3.9.0 -gftools[qa]>=0.9.54 -drawbot-skia>=0.5.0 -sh>=2.0.6 -bumpfontversion>=0.4.1 -diffenator2>=0.3.8 - +# Placeholder file, update the requirements by running `make update`. +-r requirements.in From 5bb9c44648351090c585a7fb3ff93811c5315072 Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Mon, 13 Mar 2023 15:47:16 +0000 Subject: [PATCH 2/4] Add note --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 54ff3425..7d188af5 100644 --- a/Makefile +++ b/Makefile @@ -57,5 +57,7 @@ update-project-template: update: venv venv/bin/pip install --upgrade pip-tools + # See https://pip-tools.readthedocs.io/en/latest/#a-note-on-resolvers for + # the `--resolver` flag below. venv/bin/pip-compile --upgrade --resolver=backtracking requirements.in venv/bin/pip-sync requirements.txt From d288a10ecf0087f51eca40207bf35d8f61296a0e Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Fri, 12 Apr 2024 07:11:57 +0100 Subject: [PATCH 3/4] Also update test --- Makefile | 8 +++++++- requirements-test.in | 2 ++ requirements-test.txt | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 requirements-test.in diff --git a/Makefile b/Makefile index 7d188af5..4c73702d 100644 --- a/Makefile +++ b/Makefile @@ -55,9 +55,15 @@ clean: update-project-template: npx update-template https://github.com/googlefonts/googlefonts-project-template/ -update: venv +update: venv venv-test venv/bin/pip install --upgrade pip-tools # See https://pip-tools.readthedocs.io/en/latest/#a-note-on-resolvers for # the `--resolver` flag below. venv/bin/pip-compile --upgrade --resolver=backtracking requirements.in venv/bin/pip-sync requirements.txt + + venv-test/bin/pip install --upgrade pip-tools + # See https://pip-tools.readthedocs.io/en/latest/#a-note-on-resolvers for + # the `--resolver` flag below. + venv-test/bin/pip-compile --upgrade --resolver=backtracking requirements-test.in + venv-test/bin/pip-sync requirements-test.txt diff --git a/requirements-test.in b/requirements-test.in new file mode 100644 index 00000000..d3260664 --- /dev/null +++ b/requirements-test.in @@ -0,0 +1,2 @@ +fontbakery[googlefonts]>=0.9.2 +gftools[qa]>=0.9.23 diff --git a/requirements-test.txt b/requirements-test.txt index 2d0f9077..161ef17e 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,2 +1,2 @@ -fontbakery[googlefonts]>=0.11.2 -gftools[qa]>=0.9.54 +# Placeholder file, update the requirements by running `make update`. +-r requirements-test.in From 55fe06c519433d1d98fe17c34e87f543d01799eb Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Fri, 12 Apr 2024 07:15:50 +0100 Subject: [PATCH 4/4] Be verbose, do the test as well, commit requirements --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4c73702d..e118fbd3 100644 --- a/Makefile +++ b/Makefile @@ -59,11 +59,12 @@ update: venv venv-test venv/bin/pip install --upgrade pip-tools # See https://pip-tools.readthedocs.io/en/latest/#a-note-on-resolvers for # the `--resolver` flag below. - venv/bin/pip-compile --upgrade --resolver=backtracking requirements.in + venv/bin/pip-compile --upgrade --verbose --resolver=backtracking requirements.in venv/bin/pip-sync requirements.txt venv-test/bin/pip install --upgrade pip-tools - # See https://pip-tools.readthedocs.io/en/latest/#a-note-on-resolvers for - # the `--resolver` flag below. - venv-test/bin/pip-compile --upgrade --resolver=backtracking requirements-test.in + venv-test/bin/pip-compile --upgrade --verbose --resolver=backtracking requirements-test.in venv-test/bin/pip-sync requirements-test.txt + + git commit -m "Update requirements" requirements.txt requirements-test.txt + git push