Convert to python3 #15007
Merged
Convert to python3 #15007
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git ls-files '*.py' | xargs 2to3 -wn
$ gg 'env python$' | cut -d: -f1 | sort -u | xargs 2to3 -nw
$ gg 'env python$' | cut -d: -f1 | sort -u | xargs sed -i 's/env python$/env python3/g'
$ git ls-files -- */Dockerfile | xargs sed -i 's/\<python\>/python3/g' $ git co docker/test/integration/resolver/Dockerfile
$ gg '^python ' tests/ | cut -d: -f1 | xargs sed -i 's/^python /python3 /g'
$ gg 'pip ' docker | cut -d: -f1 | sort -u | xargs sed -i 's/RUN pip /RUN python3 -m pip /'
robot-clickhouse
added
the
pr-build
…patibility.python
- python3: {'op': ['-', '!=', '==', '< ', '<=', '> ', '>='], 'arg': ['DT', 'D', 'DT64']}
- python2: {'arg': ['DT', 'D', 'DT64'], 'op': ['-', '!=', '==', '< ', '<=', '> ', '>=']}
Conflicts:
tests/integration/test_mutations_with_merge_tree/test.py
|
Conflicts with #15032 (since it has few bits for converting to python3 too) |
Conflicts:
tests/clickhouse-test
Conflicts:
tests/integration/test_mysql_protocol/test.py
|
If upstream/master will not go ahead then this maybe enough |
alesapin
approved these changes
Sep 30, 2020
qoega
approved these changes
Sep 30, 2020
excitoon
reviewed
Sep 30, 2020
New tests: $ git di ...upstream/master --stat tests/integration/ tests/integration/helpers/cluster.py | 40 +++++++++++++++++++++++++++++++++++++--- tests/integration/runner | 4 +++- tests/integration/test_compression_nested_columns/__init__.py | 0 tests/integration/test_compression_nested_columns/test.py | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/integration/test_mysql_database_engine/test.py | 33 +++++++++++++++++++++++++++++++++ tests/integration/test_storage_kerberized_kafka/__init__.py | 0 tests/integration/test_storage_kerberized_kafka/clickhouse_path/EMPTY_DIR | 0 tests/integration/test_storage_kerberized_kafka/configs/kafka.xml | 26 ++++++++++++++++++++++++++ tests/integration/test_storage_kerberized_kafka/configs/log_conf.xml | 11 +++++++++++ tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/integration/test_storage_kerberized_kafka/secrets/broker_jaas.conf | 14 ++++++++++++++ tests/integration/test_storage_kerberized_kafka/secrets/krb.conf | 22 ++++++++++++++++++++++ tests/integration/test_storage_kerberized_kafka/secrets/zookeeper_jaas.conf | 14 ++++++++++++++ tests/integration/test_storage_kerberized_kafka/test.py | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 14 files changed, 506 insertions(+), 4 deletions(-)
$ git di ...upstream/master --stat tests/integration/ tests/integration/test_merge_tree_s3/test.py | 3 --- tests/integration/test_rename_column/test.py | 1 - tests/integration/test_storage_s3/test.py | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/integration/test_ttl_replicated/test.py | 1 - 4 files changed, 121 insertions(+), 5 deletions(-)
* upstream/master: Throw an error when a single parameter is passed to ReplicatedMergeTree instead of ignoring it
|
traceon
added a commit
to traceon/ClickHouse
that referenced
this pull request
Oct 2, 2020
* master: (279 commits) Convert to python3 (ClickHouse#15007) update en and ru docs: add 128/256 types (ClickHouse#15515) Drop unused code for numeric_limits<int128> in MergeTreeDataSelectExecutor (ClickHouse#15519) Fix comment More defaults on defaults Recursive defaults Fix bash Update ActionsVisitor.cpp Don't add memcpy for sanitizers builds Fix gRPC build scripts. Neutrialize thinlto's memcpy libcall gen. Revert "Add fno-builtin-memcpy" Throw an error when a single parameter is passed to ReplicatedMergeTree instead of ignoring it Update SECURITY.md Update tsan_suppressions.txt Update ActionsVisitor.cpp remove unrelated changes Update SECURITY.md fixes Update ActionsVisitor.cpp ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please squash before merge
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Convert to python3. This closes #14886
Detailed description / Documentation draft:
python2 is already EOL, since January 1, 2020
Checklist:
tests/external_models/catboost/data/build_catboost.shleft as-is, since it uses someyacommand (cc @KochetovNicolai)Tech checklist:
2to3)2to3)sed, package list)s/pip/python3 -m pip/)sed)//P.S I used
2to3before for converting, and it was OK, I guess for massive converting it is to use it.P.P.S. some commits have commands, that has been executed to update files
This does not do any significant cleanup (but there are lots of icky code), only convert py2 to py3
Refs: #15006
Refs: #10562 (comment)