Skip to content

Commit af95fc8

Browse files
committed
Merge branch 'main' into prerelease
2 parents 8942e30 + a4db934 commit af95fc8

File tree

26 files changed

+379
-448
lines changed

26 files changed

+379
-448
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
container: ubuntu:24.04
113113
strategy:
114114
matrix:
115-
python-version: ["3.13"]
115+
python-version: ["3.14"]
116116
services:
117117
# Label used to access the service container
118118
postgres:
@@ -156,7 +156,7 @@ jobs:
156156
- name: Install tools
157157
run: |
158158
apt-get update
159-
apt-get install -y wget curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev libkrb5-dev libclang-dev
159+
apt-get install -y wget curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev libkrb5-dev libclang-dev libffi-dev
160160
env:
161161
DEBIAN_FRONTEND: noninteractive
162162

.github/workflows/import-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
os: [ubuntu-latest, macos-10.15, windows-latest]
21-
python-version: ["3.10", "3.11", "3.12", "3.13"]
21+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
2222
steps:
2323
- uses: actions/checkout@v5
2424

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
{ "arch": "aarch64", "runs-on": "ubuntu-22.04-arm" },
1919
]
2020
python-version:
21-
[[310, "3.10"], [311, "3.11"], [312, "3.12"], [313, "3.13"]]
21+
[[310, "3.10"], [311, "3.11"], [312, "3.12"], [313, "3.13"], [314, "3.14"]]
2222
steps:
2323
- uses: actions/checkout@v5
2424

@@ -80,7 +80,7 @@ jobs:
8080
strategy:
8181
matrix:
8282
os: ["windows-latest", "macos-15-intel"]
83-
python-version: ["3.10", "3.11", "3.12", "3.13"]
83+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
8484
include:
8585
- os: "macos-15-intel"
8686
features: "--features integrated-auth-gssapi"
@@ -130,7 +130,7 @@ jobs:
130130
runs-on: macos-latest
131131
strategy:
132132
matrix:
133-
python-version: ["3.10", "3.11", "3.12", "3.13"]
133+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
134134
steps:
135135
- uses: actions/checkout@v5
136136

@@ -178,7 +178,7 @@ jobs:
178178
needs: [win-and-mac, linux]
179179
strategy:
180180
matrix:
181-
python-version: ["3.10", "3.11", "3.12", "3.13"]
181+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
182182
os:
183183
[
184184
macos-15-intel,

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ MODIN_ENGINE=dask
9696
* Add the source to the [source_router](https://github.com/sfu-db/connector-x/blob/main/connectorx-python/src/source_router.rs)
9797
* Add the source to writing functions of each destination. Here are examples for [pandas](https://github.com/sfu-db/connector-x/blob/main/connectorx-python/src/pandas/mod.rs) and [arrow](https://github.com/sfu-db/connector-x/blob/main/connectorx-python/src/arrow.rs)
9898
* Add corresponding unit tests under `connectorx/tests` for Rust and `connectorx-python/connectorx/tests` for Python
99+
* Add the new source to the [docs](./docs/)
99100

100101
**Please check out [here](https://sfu-db.github.io/connector-x/connectorx/#extending-connectorx) for more detailed implementation instructions of how to extend ConnectorX.**
101102

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,13 @@ BibTeX entry:
494494
<sub><b>Null</b></sub>
495495
</a>
496496
</td>
497+
<td align="center">
498+
<a href="https://github.com/Vincenthays">
499+
<img src="https://avatars.githubusercontent.com/u/15261901?v=4" width="66;" alt="Vincenthays"/>
500+
<br />
501+
<sub><b>Vincent HAYS</b></sub>
502+
</a>
503+
</td>
497504
<td align="center">
498505
<a href="https://github.com/rursprung">
499506
<img src="https://avatars.githubusercontent.com/u/39383228?v=4" width="66;" alt="rursprung"/>
@@ -515,15 +522,15 @@ BibTeX entry:
515522
<sub><b>Mariano Guerra</b></sub>
516523
</a>
517524
</td>
525+
</tr>
526+
<tr>
518527
<td align="center">
519528
<a href="https://github.com/kevinheavey">
520529
<img src="https://avatars.githubusercontent.com/u/24635973?v=4" width="66;" alt="kevinheavey"/>
521530
<br />
522531
<sub><b>Kevin Heavey</b></sub>
523532
</a>
524533
</td>
525-
</tr>
526-
<tr>
527534
<td align="center">
528535
<a href="https://github.com/kayhoogland">
529536
<img src="https://avatars.githubusercontent.com/u/22837350?v=4" width="66;" alt="kayhoogland"/>
@@ -559,15 +566,15 @@ BibTeX entry:
559566
<sub><b>Andrew Jackson</b></sub>
560567
</a>
561568
</td>
569+
</tr>
570+
<tr>
562571
<td align="center">
563572
<a href="https://github.com/Cabbagec">
564573
<img src="https://avatars.githubusercontent.com/u/14164987?v=4" width="66;" alt="Cabbagec"/>
565574
<br />
566575
<sub><b>Brandon</b></sub>
567576
</a>
568577
</td>
569-
</tr>
570-
<tr>
571578
<td align="center">
572579
<a href="https://github.com/Amar1729">
573580
<img src="https://avatars.githubusercontent.com/u/15623522?v=4" width="66;" alt="Amar1729"/>

connectorx-cpp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "connectorx-cpp"
3-
version = "0.4.5-alpha.1"
3+
version = "0.4.5-alpha.2"
44
edition = "2021"
55
license = "MIT"
66

connectorx-python/Cargo.lock

Lines changed: 34 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

connectorx-python/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors = ["Weiyuan Wu <[email protected]>"]
33
edition = "2018"
44
name = "connectorx-python"
5-
version = "0.4.5-alpha.1"
5+
version = "0.4.5-alpha.2"
66
license = "MIT"
77
readme = "README.md"
88

@@ -25,12 +25,12 @@ lazy_static = "1.4"
2525
libc = "0.2"
2626
log = "0.4"
2727
ndarray = "0.16"
28-
numpy = {version = "0.22", features = ["gil-refs"]}
28+
numpy = {version = "0.27"}
2929
openssl = {version = "0.10", features = ["vendored"]}
3030
postgres = {version = "0.19", features = ["with-chrono-0_4", "with-uuid-1", "with-serde_json-1"]}
3131
postgres-native-tls = {version = "0.5"}
3232
postgres-openssl = {version = "0.5.0"}
33-
pyo3 = {version = "0.22", default-features = false, features = ["macros", "gil-refs", "py-clone"]}
33+
pyo3 = {version = "0.27", default-features = false, features = ["macros", "py-clone"]}
3434
pyo3-built = "0.5"
3535
rust_decimal = {version = "1", features = ["db-postgres"]}
3636
serde_json = "1"

0 commit comments

Comments
 (0)