Skip to content
Open
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
185 changes: 169 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
echo "DT_SDIST=$(ls dist/*.tar.gz)" >> $GITHUB_ENV

- name: Save sdist artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sdist
path: ${{ env.DT_SDIST }}
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-ubuntu-3.8
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-ubuntu-3.9
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-ubuntu-3.10
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-ubuntu-3.11
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -359,7 +359,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-ubuntu-3.12
path: ${{ env.DT_WHEEL }}
Expand All @@ -373,6 +373,59 @@ jobs:
- name: Uninstall wheel
run: python -m pip uninstall -y $DT_WHEEL

linux-313:
name: Linux / Python 3.13
runs-on: ubuntu-latest
needs: setup
if: ${{ needs.setup.outputs.DT_RELEASE == 'True' }}

env:
DT_HARNESS: ${{ needs.setup.outputs.DT_HARNESS }}
DT_BUILD_ID: ${{ needs.setup.outputs.DT_BUILD_ID }}
DT_RELEASE: ${{ needs.setup.outputs.DT_RELEASE }}
DT_BUILD_SUFFIX: ${{ needs.setup.outputs.DT_BUILD_SUFFIX }}
DT_BUILD_NUMBER: ${{ needs.setup.outputs.DT_BUILD_NUMBER }}
DT_CHANGE_BRANCH: ${{ needs.setup.outputs.DT_CHANGE_BRANCH }}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Python 3.13
uses: actions/setup-python@v3
with:
python-version: "3.13"

- name: Build datatable wheel
run: |
python -V
python -m pip install --upgrade pip
# Update to normal install when they publish the next version > 5.4.0
# Current version fails on 3.13 because of distutils
python -m pip install git+https://github.com/pypa/auditwheel
python ci/ext.py wheel --audit
echo "DT_WHEEL=$(ls dist/*-cp313-*.whl)" >> $GITHUB_ENV

- name: Print build information
run: |
echo "DT_WHEEL = $DT_WHEEL"
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v4
with:
name: wheel-ubuntu-3.13
path: ${{ env.DT_WHEEL }}

- name: Install and test
run: |
python -m pip install $DT_WHEEL
python -m pip install pytest docutils pandas pyarrow
python -m pytest -ra --maxfail=10 -Werror -vv --showlocals ./tests/

- name: Uninstall wheel
run: python -m pip uninstall -y $DT_WHEEL

#-------------------------------------------------------------------------------------
# MacOS
#-------------------------------------------------------------------------------------
Expand Down Expand Up @@ -413,7 +466,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-macos-3.8
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -463,7 +516,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-macos-3.9
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -513,7 +566,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-macos-3.10
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -562,7 +615,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-macos-3.11
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -612,7 +665,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-macos-3.12
path: ${{ env.DT_WHEEL }}
Expand All @@ -626,6 +679,56 @@ jobs:
- name: Uninstall wheel
run: python -m pip uninstall -y $DT_WHEEL

macos-313:
name: MacOS / Python 3.13
runs-on: macos-latest
needs: setup
if: ${{ needs.setup.outputs.DT_RELEASE == 'True' }}

env:
DT_HARNESS: ${{ needs.setup.outputs.DT_HARNESS }}
DT_BUILD_ID: ${{ needs.setup.outputs.DT_BUILD_ID }}
DT_RELEASE: ${{ needs.setup.outputs.DT_RELEASE }}
DT_BUILD_SUFFIX: ${{ needs.setup.outputs.DT_BUILD_SUFFIX }}
DT_BUILD_NUMBER: ${{ needs.setup.outputs.DT_BUILD_NUMBER }}
DT_CHANGE_BRANCH: ${{ needs.setup.outputs.DT_CHANGE_BRANCH }}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Python 3.13
uses: actions/setup-python@v3
with:
python-version: "3.13"

- name: Build datatable wheel
run: |
python -V
python -m pip install --upgrade pip
python ci/ext.py wheel
echo "DT_WHEEL=$(ls dist/*-cp313-*.whl)" >> $GITHUB_ENV

- name: Print build information
run: |
echo "DT_WHEEL = $DT_WHEEL"
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v4
with:
name: wheel-macos-3.13
path: ${{ env.DT_WHEEL }}

- name: Install and test
run: |
python -m pip install $DT_WHEEL
python -m pip install pytest docutils pandas pyarrow
python -m pytest -ra --maxfail=10 -Werror -vv --showlocals ./tests/

- name: Uninstall wheel
run: python -m pip uninstall -y $DT_WHEEL

