Skip to content

Commit 6b905d1

Browse files
committed
Looks like conda recipe is working
1 parent 63ce4ca commit 6b905d1

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ find_package(Python COMPONENTS Interpreter NumPy Development.Module REQUIRED)
99

1010
# Add custom command to generate the version file
1111
add_custom_command(
12-
OUTPUT src/blosc2/_version.py
12+
OUTPUT src/blosc2/version.py
1313
COMMAND ${Python_EXECUTABLE} generate_version.py
1414
DEPENDS generate_version.py pyproject.toml
1515
VERBATIM
@@ -27,11 +27,15 @@ Python_add_library(blosc2_ext MODULE blosc2_ext.c WITH_SOABI)
2727
# We need to link against NumPy
2828
target_link_libraries(blosc2_ext PRIVATE Python::NumPy)
2929

30+
if(DEFINED ENV{USE_SYSTEM_BLOSC2})
31+
set(USE_SYSTEM_BLOSC2 ON)
32+
endif()
33+
3034
if(USE_SYSTEM_BLOSC2)
3135
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
3236
find_package(PkgConfig REQUIRED)
3337
pkg_check_modules(Blosc2 REQUIRED IMPORTED_TARGET blosc2)
34-
target_link_libraries(blosc2_ext PkgConfig::Blosc2)
38+
target_link_libraries(blosc2_ext PRIVATE PkgConfig::Blosc2)
3539
else()
3640
set(STATIC_LIB ON CACHE BOOL "Build a static version of the blosc library.")
3741
set(SHARED_LIB ON CACHE BOOL "Build a shared library version of the blosc library.")

generate_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
version = pyproject["project"]["version"]
1111

1212
# Write the version to blosc2/_version.py
13-
with open("src/blosc2/_version.py", "w") as f:
13+
with open("src/blosc2/version.py", "w") as f:
1414
f.write(f'__version__ = "{version}"\n')

recipes/blosc2/meta.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
{% set name = "blosc2" %}
1+
{% set name = "blosc2" %} # TODO: should be python-blosc2 or blosc2 as in PyPI?
22
{% set version = "3.0.0rc3" %}
33

44
package:
55
name: {{ name|lower }}
66
version: {{ version }}
77

88
source:
9+
# TODO: make actual tarballs work
910
# url: https://github.com/Blosc/python-blosc2/archive/refs/tags/v{{ version }}.tar.gz
10-
#url: https://github.com/Blosc/python-blosc2/archive/refs/tags/v3.0.0-rc2.tar.gz
11-
# sha256: cbf42b475c02145a979e4ac6cbd5ad9df49d23a417b56b6b7bdf5a9d0a4b0716
1211
url: /tmp/blosc2-3.0.0rc3.tar.gz
13-
sha256: 74c7c81cdbf28702fc751f3b6079b1e3653fec8fd285d54214e962c2113c593c
12+
sha256: ac822fd8d60e7356f48c638266b83486e31790fd70e482f814356be33f3fcedb
1413
include:
1514
- pyproject.toml
1615

@@ -19,8 +18,6 @@ build:
1918
script_env:
2019
- USE_SYSTEM_BLOSC2=1
2120
script:
22-
#- {{ PYTHON }} -m pip install --no-deps --ignore-installed .
23-
#- -no-deps --no-build-isolation
2421
- {{ PYTHON }} -m pip install . -vv
2522

2623
requirements:
@@ -40,9 +37,11 @@ requirements:
4037
- scikit-build-core
4138
- cython >=3
4239
- numpy >=2.0.0
40+
- c-blosc2 >=2.15.2
4341
run:
4442
- python >=3.11
4543
- numpy >=1.25.0
44+
- c-blosc2 >=2.15.2
4645
- ndindex
4746
- msgpack-python
4847
- numexpr
@@ -54,10 +53,13 @@ test:
5453
- blosc2
5554
requires:
5655
- pip
57-
- pytest
56+
#- pytest
5857
commands:
5958
- pip check
60-
- pytest -v --pyargs blosc2
59+
- python -c "import blosc2; print(blosc2.__version__)"
60+
- python -c "import blosc2; blosc2.print_versions()"
61+
# The test suite is not being installed
62+
#- pytest -v
6163

6264
about:
6365
home: https://github.com/Blosc/python-blosc2

src/blosc2/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from enum import Enum
1414

15-
from ._version import __version__
15+
from .version import __version__
1616

1717
__version__ = __version__
1818
"""

src/blosc2/version.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = "3.0.0rc3"

0 commit comments

Comments
 (0)