From 78690cfaf8cc92176e65d0d8b9db1a9f9a64db03 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Tue, 25 Oct 2022 12:54:34 +0200 Subject: [PATCH] lint: reformat appveyor yaml --- .appveyor/packages.yml | 82 +++++++++++++++++++++--------------------- .appveyor/tests.yml | 78 ++++++++++++++++++++-------------------- 2 files changed, 82 insertions(+), 78 deletions(-) diff --git a/.appveyor/packages.yml b/.appveyor/packages.yml index 28e432fd..2cbe0ea8 100644 --- a/.appveyor/packages.yml +++ b/.appveyor/packages.yml @@ -1,4 +1,4 @@ -version : 2.x.{build} +version: 2.x.{build} clone_folder: C:\Project @@ -8,48 +8,50 @@ configuration: - psycopg2-binary environment: - matrix: - # For Python versions available on Appveyor, see - # https://www.appveyor.com/docs/windows-images-software/#python - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "64"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "64"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "64"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "37", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "37", PY_ARCH: "64"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "36", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "36", PY_ARCH: "64"} + matrix: + # For Python versions available on Appveyor, see + # https://www.appveyor.com/docs/windows-images-software/#python + # - {PY_VER: "311", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + # - {PY_VER: "310", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "310", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "310", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "39", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "39", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "38", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "38", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "37", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "37", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "36", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "36", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} - WORKFLOW: packages + WORKFLOW: packages - OPENSSL_VERSION: "1_1_1r" - POSTGRES_VERSION: "15_0" + OPENSSL_VERSION: "1_1_1r" + POSTGRES_VERSION: "15_0" - PSYCOPG2_TESTDB: psycopg2_test - PSYCOPG2_TESTDB_USER: postgres - PSYCOPG2_TESTDB_HOST: localhost + PSYCOPG2_TESTDB: psycopg2_test + PSYCOPG2_TESTDB_USER: postgres + PSYCOPG2_TESTDB_HOST: localhost - PGUSER: postgres - PGPASSWORD: Password12! - PGSSLMODE: require + PGUSER: postgres + PGPASSWORD: Password12! + PGSSLMODE: require - # Add CWD to perl library path for PostgreSQL build on VS2019 - PERL5LIB: . + # Add CWD to perl library path for PostgreSQL build on VS2019 + PERL5LIB: . - # Select according to the service enabled - POSTGRES_DIR: C:\Program Files\PostgreSQL\9.6\ + # Select according to the service enabled + POSTGRES_DIR: C:\Program Files\PostgreSQL\9.6\ - # The python used in the build process, not the one packages are built for - PYEXE: C:\Python36\python.exe + # The python used in the build process, not the one packages are built for + PYEXE: C:\Python36\python.exe matrix: - fast_finish: false + fast_finish: false services: - # Note: if you change this service also change POSTGRES_DIR - - postgresql96 + # Note: if you change this service also change POSTGRES_DIR + - postgresql96 cache: # Rebuild cache if following file changes @@ -62,27 +64,27 @@ cache: # Repository gets cloned, Cache is restored install: - - "%PYEXE% scripts\\build\\appveyor.py install" + - "%PYEXE% scripts\\build\\appveyor.py install" # PostgreSQL server starts now -build: off +build: "off" build_script: - - "%PYEXE% scripts\\build\\appveyor.py build_script" + - "%PYEXE% scripts\\build\\appveyor.py build_script" after_build: - - "%PYEXE% scripts\\build\\appveyor.py after_build" + - "%PYEXE% scripts\\build\\appveyor.py after_build" before_test: - - "%PYEXE% scripts\\build\\appveyor.py before_test" + - "%PYEXE% scripts\\build\\appveyor.py before_test" test_script: - - "%PYEXE% scripts\\build\\appveyor.py test_script" + - "%PYEXE% scripts\\build\\appveyor.py test_script" artifacts: - - path: dist\psycopg2-*\*.whl - name: wheel + - path: dist\psycopg2-*\*.whl + name: wheel # vim: set ts=4 sts=4 sw=4: diff --git a/.appveyor/tests.yml b/.appveyor/tests.yml index 6bb1e055..3e71affa 100644 --- a/.appveyor/tests.yml +++ b/.appveyor/tests.yml @@ -1,50 +1,52 @@ -version : 2.x.{build} +version: 2.x.{build} clone_folder: C:\Project environment: - matrix: - # For Python versions available on Appveyor, see - # https://www.appveyor.com/docs/windows-images-software/#python - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "64"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "64"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "64"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "37", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "37", PY_ARCH: "64"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "36", PY_ARCH: "32"} - - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "36", PY_ARCH: "64"} + matrix: + # For Python versions available on Appveyor, see + # https://www.appveyor.com/docs/windows-images-software/#python + # - {PY_VER: "311", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + # - {PY_VER: "311", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "310", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "310", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "39", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "39", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019} + - {PY_VER: "38", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "38", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "37", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "37", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "36", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} + - {PY_VER: "36", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015} - WORKFLOW: tests + WORKFLOW: tests - OPENSSL_VERSION: "1_1_1r" - POSTGRES_VERSION: "15_0" + OPENSSL_VERSION: "1_1_1r" + POSTGRES_VERSION: "15_0" - PSYCOPG2_TESTDB: psycopg2_test - PSYCOPG2_TESTDB_USER: postgres - PSYCOPG2_TESTDB_HOST: localhost + PSYCOPG2_TESTDB: psycopg2_test + PSYCOPG2_TESTDB_USER: postgres + PSYCOPG2_TESTDB_HOST: localhost - PGUSER: postgres - PGPASSWORD: Password12! - PGSSLMODE: require + PGUSER: postgres + PGPASSWORD: Password12! + PGSSLMODE: require - # Add CWD to perl library path for PostgreSQL build on VS2019 - PERL5LIB: . + # Add CWD to perl library path for PostgreSQL build on VS2019 + PERL5LIB: . - # Select according to the service enabled - POSTGRES_DIR: C:\Program Files\PostgreSQL\9.6\ + # Select according to the service enabled + POSTGRES_DIR: C:\Program Files\PostgreSQL\9.6\ - # The python used in the build process, not the one packages are built for - PYEXE: C:\Python36\python.exe + # The python used in the build process, not the one packages are built for + PYEXE: C:\Python36\python.exe matrix: - fast_finish: false + fast_finish: false services: - # Note: if you change this service also change POSTGRES_DIR - - postgresql96 + # Note: if you change this service also change POSTGRES_DIR + - postgresql96 cache: # Rebuild cache if following file changes @@ -57,23 +59,23 @@ cache: # Repository gets cloned, Cache is restored install: - - "%PYEXE% scripts\\build\\appveyor.py install" + - "%PYEXE% scripts\\build\\appveyor.py install" # PostgreSQL server starts now -build: off +build: "off" build_script: - - "%PYEXE% scripts\\build\\appveyor.py build_script" + - "%PYEXE% scripts\\build\\appveyor.py build_script" after_build: - - "%PYEXE% scripts\\build\\appveyor.py after_build" + - "%PYEXE% scripts\\build\\appveyor.py after_build" before_test: - - "%PYEXE% scripts\\build\\appveyor.py before_test" + - "%PYEXE% scripts\\build\\appveyor.py before_test" test_script: - - "%PYEXE% scripts\\build\\appveyor.py test_script" + - "%PYEXE% scripts\\build\\appveyor.py test_script" # vim: set ts=4 sts=4 sw=4: