From f7a169ff3bb8859b92a48005ed5beb3a441108d8 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Fri, 27 Oct 2023 23:32:57 -0700 Subject: [PATCH 1/3] Document use of Just --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 198a2605..d13a9a26 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,11 @@ Grab the build dependencies with: python3-dev build-essential \ node-less node-source-map -Install [install pip](https://pip.pypa.io/en/latest/installing/#get-pip), then install [Tox](http://tox.readthedocs.org/en/latest/). +[Install pip](https://pip.pypa.io/en/latest/installing/#get-pip), then install [Tox](http://tox.readthedocs.org/en/latest/). (I actually recommend installing this in your home directory, but that's outside the scope of this document.) +[Install Just](https://just.systems/man/en/), probaby via Cargo. + Check out the repository: $ git checkout https://github.com/twm/yarrharr.git From 8cb1c5b8201c63b32b71648a3919da1e2e450381 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Fri, 27 Oct 2023 23:41:38 -0700 Subject: [PATCH 2/3] Clean up Makeisms --- justfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/justfile b/justfile index a6b36722..43228955 100644 --- a/justfile +++ b/justfile @@ -1,25 +1,29 @@ # Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2022, 2023 Tom Most ; GPLv3+ +set shell := ["bash", "-euc"] + +default: + just --list + static: tox -e static release: static - set -e + #!/usr/bin/env bash + set -exu -o pipefail git diff --quiet HEAD || exit 1 tox -e release --notest - version=$$(grep -oP '(?<=__version__ = ")([^"]+)(?=")' yarrharr/__init__.py) + version=$(grep -oP '(?<=__version__ = ")([^"]+)(?=")' yarrharr/__init__.py) .tox/release/bin/python -m build - .tox/release/bin/python -m twine check "dist/yarrharr-$${version}.tar.gz" "dist/yarrharr-$${version}-py3-none-any.whl" - git tag "v$${version}" + .tox/release/bin/python -m twine check "dist/yarrharr-${version}.tar.gz" "dist/yarrharr-${version}-py3-none-any.whl" + git tag "v${version}" devserver: static - set -e tox -e run -- django-admin migrate tox -e run -- django-admin updatehtml YARRHARR_CONF='yarrharr/tests/*.ini' tox -e run -- django-admin runserver 127.0.0.1:8888 realserver: static - set -e tox -e run -- django-admin migrate tox -e run -- django-admin collectstatic --noinput tox -e run -- yarrharr From 83b734c57078459b7232c4b5acc438fa2f5e51a1 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Fri, 27 Oct 2023 23:55:49 -0700 Subject: [PATCH 3/3] Make static private --- justfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/justfile b/justfile index 43228955..de729f74 100644 --- a/justfile +++ b/justfile @@ -5,10 +5,10 @@ set shell := ["bash", "-euc"] default: just --list -static: +_static: tox -e static -release: static +release: _static #!/usr/bin/env bash set -exu -o pipefail git diff --quiet HEAD || exit 1 @@ -18,12 +18,12 @@ release: static .tox/release/bin/python -m twine check "dist/yarrharr-${version}.tar.gz" "dist/yarrharr-${version}-py3-none-any.whl" git tag "v${version}" -devserver: static +devserver: _static tox -e run -- django-admin migrate tox -e run -- django-admin updatehtml YARRHARR_CONF='yarrharr/tests/*.ini' tox -e run -- django-admin runserver 127.0.0.1:8888 -realserver: static +realserver: _static tox -e run -- django-admin migrate tox -e run -- django-admin collectstatic --noinput tox -e run -- yarrharr