From 98f0489300d81ade0a384cabf4cb4c7213dd6035 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 9 Oct 2024 12:46:48 +0200 Subject: [PATCH] psycopg2 mac support --- .github/workflows/macos.yml | 1 + ports/py-psycopg2/portfile.cmake | 2 +- ports/py-psycopg2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/py-psycopg2.json | 5 +++++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d0f396d..3846950 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -69,6 +69,7 @@ jobs: ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pip ./vcpkg/vcpkg install $VCPKG_OPTIONS py-sip ./vcpkg/vcpkg install $VCPKG_OPTIONS py-numpy + ./vcpkg/vcpkg install $VCPKG_OPTIONS py-psycopg2 # ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pyqt6 - name: 📑 Upload logs diff --git a/ports/py-psycopg2/portfile.cmake b/ports/py-psycopg2/portfile.cmake index 7582f91..0725679 100644 --- a/ports/py-psycopg2/portfile.cmake +++ b/ports/py-psycopg2/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_pythonhosted( SHA512 a691fd09762221e854861dedce37b05e5354e0701feea470a6d5046960056ef02a8c9ecfa751adeba485271ea7d5834643b7d3a3c3f3270087f5ed9c68509f5f ) -vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/tools/libpq") +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/tools/libpq/bin") set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") diff --git a/ports/py-psycopg2/vcpkg.json b/ports/py-psycopg2/vcpkg.json index c0f758e..f1a1040 100644 --- a/ports/py-psycopg2/vcpkg.json +++ b/ports/py-psycopg2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "py-psycopg2", "version": "2.9.9", - "port-version": 1, + "port-version": 2, "description": "Python-PostgreSQL Database Adapter", "homepage": "https://psycopg.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 57666b3..da22e47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -86,7 +86,7 @@ }, "py-psycopg2": { "baseline": "2.9.9", - "port-version": 1 + "port-version": 2 }, "py-pyparsing": { "baseline": "3.1.1", diff --git a/versions/p-/py-psycopg2.json b/versions/p-/py-psycopg2.json index 0c4368b..caa584f 100644 --- a/versions/p-/py-psycopg2.json +++ b/versions/p-/py-psycopg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "950f031c4a487378de1cad7bbb7a59b6d0538113", + "version": "2.9.9", + "port-version": 2 + }, { "git-tree": "cb539d44d3100730f03dd219e73e4cc40a417e6d", "version": "2.9.9",