From a81dd8a42fc2e4cbef7e8747ea4181a560e27ef3 Mon Sep 17 00:00:00 2001 From: Pierre Camilleri <22995923+pierrecamilleri@users.noreply.github.com> Date: Thu, 12 Dec 2024 22:02:36 +0100 Subject: [PATCH 1/4] ci: update depreciated macOS-12 environment --- .github/workflows/general.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml index 64180f6332..41e81be6ef 100644 --- a/.github/workflows/general.yaml +++ b/.github/workflows/general.yaml @@ -78,7 +78,7 @@ jobs: # TODO: migrate to macos-latest after figuring out how to # make `posgres/pg_config` works in the environment. Currently, it fails # with the following error: "pg_config" not found" - runs-on: macos-12 + runs-on: macos-14 steps: - name: Checkout repository uses: actions/checkout@v4 From 4a27f867d583c41d379021c6107601d06f36f02c Mon Sep 17 00:00:00 2001 From: Pierre Camilleri <22995923+pierrecamilleri@users.noreply.github.com> Date: Thu, 12 Dec 2024 22:44:31 +0100 Subject: [PATCH 2/4] Attempt to install postgresql --- .github/workflows/general.yaml | 2 ++ pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml index 41e81be6ef..1838ab1ffb 100644 --- a/.github/workflows/general.yaml +++ b/.github/workflows/general.yaml @@ -86,6 +86,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: "3.10" + - name: Set up postgresql + run: brew install postgresql - name: Prepare environment run: pip3 install hatch - name: Prepare variables diff --git a/pyproject.toml b/pyproject.toml index fbe068da06..a8e616750c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,7 +92,7 @@ mysql = ["sqlalchemy>=1.4", "pymysql>=1.0"] ods = ["ezodf>=0.3", "lxml>=4.0"] pandas = ["pyarrow>=14.0", "pandas>=1.0"] parquet = ["fastparquet>=0.8"] -postgresql = ["sqlalchemy>=1.4", "psycopg>=3.0", "psycopg2>=2.9"] +postgresql = ["sqlalchemy>=1.4", "psycopg>=3.0", "psycopg2-binary>=2.9"] spss = ["savReaderWriter>=3.0"] sql = ["sqlalchemy>=1.4"] visidata = ["visidata>=2.10"] From 15dc405b68be761fd99ac603026d86cfe3a723d9 Mon Sep 17 00:00:00 2001 From: Pierre Camilleri <22995923+pierrecamilleri@users.noreply.github.com> Date: Thu, 12 Dec 2024 23:00:19 +0100 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=94=B5=20remove=20comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/general.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml index 1838ab1ffb..1bd1bea1c5 100644 --- a/.github/workflows/general.yaml +++ b/.github/workflows/general.yaml @@ -75,9 +75,6 @@ jobs: test-macos: if: github.event_name != 'schedule' || github.repository_owner == 'frictionlessdata' - # TODO: migrate to macos-latest after figuring out how to - # make `posgres/pg_config` works in the environment. Currently, it fails - # with the following error: "pg_config" not found" runs-on: macos-14 steps: - name: Checkout repository From 99d0c3d75863cc1039866145f10bb7353ea33e6c Mon Sep 17 00:00:00 2001 From: Pierre Camilleri <22995923+pierrecamilleri@users.noreply.github.com> Date: Thu, 12 Dec 2024 23:01:21 +0100 Subject: [PATCH 4/4] remove -binary commited by mistake --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a8e616750c..fbe068da06 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,7 +92,7 @@ mysql = ["sqlalchemy>=1.4", "pymysql>=1.0"] ods = ["ezodf>=0.3", "lxml>=4.0"] pandas = ["pyarrow>=14.0", "pandas>=1.0"] parquet = ["fastparquet>=0.8"] -postgresql = ["sqlalchemy>=1.4", "psycopg>=3.0", "psycopg2-binary>=2.9"] +postgresql = ["sqlalchemy>=1.4", "psycopg>=3.0", "psycopg2>=2.9"] spss = ["savReaderWriter>=3.0"] sql = ["sqlalchemy>=1.4"] visidata = ["visidata>=2.10"]