build-release: Support repos with multiple distribution packages

For repos with multiple distribution packages, they're still released
individually by running `build-release` in the directory with the
package's pyproject.toml. But if there's no `pactivate` in the current
working directory, we look for `../pactivate` and use the shared
../.build/ and its virtualenv.

This removes the previous support for giving a subdirectory name,
which superficially had a similar effect but didn't actually deal with
multiple packages in one .build/release/ dir properly. We might add
this back at a later point if we feel it's useful not to have to `cd`.

Amongst other changes, this now requires that our logfile names
include the name of the distribution package and that when we clean
before building we remove only the logfile and package files for this
package, not all packages.

Author: 0cjs

README.md

@@ -6,18 +6,23 @@ distribution package and releasing it to [PyPI][] (the Python Package
 Index), whence it can be installed [pip] and similar tools.
 
 Requirements:
-- You must be using a `pyproject.toml` file to define your project
-  information.
+- You must be using a `pyproject.toml` file to define your project information.
 - You must have [`pactivate`] present in the same directory as
-  `pyproject.toml` to build a virtual environment. (You do not actually
-  need to be using pactivate for your project itself, though of course this
-  is recommended!)
+  `pyproject.toml` or in the parent directory. . (You do not actually need
+  to be using pactivate for your project itself, though of course this is
+  recommended!)
 
 Currently this is mostly a manual process, but a little bit of it is
 automated with the [`build-release`](./build-release) script in this repo.
 That script can be run from any location, but it assumes that you're in the
 root of your project (i.e., the directory containing the `pyproject.toml`
-and `pactivate` files).
+file).
+
+The release files will be built under `.build/release/` in the same
+directory as `pactivate`. This allows for repos with a single package or
+repos with multiple distribution packages, each in a direct subdirectory of
+the repo root. (In the latter case you will want to use a tag name that
+includes the package name, rather than just `v0.0.0`.)
 
 
 Release Process
@@ -37,15 +42,10 @@ Release Process
 
 2. Build and check the release.
    - Change the current working directory to the project root.
-   - `build-release` assumes that the Python distribution module source
-     (i.e., the directory with `pyproject.toml`) is in the current working
-     directory. If it's in a subdirectory, provide that subdirectory name
-     _dir_ as a parameter: `build-release DIR`. (The virtualenv and output
-     files will still be under `.build/` under the CWD.)
-   - Run `build-release [DIR]`, which will do a few checks of the
-     configuration (these are far from comprehensive), create/activate the
-     `pactivate` virtualenv, install `build` and `twine`, and run
-     `pyproject-build` and `twine check`.
+   - Run `build-release`, which will do a few checks of the configuration
+     (these are far from comprehensive), create/activate the `pactivate`
+     virtualenv, install `build` and `twine`, and run `pyproject-build`
+     and `twine check`.
    - Fix anything broken.
 
 3. Upload the release

build-release

@@ -26,16 +26,13 @@ while [[ $# -gt 0 ]]; do case "$1" in
     -*)         die 2 "Unknown option: $1";;
     *)          break;;
 esac; done
-[[ $# -eq 0 ]] && packagedir='.'
-[[ $# -eq 1 ]] && { packagedir="$1"; shift; }
-[[ $# -eq 0 ]] || die 2 "Too many arguments."
+[[ $# -gt 0 ]] && die 2 "This program does not accept arguments."
 
 ####################################################################
 #   Configuration validation
 
-[[ -r $packagedir/pyproject.toml ]] \
-    || die 1 "$packagedir/pyproject.toml not found"
-if grep '^version = ' "$packagedir/pyproject.toml" | grep -q dev; then
+[[ -r pyproject.toml ]] || die 1 'pyproject.toml not found'
+if grep '^version = ' pyproject.toml | grep -q dev; then
     if $allow_dev; then
         warn  'pyproject.toml version number includes "dev"'
     else
@@ -48,20 +45,37 @@ fi
 ####################################################################
 #   Release process
 
-reldir=$(pwd -L)/.build/release
-
 echo '• pactivate'
-. ./pactivate -q
-pip -q install build twine
-rm -rf "$reldir"; mkdir -p "$reldir/dist"
+if [[ -r pactivate ]]; then
+    reldir=.build/release
+    . ./pactivate -q
+elif [[ -r ../pactivate ]]; then
+    reldir=../.build/release
+    . ../pactivate -q
+else
+    die 3 "Cannot find pactivate or ../pactivate"
+fi
+pip -q install build twine toml
+
+package_name=$(python3 -c '
+import toml;
+data = toml.load("pyproject.toml");
+print(data["project"]["name"])
+')
+logfile="$package_name-build.log"
 
-echo "• pyproject-build (output to $reldir/build.log)"
-pyproject-build >"$reldir/build.log" --outdir "$reldir/dist/" "$packagedir"
+echo '• cleaning previous builds'
+mkdir -p "$reldir/dist"
+rm -f "$reldir/$package_name"* "$reldir/dist/$package_name"*
+
+echo "• pyproject-build (output to $reldir/$logfile)"
+pyproject-build --outdir "$reldir/dist/" >"$reldir/$logfile"
 
 echo '• twine check'
 twine check --strict "$reldir/dist"/*
 if $upload; then
     echo '• twine upload'
     twine upload "$reldir/dist"/*
 fi
+
 echo '• OK'