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

tiledbsoma 1.8.0 pre-check #91

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.14'
- '11.0'
MACOSX_SDK_VERSION:
- '10.14'
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down
5 changes: 5 additions & 0 deletions recipe/build-r-tiledbsoma.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ fi

export CXX17FLAGS="-Wno-deprecated-declarations -Wno-deprecated"

# https://conda-forge.org/docs/maintainer/knowledge_base/#newer-c-features-with-old-sdk
if [[ $target_platform == osx-* ]]; then
CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
fi

# Unlike most R recipes which are built for one R version per job, this recipe
# with multiple outputs builds for each of the R versions in the same job. Thus
# the compiled files in the source directory need to be cleaned between builds,
Expand Down
5 changes: 4 additions & 1 deletion recipe/build-tiledbsoma-py.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ set -ex
cd apis/python

echo "$PKG_VERSION" >> RELEASE-VERSION
$PYTHON setup.py install --single-version-externally-managed --record record.txt --libtiledbsoma="${PREFIX}"

export TILEDB_PATH=$PREFIX
export TILEDBSOMA_PATH=$PREFIX
$PYTHON -m pip install --no-deps --no-build-isolation . -vv

$PYTHON setup.py clean --all
2 changes: 1 addition & 1 deletion recipe/cc_wrap.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh

args="${@##-mmacosx-version-min=10.9*}"
$NN_CC_ORIG $args -mmacosx-version-min=10.14
$NN_CC_ORIG $args -mmacosx-version-min=11.0
5 changes: 3 additions & 2 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks
MACOSX_SDK_VERSION: # [osx and x86_64]
- 10.14 # [osx and x86_64]
- 11.0 # [osx and x86_64]
MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64]
- "10.14" # [osx and x86_64]
- "11.0" # [osx and x86_64]
channel_sources:
- conda-forge,tiledb
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion recipe/cxx_wrap.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh

args="${@##-mmacosx-version-min=10.9*}"
$NN_CXX_ORIG $args -mmacosx-version-min=10.14
$NN_CXX_ORIG $args -mmacosx-version-min=11.0
45 changes: 26 additions & 19 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "tiledbsoma" %}
{% set version = "1.7.2" %}
{% set sha256 = "b0ccf8e0498531a36eef88e4896f02306b18491b34843054093f8c8c6f63796e" %}
{% set version = "1.8.0" %}
{% set sha256 = "tbd" %}
# This is the SHA256 of
# TileDB-SOMA-i.j.k.tar.gz
# from
Expand All @@ -13,20 +13,20 @@ package:
version: {{ version }}

# Post-tag real thing:
source:
url: https://github.com/single-cell-data/TileDB-SOMA/archive/{{ version }}.tar.gz
sha256: {{ sha256 }}
#source:
# url: https://github.com/single-cell-data/TileDB-SOMA/archive/{{ version }}.tar.gz
# sha256: {{ sha256 }}

# Pre-tag canary "will Conda be green if we release":
#source:
# git_url: https://github.com/single-cell-data/TileDB-SOMA.git
# git_rev: b95a752a335b50a7e08b9dd729748e3c6ccd9b57
# git_depth: -1
# # hoping to be 1.7.2 <-- FILL IN HERE
source:
git_url: https://github.com/single-cell-data/TileDB-SOMA.git
git_rev: b54ba225623ec2e9dab04bd2a1061298377d8677
git_depth: -1
# hoping to be 1.8.0 <-- FILL IN HERE


build:
number: 2
number: 0
skip: true # [win or linux32 or py2k]
# Important: set this back to 0 on a new release

Expand All @@ -42,10 +42,13 @@ outputs:
- cmake
- make # [not win]
host:
- tiledb >=2.19.1,<2.20
- tiledb >=2.20.0,<2.21
- spdlog
- fmt
- libgoogle-cloud 2.12.*
#### TEMP - libgoogle-cloud 2.17.*
run:
# https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64]
about:
home: http://tiledb.com
license: MIT
Expand Down Expand Up @@ -91,7 +94,7 @@ outputs:
- pyarrow <13.0 # [osx]
- pyarrow # [not osx]
- pyarrow-hotfix
- libgoogle-cloud 2.12.*
#### TEMP - libgoogle-cloud 2.17.*
run:
- {{ pin_compatible('numpy', lower_bound='1.16', upper_bound='1.24') }}
- {{ pin_subpackage('libtiledbsoma', exact=True) }}
Expand All @@ -104,13 +107,15 @@ outputs:
- scipy
- anndata # [py>37]
- anndata <0.9 # [py<=37]
- tiledb-py >=0.25.0,<0.26.0
- tiledb-py >=0.26.0,<0.27.0
- typing-extensions >=4.1
- numba >=0.58.1 # [py>37]
- numba # [py<=37]
- attrs >=22.2
- somacore ==1.0.7
- somacore >=1.0.8
- scanpy >=1.9.2
# https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64]
test:
imports:
- tiledbsoma
Expand Down Expand Up @@ -142,7 +147,7 @@ outputs:
- r-matrix # [build_platform != target_platform]
- r-bit64 # [build_platform != target_platform]
- r-rcppint64 # [build_platform != target_platform]
- r-tiledb >=0.23.0,<0.24 # [build_platform != target_platform]
- r-tiledb >=0.24.0,<0.25 # [build_platform != target_platform]
- r-arrow # [build_platform != target_platform]
- r-fs # [build_platform != target_platform]
- r-glue # [build_platform != target_platform]
Expand All @@ -151,14 +156,16 @@ outputs:
- r-dplyr # [build_platform != target_platform]
- r-data.table # [build_platform != target_platform]
- r-rlang # [build_platform != target_platform]
# https://conda-forge.org/docs/maintainer/knowledge_base/#requiring-newer-macos-sdks
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64]
host:
- {{ pin_subpackage('libtiledbsoma', exact=True) }}
- r-base
- r-r6
- r-matrix
- r-bit64
- r-rcppint64
- r-tiledb >=0.23.0,<0.24
- r-tiledb >=0.24.0,<0.25
- r-arrow
- r-fs
- r-glue
Expand All @@ -174,7 +181,7 @@ outputs:
- r-r6
- r-matrix
- r-bit64
- r-tiledb >=0.23.0,<0.24
- r-tiledb >=0.24.0,<0.25
- r-arrow
- r-fs
- r-glue
Expand Down
Loading