Skip to content
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

De setup cleanup #5

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
20ce1b4
update setup.py to bump min ios version+dll search
david-engelmann Dec 20, 2022
e1f4e8d
Merge pull request #4 from david-engelmann/master
david-engelmann Dec 20, 2022
9071701
set -D_LIBCPP_DISABLE_AVAILABILITY in setup.py
david-engelmann Dec 20, 2022
7c36de0
fix missing line break after python minor logic
david-engelmann Dec 20, 2022
23f656d
add workflow for other operating systems
david-engelmann Dec 20, 2022
ff11945
declare matrix.os before calling
david-engelmann Dec 20, 2022
d066258
os listed in array form
david-engelmann Dec 20, 2022
ce6347d
try with if logic in earthly install
david-engelmann Dec 20, 2022
d9f53f9
put os at the top of matrix
david-engelmann Dec 20, 2022
9bde6b2
use $RUNNER_OS env var and fix macOS-latest spelling
david-engelmann Dec 20, 2022
4f7f01f
run on macos-latest instead of macOS-latest
david-engelmann Dec 20, 2022
86964cf
add os into include section
david-engelmann Dec 20, 2022
c6e65c7
fix include formating
david-engelmann Dec 20, 2022
f0b7a89
move runs-on to before strategy
david-engelmann Dec 20, 2022
a49c3bf
its valid yaml
david-engelmann Dec 20, 2022
639c351
revert to static runs-on
david-engelmann Dec 20, 2022
4c82858
hardcode os property for include test
david-engelmann Dec 20, 2022
3934c86
try using brew
david-engelmann Dec 20, 2022
7256877
up the brew perms
david-engelmann Dec 20, 2022
e522a28
add in brew update, upgrade and cleanup
david-engelmann Dec 20, 2022
becc8f5
Remove upgrade because of the 2to3 bug
david-engelmann Dec 21, 2022
eb2ff68
use brew doctor to identify issue
david-engelmann Dec 21, 2022
eca5594
fix missing $ in RUNNER_OS for linux
david-engelmann Dec 21, 2022
21aa1d6
remove 2to3 from bin in macos
david-engelmann Dec 21, 2022
a5afb5c
go not 2to3
david-engelmann Dec 21, 2022
e5952cd
rm gofmt
david-engelmann Dec 21, 2022
d0911c4
fix order in macos earthly install
david-engelmann Dec 21, 2022
80ea85b
remove rm
david-engelmann Dec 21, 2022
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
22 changes: 20 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
uses: pre-commit/action@v3.0.0

tests:
runs-on: ubuntu-latest
env:
FORCE_COLOR: 1
strategy:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
target:
- +test-python3.8-arrow1.x.x
- +test-python3.8-arrow2.x.x
Expand Down Expand Up @@ -69,25 +69,43 @@ jobs:
- target: +test-python3.8-arrow10.x.x
experimental: false
upload: true
os: ubuntu-latest
- target: +test-python3.9-arrow10.x.x
experimental: false
upload: true
os: ubuntu-latest
- target: +test-python3.10-arrow10.x.x
experimental: false
upload: true
os: ubuntu-latest
- target: +test-python3.8-arrow-nightly
experimental: true
upload: false
os: ubuntu-latest
- target: +test-python3.9-arrow-nightly
experimental: true
upload: false
os: ubuntu-latest
- target: +test-python3.10-arrow-nightly
experimental: true
upload: false
os: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Download earthly 0.5.0
run: "sudo /bin/sh -c 'wget https://github.com/earthly/earthly/releases/download/v0.5.0/earthly-linux-amd64 -O /usr/local/bin/earthly && chmod +x /usr/local/bin/earthly'"
run: |
if [ "$RUNNER_OS" == "Windows" ]; then
echo 'windows os found'
exit 1
elif [ "$RUNNER_OS" == "Linux" ]; then
sudo /bin/sh -c 'wget https://github.com/earthly/earthly/releases/download/v0.5.0/earthly-linux-amd64 -O /usr/local/bin/earthly && chmod +x /usr/local/bin/earthly'
else
brew update
brew cleanup
sudo chown -R $(whoami) $(brew --prefix)/*
brew install earthly/earthly/earthly && earthly bootstrap
fi
- name: Run build
run: earthly --allow-privileged ${{ matrix.target }}
continue-on-error: ${{ matrix.experimental }}
Expand Down
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ def __str__(self):
if sys.platform == "darwin":
extra_compile_args.append("--std=c++17")
extra_compile_args.append("--stdlib=libc++")
extra_compile_args.append("-mmacosx-version-min=10.9")
extra_compile_args.append("-mmacosx-version-min=11.0")
# See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
extra_compile_args.append("-D_LIBCPP_DISABLE_AVAILABILITY")
hidden_visibility_args.append("-fvisibility=hidden")
include_dirs.append(os.getenv("UNIXODBC_INCLUDE_DIR", "/usr/local/include/"))
library_dirs.append(os.getenv("UNIXODBC_LIBRARY_DIR", "/usr/local/lib/"))
Expand Down Expand Up @@ -116,6 +118,9 @@ def __str__(self):
library_dirs.append(os.getenv("UNIXODBC_LIBRARY_DIR"))
odbclib = "odbc"

if sys.version_info.minor < 10:
extra_compile_args.append("CONDA_DLL_SEARCH_MODIFICATION_ENABLE=1")


def get_extension_modules():
extension_modules = []
Expand Down