Sync with upstream up to 3.29.1 #329

fruch · 2024-06-06T10:22:33Z

doing it slow one version at a time

3.27.0
3.28.0
3.29.0
3.29.1

…atastax#1150)

* update RH nav order * add line break * add api

…x#1138)

Added error handling blog reference.

This reverts commit 6894b02.

…g fields (datastax#1151)

…1164)

…l encryption (datastax#1160)

…ion-specific CLE policies (datastax#1165)

…tastax#1161)

windows builds so far was running with having libev available and until this sync the fallback for python 3.12 was asyncio eventloop, but now we fail and not fall back to asyncio. so all unittest on windows are failing on any import from cassandra.connection. in this change we use conan to download libev, and using it to compile the driver with libev Ref: https://conan.io/center/recipes/libev

we don't have libev availble for this platform, and we can run the unit tests anymore for python 3.12 cause of that. so whom still need this platform whould need to be able to compile it on he's own.

fruch · 2024-06-10T21:19:27Z

@Lorak-mmk

Took me a while to get the windows wheel building in shape
it was failing in testing with python 3.12, cause of missing libev (i.e. no fallback to asyncio anymore)
I've figured out a way to retrieve a compiled version of libev, but only for win64, not with win32
I'm giving up on wheels for win32, i.e. wheels we can't cover with tests are not really someone we can consider supported

(we have more like that, all the PyPy ones, but that's a fight for another day)

the only pending issue here, is getting agreement on how to treat Column Encryption feature.
and get it reviewed

fruch · 2024-06-11T05:13:34Z

One more issue I remember we might have
scylladb/scylla-cqlsh#90

cqlsh would break with python 3.12

Lorak-mmk · 2024-07-12T21:09:04Z

That's a lot of code to review... I'll try to get to it soon.
Do you think it would be possible to create an automation to open a PR to our fork whenever a PR is merged to upstream (or non-PR commits are added to master in upstream)?
That way we could review the changes as they come instead of dealing with those insane massive diffs.

fruch · 2024-07-13T19:19:45Z

That's a lot of code to review... I'll try to get to it soon.
Do you think it would be possible to create an automation to open a PR to our fork whenever a PR is merged to upstream (or non-PR commits are added to master in upstream)?
That way we could review the changes as they come instead of dealing with those insane massive diffs.

We might consider that, but it would be a bit complicated, and we'll need to make sure we merge them in the right order.

It might be easy if we do it per release, in this PR we have 3 releases at the same time.

Lorak-mmk · 2024-07-15T17:40:05Z

@Lorak-mmk we need to take a call here, on 3.27.0 they introduce client side Column Encryption feature.

Meanwhile I don't mention it on our docs, and we should consider if to disable it in our fork (at least until we review/test it and gives it a thumbs up)

I don't think we've seen new feature much since we forked...

@roydahan @tzach, your thoughts about how to handle this feature ?

Are there tests for it?

Lorak-mmk · 2024-07-15T18:23:35Z

README.rst

@@ -7,7 +7,7 @@ DataStax Driver for Apache Cassandra
 A modern, `feature-rich <https://github.com/datastax/python-driver#features>`_ and highly-tunable Python client library for Apache Cassandra (2.1+) and
 DataStax Enterprise (4.7+) using exclusively Cassandra's binary protocol and Cassandra Query Language v3.

-The driver supports Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+The driver supports Python 3.7 and 3.8.


I think we support more versions than that. Could you add the missing ones?

Lorak-mmk · 2024-07-15T18:59:07Z

docs/index.rst

-The driver supports Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+The driver supports Python 3.7 and 3.8.


Lorak-mmk · 2024-07-16T17:07:45Z

cassandra/cluster.py

+                self.client_protocol_handler = type(
+                    str(self.session_id) + "-ProtocolHandler",
+                    (ProtocolHandler,),
+                    {"column_encryption_policy": self.cluster.column_encryption_policy})


Why would someone ever write such a code. It's absolutely disgusting.

Lorak-mmk · 2024-07-16T17:18:22Z

cassandra/io/asyncioreactor.py

This is a message reharding commit PYTHON-1313 Fix asyncio removals in Python 3.10 (https://github.com/datastax/python-driver/pull/1179):
I think this commit should be dropped, we already fixed this issue on our end.

another thing: why does the diff I see not include our changes? Is that a GitHub issue or a just how git works? It looks like this:

but our current code on master is different than red parts imply.
I'll stop the review here for now, because I don't see a point in reviewing if the diffs I see are false. What can we do about this?

Hmm... the diff is correct if I look in a "total" diff, but wrong if I review commit-by-commit (as reviews should be done!). I don't want to review the total diff because it includes my changes to remove six and those diffs are obfuscating the whole thing too much for me to be sure I noticed everything else.

One solution would be to fix and merge my PR with six removal and then rebase this one on top of that. This is still not a good solution because it won't allow me to review each commit, but it would be better than current state.

This situation convinces me a bit more that merging upstream PR by PR (commit by commit?) is a better solution, because it would basically avoid this problem entirely.

I rebased #243 on master and applied fixes that were done in upstream.

So you want to redo this PR, one commit at a time ?

it's not that it's easily to rebase this one, it's means to redo it.
I would suggest doing a PR per version, and then pulling in the fixes as needed from the commits I have ontop of the merges.

No, I think we should do this as one big PR (or a PR per version), as it is now.
I can try to redo this one.

o.k. lets do that.

we can automate the release part, and opening PRs for new releases, I think it would be fairly easy
to make a schedule like that

absurdfarce and others added 30 commits March 27, 2023 20:22

Doc changes following on from 3.26.0 release

54ef7d3

Fix typo

17adb81

Add 3.26 for docs (datastax#1147)

32a2613

Update driver version supported (datastax#1148)

f1e9126

Update ref to include latest version supported (datastax#1149)

9fa742a

PYTHON-1341 Impl of client-side column-level encryption/decryption (d…

058be1e

…atastax#1150)

Release 3.27: changelog & version

ad40056

Include docs for 3.27.0 (datastax#1153)

5646fb0

update RH nav order (datastax#1154)

1767fdb

* update RH nav order * add line break * add api

Update docs.yaml to point to latest 3.27.0 docs

7556a2d

remove future plans (datastax#1155)

78b1e2b

Update docs.yaml to point to latest 3.27.0 docs, take two

e98c26e

Missed dependency on cryptography in setup.py

d911621

Remove different build matrix selection for develop branches (datasta…

078e2f6

…x#1138)

DOC-2813 (datastax#1145)

9ed9894

Added error handling blog reference.

DOC-3278 Update comment for retry policy (datastax#1158)

1092fbd

Fix for rendering of code blocks in CLE documentation (datastax#1159)

0002e91

Update docs.yaml to include recent fixes to CLE docs

7ba8761

remove unnecessary import __future__ (datastax#1156)

6894b02

docs: convert print statement to function in docs (datastax#1157)

64aa5ba

Revert "remove unnecessary import __future__ (datastax#1156)"

f46581e

This reverts commit 6894b02.

Don't fail when inserting UDTs with prepared queries with some missin…

d8431d4

…g fields (datastax#1151)

PYTHON-1343 Use Cython for smoke builds (datastax#1162)

a1e2d3d

Jenkinsfile cleanup (datastax#1163)

863e690

PYTHON-1351 Convert cryptography to an optional dependency (datastax#…

5ea3f4b

…1164)

PYTHON-1350 Store IV along with encrypted text when using column-leve…

531a6c7

…l encryption (datastax#1160)

PYTHON-1356 Create session-specific protocol handlers to contain sess…

356d150

…ion-specific CLE policies (datastax#1165)

CONN-38 Notes for 3.27.0 on PYTHON-1350 (datastax#1166)

910f028

Update docs.yaml to point to most recent 3.27.0 docs changes

643d3a6

PYTHON-1352 Add vector type, codec + support for parsing CQL type (da…

2db3728

…tastax#1161)

fruch force-pushed the sync_with_upstream_3.29.1 branch 13 times, most recently from 5e09863 to 9386a78 Compare June 10, 2024 20:39

fruch added 2 commits June 11, 2024 00:09

CI: drop the support for building win32 wheels

93f12d3

we don't have libev availble for this platform, and we can run the unit tests anymore for python 3.12 cause of that. so whom still need this platform whould need to be able to compile it on he's own.

fruch force-pushed the sync_with_upstream_3.29.1 branch from 9386a78 to 93f12d3 Compare June 10, 2024 21:12

fruch requested a review from roydahan June 20, 2024 21:51

Merge branch 'master' into sync_with_upstream_3.29.1

7686480

Lorak-mmk self-assigned this Jul 9, 2024

Lorak-mmk requested changes Jul 16, 2024

View reviewed changes

Lorak-mmk mentioned this pull request Jul 31, 2024

Merge upstream changes up to 3.29.1 #347

Open

Lorak-mmk removed their assignment Jul 31, 2024

dkropachev mentioned this pull request Aug 9, 2024

Sync with upstream 3.28.0 #364

Open

dkropachev self-assigned this Aug 12, 2024

dkropachev marked this pull request as draft August 12, 2024 17:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync with upstream up to 3.29.1 #329

Sync with upstream up to 3.29.1 #329

fruch commented Jun 6, 2024 •

edited

Loading

fruch commented Jun 10, 2024

fruch commented Jun 11, 2024

Lorak-mmk commented Jul 12, 2024

fruch commented Jul 13, 2024

Lorak-mmk commented Jul 15, 2024

Lorak-mmk Jul 15, 2024

Lorak-mmk Jul 15, 2024

Lorak-mmk Jul 16, 2024

Lorak-mmk Jul 16, 2024

Lorak-mmk Jul 16, 2024

Lorak-mmk Jul 16, 2024

Lorak-mmk Jul 16, 2024 •

edited

Loading

fruch Jul 16, 2024

Lorak-mmk Jul 17, 2024

fruch Jul 17, 2024

		The driver supports Python 2.7, 3.5, 3.6, 3.7 and 3.8.
		The driver supports Python 3.7 and 3.8.

Sync with upstream up to 3.29.1 #329

Are you sure you want to change the base?

Sync with upstream up to 3.29.1 #329

Conversation

fruch commented Jun 6, 2024 • edited Loading

fruch commented Jun 10, 2024

fruch commented Jun 11, 2024

Lorak-mmk commented Jul 12, 2024

fruch commented Jul 13, 2024

Lorak-mmk commented Jul 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Lorak-mmk Jul 16, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fruch commented Jun 6, 2024 •

edited

Loading

Lorak-mmk Jul 16, 2024 •

edited

Loading