Skip to content

Add conda.yaml baseline workflow file #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 39 commits into from
Apr 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a917e09
point to custom upstream arrow-datafusion with updated build script
jdye64 Mar 14, 2023
a88a672
cargo updates
jdye64 Mar 14, 2023
71876d9
Add conda.yaml baseline workflow file
jdye64 Mar 14, 2023
0e51698
Add support for rustfmt output environment variable
jdye64 Mar 14, 2023
e0e116c
Change conda recipe path
jdye64 Mar 14, 2023
da3284d
Add some debug output
jdye64 Mar 14, 2023
bb76af3
fix syntax issues
jdye64 Mar 14, 2023
58adb3c
update rustfmt path
jdye64 Mar 14, 2023
d8248af
test invoking rustfmt
jdye64 Mar 14, 2023
0bf7ae6
Allow for RUSTFMT environment to pass through to the conda build
jdye64 Mar 14, 2023
10c5db1
conda build updates
jdye64 Mar 14, 2023
789c6f4
github workflow syntax issue
jdye64 Mar 14, 2023
5e16eb1
workflow syntax
jdye64 Mar 14, 2023
7a0307b
more syntax
jdye64 Mar 14, 2023
5604710
updates
jdye64 Mar 14, 2023
50b4788
use minimal rustup profile
jdye64 Mar 14, 2023
3472648
use minimal rustup profile
jdye64 Mar 14, 2023
7c8555a
use minimal rustup profile
jdye64 Mar 15, 2023
ba8e37e
use minimal rustup profile
jdye64 Mar 15, 2023
1257c55
use minimal rustup profile
jdye64 Mar 15, 2023
ed6c698
changes
jdye64 Mar 15, 2023
451774b
changes
jdye64 Mar 15, 2023
e56205e
trigger workflow rebuild
jdye64 Mar 15, 2023
beb973c
Add container
jdye64 Mar 15, 2023
5965c8a
Ouput Rust env varialbes
jdye64 Mar 15, 2023
8cf6f47
full rustup command path
jdye64 Mar 15, 2023
d9a9517
Point to typify fork for testing
jdye64 Mar 16, 2023
174c793
Merge branch 'substrait_build_updates' into substrait_rustfmt_build
jdye64 Mar 16, 2023
a887b4d
Merge with upstream/main
jdye64 Apr 18, 2023
d2c1e1d
Adjust conda CI workflow
jdye64 Apr 19, 2023
cd7d054
Adjust conda build instead of mambabuild
jdye64 Apr 19, 2023
f7fa49d
Adjust command
jdye64 Apr 19, 2023
9989fd4
Install conda-build
jdye64 Apr 19, 2023
893060d
Some initial changes to get noarch builds working
charlesbluca Apr 20, 2023
dfe9b93
Remove beta rust toolchain from CI
jdye64 Apr 20, 2023
e574d47
Merge branch 'main' into substrait_rustfmt_build
jdye64 Apr 20, 2023
99b51e0
Add libprotobuf to host/build deps
charlesbluca Apr 20, 2023
f5aa2bf
Bump libprotobuf version
jdye64 Apr 20, 2023
9250f14
Revert back to 3 for libprotobuf
jdye64 Apr 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Build conda nightly
on: [push, pull_request]

# Cancel any already running instances of this build
concurrency:
group: conda-${{ github.head_ref }}
cancel-in-progress: true

# Required shell entrypoint to have properly activated conda environments
defaults:
run:
shell: bash -l {0}

jobs:
conda:
name: Build (and optionally upload) the conda nightly
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python
uses: conda-incubator/[email protected]
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: "3.10"
channel-priority: strict
- name: Install dependencies
run: |
mamba install boa conda-verify

which python
pip list
mamba list
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
components: clippy, rustfmt
- name: Build conda package
run: |
# suffix for nightly package versions
export VERSION_SUFFIX=a`date +%y%m%d`

conda mambabuild conda/recipes \
--no-anaconda-upload \
--output-folder .
# - name: Upload conda package
# if: |
# github.event_name == 'push'
# && github.repository == 'apache/arrow-datafusion-python'
# env:
# ANACONDA_API_TOKEN: ${{ secrets.DASK_CONDA_TOKEN }}
# LABEL: ${{ github.ref == 'refs/heads/datafusion-sql-planner' && 'dev_datafusion' || 'dev' }}
# run: |
# # install anaconda for upload
# mamba install anaconda-client

# anaconda upload --label $LABEL linux-64/*.tar.bz2
1 change: 0 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
- "3.10"
toolchain:
- "stable"
- "beta"
# we are not that much eager in walking on the edge yet
# - nightly
# build stable for only 3.7
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 0 additions & 20 deletions conda/recipes/build.sh

This file was deleted.

25 changes: 17 additions & 8 deletions conda/recipes/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,41 @@
# specific language governing permissions and limitations
# under the License.

{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
{% set name = "datafusion" %}
{% set major_minor_patch = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').split('.') %}
{% set new_patch = major_minor_patch[2] | int + 1 %}
{% set version = (major_minor_patch[:2] + [new_patch]) | join('.') + environ.get('VERSION_SUFFIX', '') %}


package:
name: datafusion
name: {{ name|lower }}
version: {{ version }}

source:
git_url: ../..

build:
noarch: python
script: {{ PYTHON }} -m pip install . -vv
number: 0

requirements:
host:
- {{ compiler('rust') }}
- python
- setuptools
- maturin
- python >=3.6
- maturin >=0.14,<0.15
- libprotobuf =3
- pip
run:
- python
- python >=3.6
- pyarrow >=11.0.0

test:
imports:
- datafusion
commands:
- pip check
requires:
- pip

about:
home: https://arrow.apache.org/datafusion
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ classifier = [
"Programming Language :: Rust",
]
dependencies = [
"pyarrow>=6.0.1",
"pyarrow>=11.0.0",
]

[project.urls]
Expand Down