Start using an init-environment helper and bump pyenv version
This commit is contained in:
		| @@ -1 +1 @@ | |||||||
| 3.11.4 | 3.12.4 | ||||||
|   | |||||||
							
								
								
									
										5
									
								
								Pipfile
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								Pipfile
									
									
									
									
									
								
							| @@ -4,11 +4,12 @@ verify_ssl = true | |||||||
| name = "pypi" | name = "pypi" | ||||||
|  |  | ||||||
| [packages] | [packages] | ||||||
| pyyaml = ">=5.4" | #pyyaml = ">=5.4" | ||||||
|  | pyyaml = "*" | ||||||
|  |  | ||||||
| [dev-packages] | [dev-packages] | ||||||
|  |  | ||||||
| [requires] | [requires] | ||||||
| python_version = "3.11.4" | python_version = "3.12" | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										16
									
								
								Pipfile.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										16
									
								
								Pipfile.lock
									
									
									
										generated
									
									
									
								
							| @@ -1,11 +1,11 @@ | |||||||
| { | { | ||||||
|     "_meta": { |     "_meta": { | ||||||
|         "hash": { |         "hash": { | ||||||
|             "sha256": "8c9a360e47ffd3442df22d4110e1463a62ea4dc7c0217a87a57b642b78c3d609" |             "sha256": "32165f2eba4fd1d8db46f280f7cc3f2c9a5ed5ed87eb9ecc34f26b08ffdee5ac" | ||||||
|         }, |         }, | ||||||
|         "pipfile-spec": 6, |         "pipfile-spec": 6, | ||||||
|         "requires": { |         "requires": { | ||||||
|             "python_version": "3.11.4" |             "python_version": "3.12" | ||||||
|         }, |         }, | ||||||
|         "sources": [ |         "sources": [ | ||||||
|             { |             { | ||||||
| @@ -18,7 +18,9 @@ | |||||||
|     "default": { |     "default": { | ||||||
|         "pyyaml": { |         "pyyaml": { | ||||||
|             "hashes": [ |             "hashes": [ | ||||||
|  |                 "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5", | ||||||
|                 "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc", |                 "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc", | ||||||
|  |                 "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df", | ||||||
|                 "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741", |                 "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741", | ||||||
|                 "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206", |                 "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206", | ||||||
|                 "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27", |                 "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27", | ||||||
| @@ -26,7 +28,10 @@ | |||||||
|                 "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62", |                 "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62", | ||||||
|                 "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98", |                 "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98", | ||||||
|                 "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696", |                 "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696", | ||||||
|  |                 "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290", | ||||||
|  |                 "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9", | ||||||
|                 "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d", |                 "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d", | ||||||
|  |                 "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6", | ||||||
|                 "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867", |                 "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867", | ||||||
|                 "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47", |                 "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47", | ||||||
|                 "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486", |                 "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486", | ||||||
| @@ -34,11 +39,15 @@ | |||||||
|                 "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3", |                 "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3", | ||||||
|                 "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007", |                 "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007", | ||||||
|                 "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938", |                 "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938", | ||||||
|  |                 "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0", | ||||||
|                 "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c", |                 "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c", | ||||||
|                 "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735", |                 "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735", | ||||||
|                 "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d", |                 "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d", | ||||||
|  |                 "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28", | ||||||
|  |                 "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4", | ||||||
|                 "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba", |                 "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba", | ||||||
|                 "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8", |                 "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8", | ||||||
|  |                 "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef", | ||||||
|                 "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5", |                 "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5", | ||||||
|                 "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd", |                 "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd", | ||||||
|                 "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3", |                 "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3", | ||||||
| @@ -51,7 +60,9 @@ | |||||||
|                 "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43", |                 "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43", | ||||||
|                 "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859", |                 "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859", | ||||||
|                 "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673", |                 "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673", | ||||||
|  |                 "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54", | ||||||
|                 "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a", |                 "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a", | ||||||
|  |                 "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b", | ||||||
|                 "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab", |                 "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab", | ||||||
|                 "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa", |                 "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa", | ||||||
|                 "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c", |                 "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c", | ||||||
| @@ -60,6 +71,7 @@ | |||||||
|                 "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f" |                 "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f" | ||||||
|             ], |             ], | ||||||
|             "index": "pypi", |             "index": "pypi", | ||||||
|  |             "markers": "python_version >= '3.6'", | ||||||
|             "version": "==6.0.1" |             "version": "==6.0.1" | ||||||
|         } |         } | ||||||
|     }, |     }, | ||||||
|   | |||||||
							
								
								
									
										47
									
								
								init-environment
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										47
									
								
								init-environment
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,47 @@ | |||||||
|  | #!/bin/bash | ||||||
|  |  | ||||||
|  | log() | ||||||
|  | { | ||||||
|  | 	echo "[Mike's Backup Rotator - Init Env] $1" | ||||||
|  | } | ||||||
|  | complain() | ||||||
|  | { | ||||||
|  | 	echo "[Mike's Backup Rotator - Init Env] $1" 1>&2 | ||||||
|  | } | ||||||
|  | die() | ||||||
|  | { | ||||||
|  | 	complain "Fatal: $1" | ||||||
|  | 	exit 1 | ||||||
|  | } | ||||||
|  |  | ||||||
|  | SCRIPT_PATH=$(readlink -f "$0") | ||||||
|  | SCRIPT_DIR=$(dirname "$SCRIPT_PATH") | ||||||
|  | SCRIPT_NAME=$(basename "$SCRIPT_PATH") | ||||||
|  |  | ||||||
|  | log "Begin ${SCRIPT_NAME}" | ||||||
|  | log "Script path: ${SCRIPT_PATH}" | ||||||
|  | log "Script dir: ${SCRIPT_DIR}" | ||||||
|  | log "PATH: ${PATH}" | ||||||
|  |  | ||||||
|  | log "PWD before switching: $(pwd)" | ||||||
|  | cd "${SCRIPT_DIR}" || die "Failed to switch to project directory: ${SCRIPT_DIR}" | ||||||
|  | log "PWD after switching: $(pwd)" | ||||||
|  |  | ||||||
|  | log "Printing environment:" | ||||||
|  | printenv | ||||||
|  |  | ||||||
|  | log "Ensuring python installation with pyenv" | ||||||
|  | pyenv versions | ||||||
|  | pyenv install --skip-existing || die "Failed to ensure python installation with pyenv" | ||||||
|  |  | ||||||
|  | log "Installing/upgrading pip and pipenv" | ||||||
|  | pip install --upgrade pip pipenv || die "Failed to install/upgrade pip and pipenv" | ||||||
|  |  | ||||||
|  | log "Removing old pip environment" | ||||||
|  | pipenv --rm  # Don't die because this will return an error if the env didn't already exist | ||||||
|  |  | ||||||
|  | # Install/sync | ||||||
|  | log "Syncing pip dependencies" | ||||||
|  | pipenv sync || die "Failed to sync pip environment with pipenv" | ||||||
|  |  | ||||||
|  |  | ||||||
		Reference in New Issue
	
	Block a user