#-------------------------------------------------------------------------------------
# Windows
#-------------------------------------------------------------------------------------
Expand Down Expand Up @@ -665,7 +768,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-windows-3.8
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -715,7 +818,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-windows-3.9
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -765,7 +868,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-windows-3.10
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -815,7 +918,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-windows-3.11
path: ${{ env.DT_WHEEL }}
Expand Down Expand Up @@ -865,7 +968,7 @@ jobs:
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-windows-3.12
path: ${{ env.DT_WHEEL }}
Expand All @@ -878,3 +981,53 @@ jobs:

- name: Uninstall wheel
run: python -m pip uninstall -y $env:DT_WHEEL

win-313:
name: Windows / Python 3.13
runs-on: windows-latest
needs: setup
if: ${{ needs.setup.outputs.DT_RELEASE == '(disabled)' }}

env:
DT_HARNESS: ${{ needs.setup.outputs.DT_HARNESS }}
DT_BUILD_ID: ${{ needs.setup.outputs.DT_BUILD_ID }}
DT_RELEASE: ${{ needs.setup.outputs.DT_RELEASE }}
DT_BUILD_SUFFIX: ${{ needs.setup.outputs.DT_BUILD_SUFFIX }}
DT_BUILD_NUMBER: ${{ needs.setup.outputs.DT_BUILD_NUMBER }}
DT_CHANGE_BRANCH: ${{ needs.setup.outputs.DT_CHANGE_BRANCH }}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Python 3.13
uses: actions/setup-python@v3
with:
python-version: "3.13"

- name: Build datatable wheel
run: |
python -V
python -m pip install --upgrade pip
python ci/ext.py wheel
echo "DT_WHEEL=$(ls dist/*-cp313-*.whl)" >> $env:GITHUB_ENV

- name: Print build information
run: |
echo "DT_WHEEL = $env:DT_WHEEL"
cat src/datatable/_build_info.py

- name: Save wheel artifact
uses: actions/upload-artifact@v4
with:
name: wheel-windows-3.13
path: ${{ env.DT_WHEEL }}

- name: Install and test
run: |
python -m pip install $env:DT_WHEEL
python -m pip install pytest docutils pandas pyarrow
python -m pytest -ra --maxfail=10 -Werror -vv --showlocals ./tests/

- name: Uninstall wheel
run: python -m pip uninstall -y $env:DT_WHEEL
1 change: 0 additions & 1 deletion requirements_docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ pygments>=2.6
sphinx>=4.0, <5.0
sphinx_rtd_theme>=0.5
nbsphinx>=0.5
datatable
5 changes: 5 additions & 0 deletions src/core/python/obj.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,12 @@ std::string _obj::typestr() const {


size_t _obj::get_sizeof() const {
#if PY_VERSION_HEX < 0x03090000
return _PySys_GetSizeOf(v);
#else
// Python 3.9+
return PyObject_Size(v);
#endif
}

size_t _obj::get_refcount() const {
Expand Down
6 changes: 3 additions & 3 deletions tests/ijby/test-sort.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ def test_sort_with_reverse_list_false_true(numpy):
{
'A': ['o1','o2','o3','o4','o5'],
'B': ['c1','c1','c2','c2','c3'],
'C': [5, 1, 3, numpy.NaN, numpy.NaN]
'C': [5, 1, 3, numpy.nan, numpy.nan]
})
EXP = DT[:, :, dt.sort(f.B, -f.A)]
RES1 = DT[:, :, dt.sort("B", "A", reverse=[False, True])]
Expand All @@ -1037,7 +1037,7 @@ def test_sort_with_reverse_list_true_true(numpy):
{
'A': ['o1', 'o2', 'o3', 'o4', 'o5'],
'B': ['c1', 'c1', 'c2', 'c2', 'c3'],
'C': [5,1,3, numpy.NaN,numpy.NaN]
'C': [5,1,3, numpy.nan,numpy.nan]
})
EXP = DT[:, :, dt.sort(-f.A, -f.B)]
RES1 = DT[:, :, dt.sort("B", "A", reverse=[True, True])]
Expand All @@ -1055,7 +1055,7 @@ def test_reverse_list_error(numpy):
{
'A': ['o1', 'o2', 'o3', 'o4', 'o5']*25,
'B': ['c1', 'c1', 'c2', 'c2', 'c3']*25,
'C': [5, 1, 3, numpy.NaN, numpy.NaN]*25
'C': [5, 1, 3, numpy.nan, numpy.nan]*25
})
with pytest.raises(ValueError, match=msg):
DT[:, :, dt.sort(0, 1, reverse=[True])]
Expand Down