Skip to content
Merged
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
9 changes: 6 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ jobs:
publish:
name: "Publish release"
runs-on: ubuntu-latest

strategy:
matrix:
python-version: [ "3.10", "3.11", "3.12" ]
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: 3.11
python-version: ${{ matrix.python-version }
- name: actions/cache
uses: actions/cache@v3.2.5
with:
Expand All @@ -38,7 +41,7 @@ jobs:
- name: "Publish to PyPI"
run: |
set +x
twine upload dist/*
twine upload dist/*.whl
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
9 changes: 5 additions & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
cancel-in-progress: true
strategy:
matrix:
python-version: ["3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]
fail-fast: false
steps:
- name: actions/checkout
Expand All @@ -72,7 +72,7 @@ jobs:
with:
path: ${{ env.PIP_CACHE }}
key: ubuntu-22.04-pip-test-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'requirements-test.txt') }}
restore-keys: ubuntu-22.04-pip-test-
restore-keys: ubuntu-22.04-pip-test-${{ matrix.python-version }}-
- name: actions/cache
uses: actions/cache@v3.2.5
with:
Expand All @@ -84,10 +84,11 @@ jobs:
- name: pip
run: |
set -x
ls "$HOME/.local/bin"
ls "$HOME/.local/bin" || true
[ ! -f "$HOME/.local/bin/pytest" ] && rm -rf "$HOME/.local/lib/python3.*/site-packages/*"
python3 -m pip install --user -r requirements.txt -r requirements-test.txt --no-warn-script-location
echo "$HOME/.local/bin" >> $GITHUB_PATH
python3 -m pip uninstall -y medvedi || true
python3 -m pip install --user --no-deps -e .
- name: test
run: |
Expand All @@ -108,7 +109,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: 3.11
python-version: 3.12
- name: install build
run: python3 -m pip install --user build twine auditwheel
- name: actions/cache
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Design goals:

Otherwise, you should be way better with regular Pandas.

Medvedi is currently heavily used in production of [Athenian](https://athenian.co).
Medvedi used to be heavily used in production at [Athenian](https://athenian.co).
4 changes: 2 additions & 2 deletions medvedi/accelerators.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ cdef void _is_null_vec(
const long stride,
const long size,
npy_bool *out_arr,
) nogil:
) noexcept nogil:
cdef long i
for i in range(size):
out_arr[i] = Py_None == (<const PyObject **> (obj_arr + i * stride))[0]
Expand All @@ -323,7 +323,7 @@ cdef void _is_not_null(
const long stride,
const long size,
npy_bool *out_arr,
) nogil:
) noexcept nogil:
cdef long i
for i in range(size):
out_arr[i] = Py_None != (<const PyObject **> (obj_arr + i * stride))[0]
Expand Down
4 changes: 2 additions & 2 deletions medvedi/io.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ cdef void _serialize_object_column(
PyObject *column,
char *output,
ColumnMeasurement *measurement,
) nogil:
) noexcept nogil:
cdef:
npy_intp rows, stride_x, x, i
PyObject **data = <PyObject **> PyArray_BYTES(column)
Expand Down Expand Up @@ -490,7 +490,7 @@ cdef void _serialize_object_column(
bookmark[-1] = output - <char *>bookmark


cdef inline void _write_str(PyObject *obj, char **output) nogil:
cdef inline void _write_str(PyObject *obj, char **output) noexcept nogil:
cdef:
Py_ssize_t length
uint32_t size
Expand Down
2 changes: 1 addition & 1 deletion medvedi/metadata.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__package__ = "medvedi" # noqa: A001
__description__ = "Memory Efficient Deconstructed Vectorized Dataframe Interface"
__version__ = "0.1.67"
__version__ = "0.1.68"
5 changes: 3 additions & 2 deletions medvedi/native/mi_heap_destroy_stl_allocator.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ cdef inline mi_heap_destroy_stl_allocator[char] *mi_heap_allocator_from_capsule(
return <mi_heap_destroy_stl_allocator[char] *> PyCapsule_GetPointer(obj, b"mi_heap_destroy_stl_allocator")


cdef inline void _delete_mi_heap_allocator_in_capsule(obj):
cdef inline void _delete_mi_heap_allocator_in_capsule(obj) noexcept:
cdef mi_heap_destroy_stl_allocator[char] *alloc = mi_heap_allocator_from_capsule(obj)
del alloc
if alloc != NULL:
del alloc
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools!=60.6.0,!=64.0.0", "wheel", "Cython>=0.29.30", "numpy==1.23.4"]
requires = ["setuptools==75.3.0", "wheel", "Cython==3.0.12", "numpy==1.26.4"]

[tool.isort]
profile = "black"
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pytest-benchmark==4.0.0
pytest-rerunfailures==11.1.1
pytest-xdist==3.2.0
pytest-timeout==2.1.0
codecov==2.1.12
codecov==2.1.13
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
numpy==1.23.4
pyarrow==11.0.0
numpy==1.26.4
pyarrow==14.0.2
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@
ext_modules=ext_modules,
include_dirs=[np.get_include(), str(code_root)],
keywords=[],
install_requires=["numpy>=1.23,<1.24"],
install_requires=["numpy>=1.23,<2.0", "pyarrow>=14.0.0"],
extras_require={
"arrow": ["pyarrow"],
},
tests_require=[], # see requirements-test.txt
package_data={
"": ["*.md"],
"medvedi": ["../requirements.txt", "libmimalloc.so*", "mimalloc.h", "*.pyx"],
Expand All @@ -66,5 +65,6 @@
"Development Status :: 3 - Alpha",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
)