mirror of
				https://github.com/enpaul/vault2vault.git
				synced 2025-11-04 09:26:46 +00:00 
			
		
		
		
	Update poetry CI version to 1.4.1
Update CI env script to move poetry version to main CI workflow config
This commit is contained in:
		
							
								
								
									
										6
									
								
								.github/scripts/setup-env.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/scripts/setup-env.sh
									
									
									
									
										vendored
									
									
								
							@@ -4,11 +4,13 @@
 | 
			
		||||
# to create a repeatable local environment for tests to be run in. The python env
 | 
			
		||||
# this script creates can be accessed at the location defined by the CI_VENV variable
 | 
			
		||||
# below.
 | 
			
		||||
#
 | 
			
		||||
# POETRY_VERSION can be set to install a specific version of Poetry
 | 
			
		||||
 | 
			
		||||
set -e;
 | 
			
		||||
 | 
			
		||||
CI_CACHE=$HOME/.cache;
 | 
			
		||||
POETRY_VERSION=1.3.2;
 | 
			
		||||
INSTALL_POETRY_VERSION="${POETRY_VERSION:-1.3.2}";
 | 
			
		||||
 | 
			
		||||
mkdir --parents "$CI_CACHE";
 | 
			
		||||
 | 
			
		||||
@@ -20,7 +22,7 @@ curl --location https://install.python-poetry.org \
 | 
			
		||||
  --silent \
 | 
			
		||||
  --show-error;
 | 
			
		||||
python "$CI_CACHE/install-poetry.py" \
 | 
			
		||||
  --version "$POETRY_VERSION" \
 | 
			
		||||
  --version "$INSTALL_POETRY_VERSION" \
 | 
			
		||||
  --yes;
 | 
			
		||||
poetry --version --no-ansi;
 | 
			
		||||
poetry run pip --version;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/workflows/ci.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci.yaml
									
									
									
									
										vendored
									
									
								
							@@ -5,6 +5,8 @@ on:
 | 
			
		||||
    types: ["opened", "synchronize"]
 | 
			
		||||
  push:
 | 
			
		||||
    branches: ["devel"]
 | 
			
		||||
env:
 | 
			
		||||
  POETRY_VERSION: 1.4.1
 | 
			
		||||
jobs:
 | 
			
		||||
  Test:
 | 
			
		||||
    name: Python ${{ matrix.python.version }}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								poetry.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								poetry.lock
									
									
									
										generated
									
									
									
								
							@@ -884,6 +884,7 @@ files = [
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
[package.dependencies]
 | 
			
		||||
typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""}
 | 
			
		||||
zipp = ">=0.5"
 | 
			
		||||
 | 
			
		||||
[package.extras]
 | 
			
		||||
@@ -1687,6 +1688,9 @@ files = [
 | 
			
		||||
    {file = "poetry_core-1.5.2.tar.gz", hash = "sha256:c6556c3b1ec5b8668e6ef5a4494726bc41d31907339425e194e78a6178436c14"},
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
[package.dependencies]
 | 
			
		||||
importlib-metadata = {version = ">=1.7.0", markers = "python_version < \"3.8\""}
 | 
			
		||||
 | 
			
		||||
[[package]]
 | 
			
		||||
name = "poetry-plugin-export"
 | 
			
		||||
version = "1.3.0"
 | 
			
		||||
@@ -2443,6 +2447,7 @@ files = [
 | 
			
		||||
[package.dependencies]
 | 
			
		||||
colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""}
 | 
			
		||||
filelock = ">=3.0.0"
 | 
			
		||||
importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
 | 
			
		||||
packaging = ">=14"
 | 
			
		||||
pluggy = ">=0.12.0"
 | 
			
		||||
py = ">=1.4.17"
 | 
			
		||||
@@ -2559,6 +2564,7 @@ files = [
 | 
			
		||||
[package.dependencies]
 | 
			
		||||
distlib = ">=0.3.6,<1"
 | 
			
		||||
filelock = ">=3.4.1,<4"
 | 
			
		||||
importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.8\""}
 | 
			
		||||
platformdirs = ">=2.4,<4"
 | 
			
		||||
 | 
			
		||||
[package.extras]
 | 
			
		||||
@@ -2781,4 +2787,4 @@ ansible = ["ansible-core"]
 | 
			
		||||
[metadata]
 | 
			
		||||
lock-version = "2.0"
 | 
			
		||||
python-versions = "^3.6.1"
 | 
			
		||||
content-hash = "1980180d1636622d3aed84a9e8b3d0645b30d4ad3a765e82870ab0591b5e9126"
 | 
			
		||||
content-hash = "52d2e58443bf0e36f8b66e9575b21cf69f7c6beccbd4948400acff36a38721c7"
 | 
			
		||||
 
 | 
			
		||||
@@ -68,8 +68,10 @@ toml = {version = "^0.10.1", python = "^3.6"}
 | 
			
		||||
typing-extensions = {version = "^4.5.0", python = ">3.8"}
 | 
			
		||||
 | 
			
		||||
[tool.poetry.group.ci.dependencies]
 | 
			
		||||
tox = {version = "^3.20.0", python = "^3.10"}
 | 
			
		||||
tox-poetry-installer = {version = "^0.10.1", extras = ["poetry"], python = "^3.10"}
 | 
			
		||||
# The python versions here need to match the lowest python version
 | 
			
		||||
# used in CI
 | 
			
		||||
tox = {version = "^3.20.0", python = "^3.7"}
 | 
			
		||||
tox-poetry-installer = {version = "^0.10.1", extras = ["poetry"], python = "^3.7"}
 | 
			
		||||
 | 
			
		||||
[build-system]
 | 
			
		||||
requires = ["poetry-core>=1.1.0"]
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user