This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 55df266 build(c/driver_manager,c/driver/postgres): fix build paths
(#132)
55df266 is described below
commit 55df266566f9c3ab97b1a89a4a515c9e1eb71f8c
Author: David Li <[email protected]>
AuthorDate: Mon Sep 19 12:12:51 2022 -0400
build(c/driver_manager,c/driver/postgres): fix build paths (#132)
- Include .env file for docker-compose.yml
- Move adbc_driver_manager/tests/ so it doesn't get packaged
- Fix pyproject.toml to always include the libpq-based driver
---
python/adbc_driver_postgres/pyproject.toml => .env | 33 +++++++---------------
ci/scripts/python_wheel_manylinux_build.sh | 2 --
.../{adbc_driver_manager => }/tests/test_dbapi.py | 0
.../tests/test_lowlevel.py | 0
python/adbc_driver_postgres/pyproject.toml | 2 +-
5 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/python/adbc_driver_postgres/pyproject.toml b/.env
similarity index 52%
copy from python/adbc_driver_postgres/pyproject.toml
copy to .env
index 4dd7a62..1cd12f5 100644
--- a/python/adbc_driver_postgres/pyproject.toml
+++ b/.env
@@ -15,29 +15,16 @@
# specific language governing permissions and limitations
# under the License.
-[tool.poetry]
-name = "adbc_driver_postgres"
-version = "1.0.0-alpha0"
-description = ""
-authors = ["Apache Arrow Developers <[email protected]>"]
-license = "Apache-2.0"
-homepage = "https://arrow.apache.org";
-repository = "https://github.com/apache/arrow-adbc";
-include = [
- {path = "adbc_driver_postgres/*.so", format = "wheel"},
-]
+# All of the following environment variables are required to set default values
+# for the parameters in docker-compose.yml.
-[tool.poetry.build]
-script = "build.py"
+# Default repository to pull and push images from
+REPO=apache/arrow-dev
-[tool.poetry.dependencies]
-# XXX: setuptools/build.py don't like path dependencies
-# adbc_driver_manager = { path = "../adbc_driver_manager/", develop = false }
-python = ">=3.8"
+# different architecture notations
+ARCH=amd64
+ARCH_ALIAS=x86_64
+ARCH_SHORT=amd64
-[tool.poetry.dev-dependencies]
-pytest = "^7.1.2"
-
-[build-system]
-requires = ["poetry-core>=1.0.0", "setuptools"]
-build-backend = "poetry.core.masonry.api"
+# Default versions for various dependencies
+PYTHON=3.8
diff --git a/ci/scripts/python_wheel_manylinux_build.sh
b/ci/scripts/python_wheel_manylinux_build.sh
index 31194de..32c0d53 100755
--- a/ci/scripts/python_wheel_manylinux_build.sh
+++ b/ci/scripts/python_wheel_manylinux_build.sh
@@ -43,8 +43,6 @@ echo "=== (${PYTHON_VERSION}) Building ADBC libpq driver ==="
: ${CMAKE_UNITY_BUILD:=ON}
: ${CMAKE_GENERATOR:=Ninja}
: ${VCPKG_ROOT:=/opt/vcpkg}
-# : ${VCPKG_FEATURE_FLAGS:=-manifests}
-# :
${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}
mkdir /tmp/libpq-build
pushd /tmp/libpq-build
diff --git a/python/adbc_driver_manager/adbc_driver_manager/tests/test_dbapi.py
b/python/adbc_driver_manager/tests/test_dbapi.py
similarity index 100%
rename from python/adbc_driver_manager/adbc_driver_manager/tests/test_dbapi.py
rename to python/adbc_driver_manager/tests/test_dbapi.py
diff --git
a/python/adbc_driver_manager/adbc_driver_manager/tests/test_lowlevel.py
b/python/adbc_driver_manager/tests/test_lowlevel.py
similarity index 100%
rename from
python/adbc_driver_manager/adbc_driver_manager/tests/test_lowlevel.py
rename to python/adbc_driver_manager/tests/test_lowlevel.py
diff --git a/python/adbc_driver_postgres/pyproject.toml
b/python/adbc_driver_postgres/pyproject.toml
index 4dd7a62..33340df 100644
--- a/python/adbc_driver_postgres/pyproject.toml
+++ b/python/adbc_driver_postgres/pyproject.toml
@@ -24,7 +24,7 @@ license = "Apache-2.0"
homepage = "https://arrow.apache.org";
repository = "https://github.com/apache/arrow-adbc";
include = [
- {path = "adbc_driver_postgres/*.so", format = "wheel"},
+ {path = "adbc_driver_postgres/*.so"},
]
[tool.poetry.build]
