From 342eb5b259209720df51254357c54d46a0a743c5 Mon Sep 17 00:00:00 2001
From: Brian Kroth <bpkroth@users.noreply.github.com>
Date: Thu, 18 Jan 2024 18:53:20 -0600
Subject: [PATCH] PyPi publish makefile rules fixup (#640)

Prior Makefile rule consolidation tried to group dependencies for the
pattern rule into separate lines for readability, but apparently this
isn't allowed.

This minor changes separates those out into a variable we can reference
instead. Tested on a clean build tree locally.
---
 .bumpversion.cfg       |  2 +-
 Makefile               | 21 +++++++++++----------
 doc/source/conf.py     |  2 +-
 mlos_bench/_version.py |  2 +-
 mlos_core/_version.py  |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index fb05266cb6..c4f5c22063 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.1
+current_version = 0.3.2
 commit = True
 tag = True
 
diff --git a/Makefile b/Makefile
index 91d959d5e4..23607ed7fb 100644
--- a/Makefile
+++ b/Makefile
@@ -346,27 +346,28 @@ dist-test-clean: dist-test-env-clean
 publish: publish-pypi
 
 .PHONY:
-publish-pypi-deps: build/publish-pypi-deps.build-stamp
+publish-pypi-deps: build/publish-pypi-deps.${CONDA_ENV_NAME}.build-stamp
 
 build/publish-pypi-deps.${CONDA_ENV_NAME}.build-stamp: build/conda-env.${CONDA_ENV_NAME}.build-stamp
 	conda run -n ${CONDA_ENV_NAME} pip install -U twine
 	touch $@
 
-build/publish.%.py.build-stamp: build/publish-pypi-deps.${CONDA_ENV_NAME}.build-stamp
-build/publish.%.py.build-stamp: build/pytest.${CONDA_ENV_NAME}.build-stamp
-build/publish.%.py.build-stamp: build/dist-test.$(PYTHON_VERSION).build-stamp
-build/publish.%.py.build-stamp: build/check-doc.build-stamp
-build/publish.%.py.build-stamp: build/linklint-doc.build-stamp
-build/publish.%.py.build-stamp:
+PUBLISH_DEPS := build/publish-pypi-deps.${CONDA_ENV_NAME}.build-stamp
+PUBLISH_DEPS += build/pytest.${CONDA_ENV_NAME}.build-stamp
+PUBLISH_DEPS += build/dist-test.$(PYTHON_VERSION).build-stamp
+PUBLISH_DEPS += build/check-doc.build-stamp
+PUBLISH_DEPS += build/linklint-doc.build-stamp
+
+build/publish.${CONDA_ENV_NAME}.%.py.build-stamp: $(PUBLISH_DEPS)
 	rm -f mlos_*/dist/*.tar.gz
 	ls mlos_*/dist/*.tar | xargs -I% gzip -k %
-	repo_name=`echo "$@" | sed -e 's|build/publish\.||' -e 's|\.py\.build-stamp||'` \
+	repo_name=`echo "$@" | sed -r -e 's|build/publish\.[^.]+\.||' -e 's|\.py\.build-stamp||'` \
 		&& conda run -n ${CONDA_ENV_NAME} python3 -m twine upload --repository $$repo_name \
 			mlos_*/dist/mlos*-*.tar.gz mlos_*/dist/mlos*-*.whl
 	touch $@
 
-publish-pypi: build/publish.pypi.py.build-stamp
-publish-test-pypi: build/publish.testpypi.py.build-stamp
+publish-pypi: build/publish.${CONDA_ENV_NAME}.pypi.py.build-stamp
+publish-test-pypi: build/publish.${CONDA_ENV_NAME}.testpypi.py.build-stamp
 
 build/doc-prereqs.${CONDA_ENV_NAME}.build-stamp: build/conda-env.${CONDA_ENV_NAME}.build-stamp
 build/doc-prereqs.${CONDA_ENV_NAME}.build-stamp: doc/requirements.txt
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c3b88d74ce..b0869ca690 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -36,7 +36,7 @@ copyright = '2024, GSL'
 author = 'GSL'
 
 # The full version, including alpha/beta/rc tags
-release = '0.3.1'
+release = '0.3.2'
 
 try:
     from setuptools_scm import get_version
diff --git a/mlos_bench/_version.py b/mlos_bench/_version.py
index a8b115f7e3..5f5ae92a60 100644
--- a/mlos_bench/_version.py
+++ b/mlos_bench/_version.py
@@ -7,4 +7,4 @@ Version number for the mlos_bench package.
 """
 
 # NOTE: This should be managed by bumpversion.
-_VERSION = '0.3.1'
+_VERSION = '0.3.2'
diff --git a/mlos_core/_version.py b/mlos_core/_version.py
index 08d17a0e68..daeca84551 100644
--- a/mlos_core/_version.py
+++ b/mlos_core/_version.py
@@ -7,4 +7,4 @@ Version number for the mlos_core package.
 """
 
 # NOTE: This should be managed by bumpversion.
-_VERSION = '0.3.1'
+_VERSION = '0.3.2'