fix warning

sfu-db · May 9, 2024 · ff8a694 · ff8a694
1 parent 0a83b56
commit ff8a694
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -206,6 +206,7 @@ jobs:
       - name: Install other dependent tools
         run: |
           python -m pip install poetry
+          poetry run python -m pip install --user six
           if [ ! -f "$HOME/.cargo/bin/just" ]; then curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to ~/.cargo/bin; fi
 
       - name: Seed the database

diff --git a/connectorx-python/poetry.lock b/connectorx-python/poetry.lock
diff --git a/connectorx-python/pyproject.toml b/connectorx-python/pyproject.toml
@@ -34,7 +34,6 @@ pandas = {version = "^2", optional = true}
 polars = {version = ">=0.8", optional = true}
 pyarrow = {version = ">=4", optional = true}
 python = ">=3.9,<3.13"
-six = "^1.16.0"
 
 [tool.poetry.extras]
 all = ["dask", "pandas", "modin", "polars", "pyarrow"]

diff --git a/connectorx-python/src/pandas/pandas_columns/array.rs b/connectorx-python/src/pandas/pandas_columns/array.rs
@@ -235,9 +235,9 @@ where
                         let end = start + len;
                         unsafe {
                             // allocate and write in the same time
-                            *self.data.add(self.row_idx[i]) = PyList(
-                                pyo3::types::PyList::new(py, &self.buffer[start..end]).into(),
-                            );
+                            let n = pyo3::types::PyList::new_bound(py, &self.buffer[start..end])
+                                .unbind();
+                            *self.data.add(self.row_idx[i]) = PyList(n);
                         };
                         start = end;
                     } else {

diff --git a/connectorx-python/src/pandas/pandas_columns/bytes.rs b/connectorx-python/src/pandas/pandas_columns/bytes.rs
@@ -191,9 +191,10 @@ impl BytesColumn {
                         let end = start + len;
                         unsafe {
                             // allocate and write in the same time
-                            *self.data.add(self.row_idx[i]) = PyBytes(
-                                pyo3::types::PyBytes::new(py, &self.bytes_buf[start..end]).into(),
-                            );
+                            let b =
+                                pyo3::types::PyBytes::new_bound(py, &self.bytes_buf[start..end])
+                                    .unbind();
+                            *self.data.add(self.row_idx[i]) = PyBytes(b);
                         };
                         start = end;
                     } else {