Skip to content

Commit

Permalink
build(c/driver_manager,c/driver/postgres): fix build paths (apache#132)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
lidavidm authored Sep 19, 2022
1 parent f18223e commit 55df266
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 3 deletions.
30 changes: 30 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

# All of the following environment variables are required to set default values
# for the parameters in docker-compose.yml.

# Default repository to pull and push images from
REPO=apache/arrow-dev

# different architecture notations
ARCH=amd64
ARCH_ALIAS=x86_64
ARCH_SHORT=amd64

# Default versions for various dependencies
PYTHON=3.8
2 changes: 0 additions & 2 deletions ci/scripts/python_wheel_manylinux_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/adbc_driver_postgres/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 55df266

Please sign in to comment.