Prep rel 1.1.1

.cruft.json

@@ -11,7 +11,7 @@
       "project_repo_name": "rook",
       "project_readthedocs_name": "rook",
       "project_short_description": "A WPS service for roocs.",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "open_source_license": "Apache Software License 2.0",
       "http_port": "5000",
       "use_pytest": "y",

CHANGELOG.rst

@@ -6,6 +6,14 @@ Unreleased
 
 * No changes yet.
 
+1.1.1 (2026-06-17)
+==================
+
+* Fixed post-merge CI behavior by skipping the ``no-commit-to-branch`` pre-commit hook on ``main`` workflow runs while keeping it active for pull requests and local use.
+* Gated PyPI/TestPyPI publish jobs behind explicit repository variables to avoid failing release/tag post-process workflows when publishing is not enabled.
+* Added ``make conda-lock`` and ``make conda-spec`` targets to automate regeneration of ``conda-lock.yml`` and ``linux-64.spec`` (with ``spec-file.txt`` alias refresh) for release prep.
+* Added a concise ``Patch Release Quickstart`` section in ``README.rst`` under Contributing with minimal patch-release steps.
+
 1.1.0 (2026-06-16)
 ==================
 

Dockerfile

@@ -3,7 +3,7 @@ FROM continuumio/miniconda3
 ARG DEBIAN_FRONTEND=noninteractive
 ENV PIP_ROOT_USER_ACTION=ignore
 LABEL org.opencontainers.image.authors=https://github.com/roocs/rook
-LABEL Description="rook WPS" Vendor="Birdhouse" Version="1.1.0"
+LABEL Description="rook WPS" Vendor="Birdhouse" Version="1.1.1"
 
 # Set the working directory to /code
 WORKDIR /code

Makefile

@@ -3,6 +3,9 @@ APP_ROOT := $(abspath $(lastword $(MAKEFILE_LIST))/..)
 APP_NAME := rook
 
 WPS_URL = http://localhost:5000
+CONDA_LOCK_PLATFORM ?= linux-64
+CONDA_LOCK_FILE ?= conda-lock.yml
+CONDA_SPEC_FILE ?= $(CONDA_LOCK_PLATFORM).spec
 
 # Used in target refresh-notebooks to make it looks like the notebooks have
 # been refreshed from the production server below instead of from the local dev
@@ -180,6 +183,16 @@ refresh-notebooks: ## refreshing all notebook outputs under docs/source/notebook
 
 ## Deployment targets:
 
+conda-lock: ## regenerate conda lock file from environment.yml
+	@echo "Regenerating $(CONDA_LOCK_FILE) for $(CONDA_LOCK_PLATFORM) ..."
+	@conda-lock lock -f environment.yml -p $(CONDA_LOCK_PLATFORM) --lockfile $(CONDA_LOCK_FILE)
+
+conda-spec: conda-lock ## regenerate explicit conda spec file and refresh spec-file.txt alias
+	@echo "Rendering $(CONDA_SPEC_FILE) from $(CONDA_LOCK_FILE) ..."
+	@conda-lock render -k explicit -p $(CONDA_LOCK_PLATFORM) --filename-template '{platform}.spec' $(CONDA_LOCK_FILE)
+	@ln -sfn $(CONDA_SPEC_FILE) spec-file.txt
+	@ls -l $(CONDA_SPEC_FILE) spec-file.txt
+
 dist: clean ## build source and wheel package
 	@echo "Building source and wheel package ..."
 	@python -m flit build

README.rst

@@ -68,6 +68,27 @@ You can find information about contributing in our `Developer Guide`_.
 
 Use bump-my-version_ to release a new version.
 
+Patch Release Quickstart
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Minimal patch release flow (example: ``1.1.1``):
+
+.. code-block:: console
+
+        $ edit CHANGELOG.rst
+        $ make conda-spec
+        $ bump-my-version bump --new-version 1.1.1 patch
+        $ git push
+        $ git push --tags
+
+What this does:
+
+* ``edit CHANGELOG.rst`` adds the release notes for the new patch version.
+* ``make conda-spec`` regenerates ``conda-lock.yml`` and ``linux-64.spec`` (and refreshes ``spec-file.txt``).
+* ``bump-my-version`` updates version metadata and creates the release tag.
+* ``git push`` publishes the commit.
+* ``git push --tags`` publishes the release tag and triggers release/tag workflows.
+
 Tests
 -----