diff --git a/.env b/.env index 635afb37045..aa5803f3cf4 100644 --- a/.env +++ b/.env @@ -25,7 +25,6 @@ REPO=apache/arrow-dev ARCH=amd64 ARCH_ALIAS=x86_64 ARCH_SHORT=amd64 -ARCH_CONDA_FORGE=linux_64_ # Default versions for various dependencies JDK=21 diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index b5b8249843d..822b05de1f9 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -523,147 +523,6 @@ jobs: rake --trace ${TASK_NAMESPACE}:test popd - python-conda-linux: - name: "Python ${{ matrix.arch }} Conda" - runs-on: ubuntu-latest - # No need for Conda packages during release - # if: "!startsWith(github.ref, 'refs/tags/')" - # TODO(apache/arrow-adbc#468): disable for now - if: false - needs: - - source - strategy: - fail-fast: false - matrix: - # TODO: "linux_aarch64_" - arch: ["linux_64_"] - steps: - - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 - with: - name: source - - - name: Extract source archive - id: version - run: | - source_archive=$(echo apache-arrow-adbc-*.tar.gz) - VERSION=${source_archive#apache-arrow-adbc-} - VERSION=${VERSION%.tar.gz} - echo "VERSION=${VERSION}" | tee -a $GITHUB_ENV - - tar xf apache-arrow-adbc-${VERSION}.tar.gz - mv apache-arrow-adbc-${VERSION} adbc - - - name: Show inputs - run: | - echo "upload_artifacts: ${GITHUB_EVENT_INPUTS_UPLOAD_ARTIFACTS}" >> $GITHUB_STEP_SUMMARY - echo "schedule: ${GITHUB_EVENT_SCHEDULE}" >> GITHUB_STEP_SUMMARY - echo "ref: ${GITHUB_REF}" >> GITHUB_STEP_SUMMARY - env: - GITHUB_EVENT_INPUTS_UPLOAD_ARTIFACTS: ${{ github.event.inputs.upload_artifacts }} - GITHUB_EVENT_SCHEDULE: ${{ github.event.schedule }} - - - name: Build Conda package - env: - ARCH_CONDA_FORGE: ${{ matrix.arch }} - run: | - pushd adbc - docker compose run \ - -e HOST_USER_ID=$(id -u) \ - python-conda - popd - - - name: Archive Conda packages - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 - with: - name: python-${{ matrix.arch }}-conda - retention-days: 7 - path: | - adbc/build/conda/*/*.tar.bz2 - - - name: Test Conda packages - if: matrix.arch == 'linux_64_' - env: - ARCH_CONDA_FORGE: ${{ matrix.arch }} - run: | - pushd adbc - docker compose run \ - python-conda-test - popd - - python-conda-macos: - name: "Python ${{ matrix.arch }} Conda" - runs-on: macos-15-intel - # No need for Conda packages during release - # TODO(apache/arrow-adbc#468): re-enable - if: false - needs: - - source - strategy: - fail-fast: false - matrix: - # TODO: "osx_arm64_" - arch: ["osx_64_"] - defaults: - run: - shell: bash -l -eo pipefail {0} - steps: - - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 - with: - name: source - - - name: Extract source archive - id: version - run: | - source_archive=$(echo apache-arrow-adbc-*.tar.gz) - VERSION=${source_archive#apache-arrow-adbc-} - VERSION=${VERSION%.tar.gz} - echo "VERSION=${VERSION}" | tee -a $GITHUB_ENV - - tar xf apache-arrow-adbc-$VERSION.tar.gz - mv apache-arrow-adbc-$VERSION adbc - - - name: Show inputs - run: | - echo "upload_artifacts: ${GITHUB_EVENT_INPUTS_UPLOAD_ARTIFACTS}" >> $GITHUB_STEP_SUMMARY - echo "schedule: ${GITHUB_EVENT_SCHEDULE}" >> $GITHUB_STEP_SUMMARY - echo "ref: ${GITHUB_REF}" >> $GITHUB_STEP_SUMMARY - env: - GITHUB_EVENT_INPUTS_UPLOAD_ARTIFACTS: ${{ github.event.inputs.upload_artifacts }} - GITHUB_EVENT_SCHEDULE: ${{ github.event.schedule }} - - - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0 - with: - miniforge-version: 26.7.2-1 - use-only-tar-bz2: false - use-mamba: true - - - name: Install Dependencies - run: | - mamba install -c conda-forge boa conda-smithy conda-verify - conda config --remove channels defaults - conda config --add channels conda-forge - - - name: Build Conda package - env: - ARCH_CONDA_FORGE: ${{ matrix.arch }} - run: | - ./adbc/ci/scripts/python_conda_build.sh $(pwd)/adbc ${ARCH_CONDA_FORGE}.yaml $(pwd)/adbc/build - - - name: Archive Conda packages - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 - with: - name: python-${{ matrix.arch }}-conda - retention-days: 7 - path: | - adbc/build/conda/*/*.tar.bz2 - - - name: Test Conda packages - if: matrix.arch == 'osx_64_' - env: - ARCH_CONDA_FORGE: ${{ matrix.arch }} - run: | - ./adbc/ci/scripts/python_conda_test.sh $(pwd)/adbc $(pwd)/adbc/build - python-manylinux: name: "Python ${{ matrix.arch }} manylinux" runs-on: ${{ matrix.runs_on }} @@ -1486,50 +1345,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - upload-anaconda: - name: "Upload packages to Anaconda.org" - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' && (github.event.schedule || inputs.upload_artifacts) - needs: - - python-conda-linux - # TODO(apache/arrow-adbc#468): re-enable - # - python-conda-macos - defaults: - run: - shell: bash -l -eo pipefail {0} - steps: - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - fetch-depth: 0 - persist-credentials: true - submodules: recursive - - name: Get All Artifacts - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 - with: - path: conda-packages - - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0 - with: - miniforge-version: 26.7.2-1 - use-only-tar-bz2: false - use-mamba: true - - name: Install Dependencies - run: | - mamba install -c conda-forge anaconda-client - - name: Clean - continue-on-error: true - run: | - # Clean all existing packages, OK if we fail - ./ci/scripts/python_conda_clean.sh - env: - ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }} # zizmor: ignore[secrets-outside-env] - - name: Upload - run: | - ls -laR conda-packages - # Upload fresh packages - ./ci/scripts/python_conda_upload.sh conda-packages/python-*-conda/*/*.tar.bz2 - env: - ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }} # zizmor: ignore[secrets-outside-env] - # This takes a while due to sleeping to avoid rate limits, so run it first # and in parallel with the builds clean-gemfury: @@ -1547,7 +1362,7 @@ jobs: - name: Clean run: | pip install requests - ./ci/scripts/gemfury_clean.py + ./dev/release/gemfury_clean.py env: GEMFURY_API_TOKEN: ${{ secrets.GEMFURY_API_TOKEN }} # zizmor: ignore[secrets-outside-env] @@ -1588,11 +1403,11 @@ jobs: -exec mv '{}' upload-staging \; # Java - ./ci/scripts/java_jar_upload.sh upload-staging/*.pom + ./dev/release/java_jar_upload.sh upload-staging/*.pom # Python - ./ci/scripts/python_wheel_upload.sh upload-staging/adbc_*.tar.gz upload-staging/*.whl + ./dev/release/python_wheel_upload.sh upload-staging/adbc_*.tar.gz upload-staging/*.whl # Node.js - ./ci/scripts/node_npm_upload.sh upload-staging + ./dev/release/node_npm_upload.sh upload-staging env: GEMFURY_PUSH_TOKEN: ${{ secrets.GEMFURY_PUSH_TOKEN }} # zizmor: ignore[secrets-outside-env] NPM_REGISTRY: https://npm.fury.io/arrow-adbc-nightlies/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ea8e7283437..13dd667fc80 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,6 @@ repos: - id: check-shebang-scripts-are-executable - id: check-xml - id: check-yaml - exclude: ci/conda/meta.yaml - id: end-of-file-fixer exclude: "^(r/.*?/_snaps/.*?.md)|(.*\\.patch)$" - id: mixed-line-ending diff --git a/LICENSE.txt b/LICENSE.txt index 451c3567339..58a7cf3589e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -263,14 +263,6 @@ which is made available under the Creative Commons CC0 license. -------------------------------------------------------------------------------- -The files under ci/conda/.ci-support have the following license - -BSD 3-clause license -Copyright (c) 2015-2022, conda-forge -All rights reserved. - --------------------------------------------------------------------------------- - The files under c/vendor/fmt contain code from {fmt}, version 12.2.0. {fmt} is under the MIT license: diff --git a/ci/conda/.ci_support/README b/ci/conda/.ci_support/README deleted file mode 100644 index a47316be6ae..00000000000 --- a/ci/conda/.ci_support/README +++ /dev/null @@ -1,6 +0,0 @@ -This file is automatically generated by conda-smithy. If any -particular build configuration is expected, but it is not found, -please make sure all dependencies are satisfiable. To add/modify any -matrix elements, you should create/change conda-smithy's input -recipe/conda_build_config.yaml and re-render the recipe, rather than -editing these files directly. diff --git a/ci/conda/.ci_support/linux_64_.yaml b/ci/conda/.ci_support/linux_64_.yaml deleted file mode 100644 index 2ab44394896..00000000000 --- a/ci/conda/.ci_support/linux_64_.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libpq: -- '15' -libsqlite: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/ci/conda/.ci_support/linux_aarch64_.yaml b/ci/conda/.ci_support/linux_aarch64_.yaml deleted file mode 100644 index 96b82b7f198..00000000000 --- a/ci/conda/.ci_support/linux_aarch64_.yaml +++ /dev/null @@ -1,37 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libpq: -- '15' -libsqlite: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.9.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/ci/conda/.ci_support/linux_ppc64le_.yaml b/ci/conda/.ci_support/linux_ppc64le_.yaml deleted file mode 100644 index 381aefe6c78..00000000000 --- a/ci/conda/.ci_support/linux_ppc64le_.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libpq: -- '15' -libsqlite: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/ci/conda/.ci_support/osx_64_.yaml b/ci/conda/.ci_support/osx_64_.yaml deleted file mode 100644 index 8216590f96d..00000000000 --- a/ci/conda/.ci_support/osx_64_.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -libpq: -- '15' -libsqlite: -- '3' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.9.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/ci/conda/.ci_support/osx_arm64_.yaml b/ci/conda/.ci_support/osx_arm64_.yaml deleted file mode 100644 index eaed0e65795..00000000000 --- a/ci/conda/.ci_support/osx_arm64_.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -libpq: -- '15' -libsqlite: -- '3' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/ci/conda/.ci_support/win_64_.yaml b/ci/conda/.ci_support/win_64_.yaml deleted file mode 100644 index aed75741d16..00000000000 --- a/ci/conda/.ci_support/win_64_.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libpq: -- '15' -libsqlite: -- '3' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -target_platform: -- win-64 diff --git a/ci/conda/.gitattributes b/ci/conda/.gitattributes deleted file mode 100644 index 7f3276384a8..00000000000 --- a/ci/conda/.gitattributes +++ /dev/null @@ -1,27 +0,0 @@ -* text=auto - -*.patch binary -*.diff binary -meta.yaml text eol=lf -build.sh text eol=lf -bld.bat text eol=crlf - -# github helper pieces to make some files not show up in diffs automatically -.azure-pipelines/* linguist-generated=true -.circleci/* linguist-generated=true -.ci_support/README linguist-generated=true -.drone/* linguist-generated=true -.drone.yml linguist-generated=true -.github/* linguist-generated=true -.travis/* linguist-generated=true -.appveyor.yml linguist-generated=true -.gitattributes linguist-generated=true -.gitignore linguist-generated=true -.travis.yml linguist-generated=true -.scripts/* linguist-generated=true -.woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true -azure-pipelines.yml linguist-generated=true -build-locally.py linguist-generated=true -shippable.yml linguist-generated=true diff --git a/ci/conda/build-cpp.bat b/ci/conda/build-cpp.bat deleted file mode 100644 index 06cf03c3059..00000000000 --- a/ci/conda/build-cpp.bat +++ /dev/null @@ -1,52 +0,0 @@ -REM Licensed to the Apache Software Foundation (ASF) under one -REM or more contributor license agreements. See the NOTICE file -REM distributed with this work for additional information -REM regarding copyright ownership. The ASF licenses this file -REM to you under the Apache License, Version 2.0 (the -REM "License"); you may not use this file except in compliance -REM with the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, -REM software distributed under the License is distributed on an -REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -REM KIND, either express or implied. See the License for the -REM specific language governing permissions and limitations -REM under the License. - -if "%PKG_NAME%" == "adbc-driver-manager-cpp" ( - set PKG_ROOT=c\driver_manager - goto BUILD -) -if "%PKG_NAME%" == "adbc-driver-flightsql-go" ( - set PKG_ROOT=c\driver\flightsql - goto BUILD -) -if "%PKG_NAME%" == "adbc-driver-postgresql-cpp" ( - set PKG_ROOT=c\driver\postgresql - goto BUILD -) -if "%PKG_NAME%" == "adbc-driver-sqlite-cpp" ( - set PKG_ROOT=c\driver\sqlite - goto BUILD -) -echo Unknown package %PKG_NAME% -exit 1 - -:BUILD - -mkdir "%SRC_DIR%"\build-cpp\%PKG_NAME% -pushd "%SRC_DIR%"\build-cpp\%PKG_NAME% - -cmake ..\..\%PKG_ROOT% ^ - -G Ninja ^ - -DADBC_BUILD_SHARED=ON ^ - -DADBC_BUILD_STATIC=OFF ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -DCMAKE_PREFIX_PATH=%PREFIX% ^ - || exit /B 1 - -cmake --build . --target install --config Release -j || exit /B 1 - -popd diff --git a/ci/conda/build-cpp.sh b/ci/conda/build-cpp.sh deleted file mode 100755 index 42cb691c8e5..00000000000 --- a/ci/conda/build-cpp.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# 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. - -set -ex - -case "${PKG_NAME}" in - adbc-driver-manager-cpp) - export BUILD_MANAGER=ON - ;; - adbc-driver-flightsql-go) - export CGO_ENABLED=1 - export BUILD_FLIGHTSQL=ON - ;; - adbc-driver-postgresql-cpp) - export BUILD_POSTGRESQL=ON - ;; - adbc-driver-sqlite-cpp) - export BUILD_SQLITE=ON - ;; - *) - echo "Unknown package ${PKG_NAME}" - exit 1 - ;; -esac - -if [[ "${target_platform}" == "linux-aarch64" ]] || - [[ "${target_platform}" == "osx-arm64" ]]; then - export GOARCH="arm64" -elif [[ "${target_platform}" == "linux-ppc64le" ]]; then - export GOARCH="ppc64le" -else - export GOARCH="amd64" -fi - -mkdir -p "build-${PKG_NAME}/" -pushd "build-${PKG_NAME}/" - -cmake "../c" \ - -G Ninja \ - -DADBC_BUILD_SHARED=ON \ - -DADBC_BUILD_STATIC=OFF \ - -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ - ${BUILD_MANAGER:+-DADBC_DRIVER_MANAGER="$BUILD_MANAGER"} \ - ${BUILD_FLIGHTSQL:+-DADBC_DRIVER_FLIGHTSQL="$BUILD_FLIGHTSQL" } \ - ${BUILD_POSTGRESQL:+-DADBC_DRIVER_POSTGRESQL="$BUILD_POSTGRESQL"} \ - ${BUILD_SQLITE:+-DADBC_DRIVER_SQLITE="$BUILD_SQLITE"} \ - -DCMAKE_PREFIX_PATH="${PREFIX}" - -cmake --build . --target install -j - -popd diff --git a/ci/conda/build-python.bat b/ci/conda/build-python.bat deleted file mode 100644 index bf24dc73de7..00000000000 --- a/ci/conda/build-python.bat +++ /dev/null @@ -1,45 +0,0 @@ -REM Licensed to the Apache Software Foundation (ASF) under one -REM or more contributor license agreements. See the NOTICE file -REM distributed with this work for additional information -REM regarding copyright ownership. The ASF licenses this file -REM to you under the Apache License, Version 2.0 (the -REM "License"); you may not use this file except in compliance -REM with the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, -REM software distributed under the License is distributed on an -REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -REM KIND, either express or implied. See the License for the -REM specific language governing permissions and limitations -REM under the License. - -if "%PKG_NAME%" == "adbc-driver-manager" ( - pushd "%SRC_DIR%"\python\adbc_driver_manager - goto BUILD -) -if "%PKG_NAME%" == "adbc-driver-flightsql" ( - pushd "%SRC_DIR%"\python\adbc_driver_flightsql - goto BUILD -) -if "%PKG_NAME%" == "adbc-driver-postgresql" ( - pushd "%SRC_DIR%"\python\adbc_driver_postgresql - goto BUILD -) -if "%PKG_NAME%" == "adbc-driver-sqlite" ( - pushd "%SRC_DIR%"\python\adbc_driver_sqlite - goto BUILD -) -echo Unknown package %PKG_NAME% -exit 1 - -:BUILD - -set _ADBC_IS_CONDA=1 -set SETUPTOOLS_SCM_PRETEND_VERSION=%PKG_VERSION% - -echo "==== INSTALL %PKG_NAME%" -%PYTHON% -m pip install . -vvv --no-deps || exit /B 1 - -popd diff --git a/ci/conda/build-python.sh b/ci/conda/build-python.sh deleted file mode 100755 index c9ea70b38b2..00000000000 --- a/ci/conda/build-python.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# 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. - -set -ex - -pushd "python/${PKG_NAME//-/_}" - -export _ADBC_IS_CONDA=1 -export SETUPTOOLS_SCM_PRETEND_VERSION=$PKG_VERSION - -echo "==== INSTALL ${PKG_NAME}" -$PYTHON -m pip install . -vvv --no-deps - -popd diff --git a/ci/conda/conda-forge.yml b/ci/conda/conda-forge.yml deleted file mode 100644 index 6c990428367..00000000000 --- a/ci/conda/conda-forge.yml +++ /dev/null @@ -1,31 +0,0 @@ -# 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. - -build_platform: - linux_aarch64: linux_64 - linux_ppc64le: linux_64 - osx_arm64: osx_64 -conda_forge_output_validation: true -github: - branch_name: main - tooling_branch_name: main -recipe_dir: . -skip_render: - - .gitignore - - LICENSE.txt - - README.md -test_on_native_only: true diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml deleted file mode 100644 index 83135c77138..00000000000 --- a/ci/conda/meta.yaml +++ /dev/null @@ -1,255 +0,0 @@ -# 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. - -package: - name: arrow-adbc-split - version: 1.14.0 - -source: - path: ../../ - -build: - number: 0 - -outputs: - - name: adbc-driver-manager-cpp - script: build-cpp.sh # [not win] - script: build-cpp.bat # [win] - requirements: - build: - - {{ compiler('cxx') }} - - cmake - - ninja - host: - run: - test: - commands: - - test -f $PREFIX/include/arrow-adbc/adbc.h # [unix] - - test -f $PREFIX/include/arrow-adbc/adbc_driver_manager.h # [unix] - - test -d $PREFIX/lib/cmake/AdbcDriverManager/ # [unix] - - test -f $PREFIX/lib/pkgconfig/adbc-driver-manager.pc # [unix] - - test ! -f $PREFIX/lib/libadbc_driver_manager.a # [unix] - - test -f $PREFIX/lib/libadbc_driver_manager.so # [linux] - - test -f $PREFIX/lib/libadbc_driver_manager.dylib # [osx] - - - if not exist %LIBRARY_BIN%\adbc_driver_manager.dll exit 1 # [win] - - if not exist %LIBRARY_INC%\arrow-adbc\adbc.h exit 1 # [win] - - if not exist %LIBRARY_INC%\arrow-adbc\adbc_driver_manager.h exit 1 # [win] - - if not exist %LIBRARY_LIB%\adbc_driver_manager.lib exit 1 # [win] - - if not exist %LIBRARY_LIB%\cmake\AdbcDriverManager exit 1 # [win] - - if not exist %LIBRARY_LIB%\pkgconfig\adbc-driver-manager.pc exit 1 # [win] - - - name: adbc-driver-flightsql-go - script: build-cpp.sh # [not win] - script: build-cpp.bat # [win] - requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - - _go_select *=cgo - - cmake - - go-cgo >=1.21 - - ninja - - pkg-config - test: - commands: - - test ! -f $PREFIX/include/adbc.h # [unix] - - test -f $PREFIX/lib/pkgconfig/adbc-driver-flightsql.pc # [unix] - - test ! -f $PREFIX/lib/libadbc_driver_flightsql.a # [unix] - - test -f $PREFIX/lib/libadbc_driver_flightsql.so # [linux] - - test -f $PREFIX/lib/libadbc_driver_flightsql.dylib # [osx] - - - if exist %LIBRARY_INC%\adbc.h exit 1 # [win] - - if not exist %LIBRARY_BIN%\adbc_driver_flightsql.dll exit 1 # [win] - - if not exist %LIBRARY_LIB%\adbc_driver_flightsql.lib exit 1 # [win] - - if not exist %LIBRARY_LIB%\pkgconfig\adbc-driver-flightsql.pc exit 1 # [win] - - - name: adbc-driver-postgresql-cpp - script: build-cpp.sh # [not win] - script: build-cpp.bat # [win] - requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - - cmake - - ninja - - pkg-config - host: - - libpq - run: - - libpq - test: - commands: - - test ! -f $PREFIX/include/adbc.h # [unix] - - test -d $PREFIX/lib/cmake/AdbcDriverPostgreSQL/ # [unix] - - test -f $PREFIX/lib/pkgconfig/adbc-driver-postgresql.pc # [unix] - - test ! -f $PREFIX/lib/libadbc_driver_postgresql.a # [unix] - - test -f $PREFIX/lib/libadbc_driver_postgresql.so # [linux] - - test -f $PREFIX/lib/libadbc_driver_postgresql.dylib # [osx] - - - if exist %LIBRARY_INC%\adbc.h exit 1 # [win] - - if not exist %LIBRARY_BIN%\adbc_driver_postgresql.dll exit 1 # [win] - - if not exist %LIBRARY_LIB%\adbc_driver_postgresql.lib exit 1 # [win] - - if not exist %LIBRARY_LIB%\cmake\AdbcDriverPostgreSQL exit 1 # [win] - - if not exist %LIBRARY_LIB%\pkgconfig\adbc-driver-postgresql.pc exit 1 # [win] - - - name: adbc-driver-sqlite-cpp - script: build-cpp.sh # [not win] - script: build-cpp.bat # [win] - requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - - cmake - - ninja - - pkg-config - host: - - libsqlite - run: - - libsqlite - test: - commands: - - test ! -f $PREFIX/include/adbc.h # [unix] - - test -d $PREFIX/lib/cmake/AdbcDriverSQLite/ # [unix] - - test -f $PREFIX/lib/pkgconfig/adbc-driver-sqlite.pc # [unix] - - test ! -f $PREFIX/lib/libadbc_driver_sqlite.a # [unix] - - test -f $PREFIX/lib/libadbc_driver_sqlite.so # [linux] - - test -f $PREFIX/lib/libadbc_driver_sqlite.dylib # [osx] - - - if exist %LIBRARY_INC%\adbc.h exit 1 # [win] - - if not exist %LIBRARY_BIN%\adbc_driver_sqlite.dll exit 1 # [win] - - if not exist %LIBRARY_LIB%\adbc_driver_sqlite.lib exit 1 # [win] - - if not exist %LIBRARY_LIB%\cmake\AdbcDriverSQLite exit 1 # [win] - - if not exist %LIBRARY_LIB%\pkgconfig\adbc-driver-sqlite.pc exit 1 # [win] - - - name: adbc-driver-manager - script: build-python.sh # [not win] - script: build-python.bat # [win] - requirements: - build: - - {{ compiler('cxx') }} - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - cython - - pip - - python {{ python }} - - setuptools - host: - - cython - - pip - - python - - setuptools - run: - - python - run_constrained: - - pyarrow >=8.0.0 - test: - imports: - - adbc_driver_manager - - adbc_driver_manager._lib - - - name: adbc-driver-flightsql - build: - noarch: python - script: build-python.sh # [not win] - script: build-python.bat # [win] - requirements: - build: - - pip - - setuptools - host: - - {{ pin_subpackage('adbc-driver-flightsql-go', exact=True) }} - - pip - - python >=3.9 - - setuptools - run: - - {{ pin_subpackage('adbc-driver-manager') }} - - {{ pin_subpackage('adbc-driver-flightsql-go', exact=True) }} - - python >=3.9 - run_constrained: - - pyarrow >=8.0.0 - test: - imports: - - adbc_driver_flightsql - - - name: adbc-driver-postgresql - build: - noarch: python - script: build-python.sh # [not win] - script: build-python.bat # [win] - requirements: - build: - - pip - - setuptools - host: - - {{ pin_subpackage('adbc-driver-postgresql-cpp', exact=True) }} - - pip - - python >=3.9 - - setuptools - run: - - {{ pin_subpackage('adbc-driver-manager') }} - - {{ pin_subpackage('adbc-driver-postgresql-cpp', exact=True) }} - - python >=3.9 - run_constrained: - - pyarrow >=8.0.0 - test: - imports: - - adbc_driver_postgresql - - - name: adbc-driver-sqlite - build: - noarch: python - script: build-python.sh # [not win] - script: build-python.bat # [win] - requirements: - build: - - pip - - setuptools - host: - - {{ pin_subpackage('adbc-driver-sqlite-cpp', exact=True) }} - - pip - - python >=3.9 - - setuptools - run: - - {{ pin_subpackage('adbc-driver-manager') }} - - {{ pin_subpackage('adbc-driver-sqlite-cpp', exact=True) }} - - python >=3.9 - run_constrained: - - pyarrow >=8.0.0 - test: - imports: - - adbc_driver_sqlite - -about: - home: https://arrow.apache.org - summary: 'Database access libraries for Apache Arrow' - description: | - ADBC is an API standard for database access libraries ("drivers") - in C and Java that uses Arrow for data. Instead of writing code - for each individual database, applications can build against the - ADBC APIs, and link against drivers that implement the - standard. Additionally, a JDBC/ODBC-style driver manager is - provided. This also implements the ADBC APIs, but dynamically - loads drivers and dispatches calls to them. - license: Apache-2.0 - license_family: APACHE - license_file: LICENSE.txt - doc_url: https://arrow.apache.org/docs/ - dev_url: https://github.com/apache/arrow-adbc - -extra: - recipe-maintainers: - - lidavidm diff --git a/ci/scripts/python_conda_build.sh b/ci/scripts/python_conda_build.sh deleted file mode 100755 index 580a3ffd348..00000000000 --- a/ci/scripts/python_conda_build.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash -# -# 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. - -# Build the Conda packages - -set -e -set -o pipefail -set -u -set -x - -main() { - if [[ "$#" != 3 ]]; then - echo "Usage: ${0} " - echo " should be the name of a YAML file in ci/conda/.ci_support." - exit 1 - fi - # Path to ADBC repo - local -r repo="${1}" - local -r platform_config="${repo}/ci/conda/.ci_support/${2}" - # Path to output directory - local -r output="${3}" - - mkdir -p "${output}" - export PYTHONUNBUFFERED=1 - - conda config --show - - conda mambabuild \ - "${repo}/ci/conda" \ - -m "${platform_config}" \ - --output-folder "${output}/conda" -} - -main "$@" diff --git a/ci/scripts/python_conda_clean.sh b/ci/scripts/python_conda_clean.sh deleted file mode 100755 index b70f6703acb..00000000000 --- a/ci/scripts/python_conda_clean.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# 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. - -# Remove all uploaded packages. Only the latest nightly build will be -# accessible. - -set -e -set -o pipefail -set -u - -: ${CHANNEL:="arrow-adbc-nightlies"} -: ${API_BASE_URL:="https://api.anaconda.org"} - -main() { - local -r authorization="Authorization: token ${ANACONDA_API_TOKEN}" - local packages - local files - packages=$(curl -s --fail -H "${authorization}" "${API_BASE_URL}/packages/${CHANNEL}" | - jq -r '.[] | .name') - - for package in ${packages}; do - echo "Cleaning ${package}" - - files=$(curl -s --fail -H "${authorization}" "${API_BASE_URL}/package/${CHANNEL}/${package}/files" | jq -r '.[] | .full_name') - - for file in ${files}; do - echo "Deleting ${file}" - - curl -XDELETE -s --fail -H "${authorization}" "${API_BASE_URL}/dist/${file}" - done - done -} - -main "$@" diff --git a/ci/scripts/python_conda_test.sh b/ci/scripts/python_conda_test.sh deleted file mode 100755 index f430f25df21..00000000000 --- a/ci/scripts/python_conda_test.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env bash -# -# 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. - -# Build the Conda packages - -set -e -set -o pipefail -set -u -set -x - -PYTHON_VERSIONS="3.9 3.10 3.11" - -main() { - if [[ "$#" != 2 ]]; then - echo "Usage: ${0} " - exit 1 - fi - # Path to ADBC repo - local -r source_dir="${1}" - # Path to output directory - local -r output="${2}" - - # For $COMPONENTS, test_packages - source "${source_dir}/ci/scripts/python_util.sh" - - eval "$(conda shell.bash hook)" - - for python_version in $PYTHON_VERSIONS; do - echo "=== Testing Python ${python_version} ===" - local env="${output}/conda-test/${python_version}" - mkdir -p "${env}" - - mamba create \ - -y \ - -p "${env}" \ - -c conda-forge \ - --file "${source_dir}/ci/conda_env_python.txt" \ - python="${python_version}" \ - pyarrow - - conda activate "${env}" - - mamba install \ - -y \ - -c "${output}/conda" \ - ${COMPONENTS//_/-} - - test_packages - done -} - -main "$@" diff --git a/ci/scripts/python_conda_upload.sh b/ci/scripts/python_conda_upload.sh deleted file mode 100755 index 70bf91abd3b..00000000000 --- a/ci/scripts/python_conda_upload.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash -# 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. - -set -e -set -o pipefail -set -u -set -x - -: ${CHANNEL:="arrow-adbc-nightlies"} - -main() { - anaconda -t "${ANACONDA_API_TOKEN}" \ - upload \ - --skip-existing \ - --user "${CHANNEL}" \ - "$@" -} - -main "$@" diff --git a/compose.yaml b/compose.yaml index 90ffbb52657..665613b1de3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -128,21 +128,6 @@ services: - .:/adbc:delegated command: "/bin/bash -c 'apt update && apt install -y libsqlite3-dev build-essential cmake git && git config --global --add safe.directory /adbc && env BUILD_ALL=0 BUILD_DRIVER_SQLITE=1 ADBC_BUILD_TESTS=OFF ADBC_USE_ASAN=OFF ADBC_USE_UBSAN=OFF /adbc/ci/scripts/cpp_build.sh /adbc /adbc/build/venv && /adbc/ci/scripts/python_venv_test.sh /adbc /adbc/build/venv-test /adbc/build/venv/driver/sqlite/libadbc_driver_sqlite.so'" - ############################ Python conda ################################## - - # Must be run as docker compose run -e HOST_USER_ID=$(id -u) python-conda - python-conda: - image: condaforge/linux-anvil-cos7-x86_64 - volumes: - - .:/adbc:delegated - command: "/bin/bash -c 'conda config --remove channels defaults && /adbc/ci/scripts/python_conda_build.sh /adbc ${ARCH_CONDA_FORGE}.yaml /adbc/build'" - - python-conda-test: - image: condaforge/mambaforge - volumes: - - .:/adbc:delegated - command: "/bin/bash -c '/adbc/ci/scripts/python_conda_test.sh /adbc /adbc/build'" - python-debug: image: ${REPO}:${ARCH}-python-debug-adbc build: diff --git a/ci/scripts/gemfury_clean.py b/dev/release/gemfury_clean.py similarity index 100% rename from ci/scripts/gemfury_clean.py rename to dev/release/gemfury_clean.py diff --git a/ci/scripts/java_jar_upload.sh b/dev/release/java_jar_upload.sh similarity index 100% rename from ci/scripts/java_jar_upload.sh rename to dev/release/java_jar_upload.sh diff --git a/ci/scripts/node_npm_upload.sh b/dev/release/node_npm_upload.sh similarity index 98% rename from ci/scripts/node_npm_upload.sh rename to dev/release/node_npm_upload.sh index 8bef0518ca9..b7f666f6b99 100755 --- a/ci/scripts/node_npm_upload.sh +++ b/dev/release/node_npm_upload.sh @@ -22,7 +22,7 @@ # nightly date suffix to the version (e.g. 0.23.0-nightly.20260330) to avoid # "version already exists" errors. # -# Usage: ./ci/scripts/node_npm_upload.sh +# Usage: ./dev/release/node_npm_upload.sh # # Environment variables: # NPM_TOKEN npm authentication token (required) diff --git a/dev/release/post-09-npm.sh b/dev/release/post-09-npm.sh index ec1b2c8a2f3..4db26c685e1 100755 --- a/dev/release/post-09-npm.sh +++ b/dev/release/post-09-npm.sh @@ -46,7 +46,7 @@ main() { header "Uploading Node.js packages for ${RELEASE}" - DRY_RUN="${DRY_RUN:-0}" "${SOURCE_TOP_DIR}/ci/scripts/node_npm_upload.sh" "${tmp}" + DRY_RUN="${DRY_RUN:-0}" "${SOURCE_TOP_DIR}/dev/release/node_npm_upload.sh" "${tmp}" rm -rf "${tmp}" diff --git a/ci/scripts/python_wheel_upload.sh b/dev/release/python_wheel_upload.sh similarity index 100% rename from ci/scripts/python_wheel_upload.sh rename to dev/release/python_wheel_upload.sh diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt index af7a23200fa..632c8723ac9 100644 --- a/dev/release/rat_exclude_files.txt +++ b/dev/release/rat_exclude_files.txt @@ -16,8 +16,6 @@ c/vendor/fmt/* c/vendor/sqlite3/sqlite3.c c/vendor/sqlite3/sqlite3.h c/vendor/portable-snippets/include/portable-snippets/safe-math.h -ci/conda/.ci_support/* -ci/conda/.gitattributes ci/licenses/* ci/linux-packages/changelog ci/linux-packages/*.install diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh index 1caf191b009..8d0f64943fa 100644 --- a/dev/release/utils-prepare.sh +++ b/dev/release/utils-prepare.sh @@ -21,7 +21,6 @@ source "${SOURCE_DIR}/versions.env" update_versions() { local type=$1 - local conda_version="${VERSION_NATIVE}" local csharp_version="${VERSION_CSHARP}" local csharp_core_version="${VERSION_CSHARP_CORE}" local js_version="${VERSION_JS}" @@ -63,7 +62,6 @@ update_versions() { header "Updating versions for release ${RELEASE}" echo "C: ${c_version}" - echo "Conda: ${conda_version}" echo "C# (core): ${csharp_core_version}" echo "C# (drivers): ${csharp_version}" echo "Docs: ${docs_version}" @@ -86,12 +84,6 @@ update_versions() { git add meson.build popd - pushd "${ADBC_DIR}/ci/conda/" - sed -i.bak -E "s/version: .+/version: ${conda_version}/g" meta.yaml - rm meta.yaml.bak - git add meta.yaml - popd - sed -i.bak \ -E "s|.+|${csharp_version}|" \ "${ADBC_DIR}/csharp/Directory.Build.props" diff --git a/docs/source/development/nightly.rst b/docs/source/development/nightly.rst index 27266a9be9b..f0543af05bc 100644 --- a/docs/source/development/nightly.rst +++ b/docs/source/development/nightly.rst @@ -36,37 +36,6 @@ Nightly builds of some binary packages are available. `_, but we cannot guarantee any timely response. -C/C++ -===== - -Conda users can install nightly builds from a Conda channel: -https://anaconda.org/arrow-adbc-nightlies - -This should be used with conda-forge. Example:: - - mamba install -c conda-forge -c arrow-adbc-nightlies adbc-driver-manager - -Both C/C++ and Python packages are available. - -.. list-table:: Supported platforms for nightly Conda packages - :header-rows: 1 - - * - Operating System - - AMD64 (x86_64) - - AArch64 - - * - Linux - - Yes ✅ - - No ❌ - - * - macOS - - Yes ✅ - - No ❌ - - * - Windows - - No ✅ - - No ❌ - Java ==== diff --git a/python/adbc_driver_flightsql/LICENSE.txt b/python/adbc_driver_flightsql/LICENSE.txt index dd1c8e1a2b3..51b32c894ae 100644 --- a/python/adbc_driver_flightsql/LICENSE.txt +++ b/python/adbc_driver_flightsql/LICENSE.txt @@ -263,14 +263,6 @@ which is made available under the Creative Commons CC0 license. -------------------------------------------------------------------------------- -The files under ci/conda/.ci-support have the following license - -BSD 3-clause license -Copyright (c) 2015-2022, conda-forge -All rights reserved. - --------------------------------------------------------------------------------- - The files under c/vendor/fmt contain code from {fmt}, version 12.2.0. {fmt} is under the MIT license: diff --git a/python/adbc_driver_postgresql/LICENSE.txt b/python/adbc_driver_postgresql/LICENSE.txt index cd7e6f9693d..94e0394c511 100644 --- a/python/adbc_driver_postgresql/LICENSE.txt +++ b/python/adbc_driver_postgresql/LICENSE.txt @@ -263,14 +263,6 @@ which is made available under the Creative Commons CC0 license. -------------------------------------------------------------------------------- -The files under ci/conda/.ci-support have the following license - -BSD 3-clause license -Copyright (c) 2015-2022, conda-forge -All rights reserved. - --------------------------------------------------------------------------------- - The files under c/vendor/fmt contain code from {fmt}, version 12.2.0. {fmt} is under the MIT license: diff --git a/python/adbc_driver_sqlite/LICENSE.txt b/python/adbc_driver_sqlite/LICENSE.txt index b8b1cf68d9f..160c77e7326 100644 --- a/python/adbc_driver_sqlite/LICENSE.txt +++ b/python/adbc_driver_sqlite/LICENSE.txt @@ -263,14 +263,6 @@ which is made available under the Creative Commons CC0 license. -------------------------------------------------------------------------------- -The files under ci/conda/.ci-support have the following license - -BSD 3-clause license -Copyright (c) 2015-2022, conda-forge -All rights reserved. - --------------------------------------------------------------------------------- - The files under c/vendor/fmt contain code from {fmt}, version 12.2.0. {fmt} is under the MIT license: