dev: update cruft (#191)

Auto-created

.cookiecutter.json

@@ -12,5 +12,6 @@
     "license": "MIT",
     "package_name": "personal_mnemonic_medium",
     "project_name": "personal-mnemonic-medium",
+    "release_to_pypi": "no",
     "version": "0.0.0"
 }

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/MartinBernstorff/nimble-python-cookiecutter",
-  "commit": "8e9cf68661d4bc94541db5aa7c4988b81bf4067e",
+  "commit": "a68bfa18605c0fe171e2f9e8b4f047b786e93b56",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -13,6 +13,7 @@
       "github_repo": "personal-mnemonic-medium",
       "version": "0.0.0",
       "copyright_year": "2023",
+      "release_to_pypi": "no",
       "license": "MIT",
       "_copy_without_render": [
         "*.github"

.vscode/settings.json

@@ -13,7 +13,9 @@
         "**/CVS": true,
         "**/.DS_Store": true,
         "**/Thumbs.db": true,
-        "**/BUILD": true
+        "**/BUILD": true,
+        "*.egg-info": true,
+        "*.pytest_cache": true,
     },
     "python.analysis.diagnosticMode": "workspace"
 }

makefile

@@ -28,18 +28,42 @@ validate: ## Run all checks
 	make test
 	make build
 
-sync-pr:
+merge-main:
+	git fetch
+	git merge --no-edit origin/main
+
+push:
 	git push --set-upstream origin HEAD
 	git push
 
 create-pr:
-	gh pr create -w || true
+	gh pr create --title "$$(git log -1 --pretty=%B)" --body "Auto-created" || true
+
+enable-automerge:
+	gh pr merge --auto --squash --delete-branch
+
+squash-from-parent:
+	git fetch
+	git reset $$(git merge-base origin/main $$(git rev-parse --abbrev-ref HEAD)) ; git add -A ; git commit -m "Squash changes from parent branch"
 
-merge-pr:
-	gh pr merge --auto --merge --delete-branch
+create-random-branch:
+	@git checkout -b "$$(date +'%d_%H_%M')_$(shell cat /dev/urandom | env LC_ALL=C tr -dc 'a-z' | fold -w 5 | head -n 1)"
+
+pr-status:
+	@gh pr view | cat | grep "title" 
+	@gh pr view | cat | grep "url" 
 
 pr: ## Run relevant tests before PR
-	make sync-pr
+	make push
 	make create-pr
+	make merge-main
 	make validate
-	make merge-pr
+	make enable-automerge
+	@echo "––– 🎉🎉🎉 All tests succeeded! 🎉🎉🎉 –––"
+	make pr-status
+
+grow:
+	make pr
+	@echo "––– Growing into a new branch 🌳 –––"
+	make create-random-branch
+	make squash-from-parent

pyproject.toml

@@ -136,7 +136,6 @@ suppress-none-returning = true
 
 [tool.ruff.isort]
 known-third-party = ["wandb"]
-split-on-trailing-comma = false
 
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
@@ -149,3 +148,4 @@ build_command = "python -m pip install build; python -m build"
 
 [tool.setuptools]
 include-package-data = true
+