Skip to content

Conversation

@pehala
Copy link
Contributor

@pehala pehala commented Jan 21, 2025

Overview

  • Alternative to Introduce Poetry as build system #620
  • Migrate to using pyproject.toml
    • Keep setuptools as a build backend
  • Introduces UV for python & dependency management
  • First step to solving Release to PyPi #555
  • Add main() method to ccm script
    • Easier to refer to said method
  • Update workflows action versions
    • Solves deprecated warnings about node12
    • Unnecessary for this PR, I can extract it to a separate one if needed

Testing

@pehala pehala force-pushed the use_uv branch 4 times, most recently from 2f82e1d to 08f758a Compare January 27, 2025 15:30
@pehala pehala marked this pull request as ready for review January 27, 2025 16:01
@pehala
Copy link
Contributor Author

pehala commented Jan 27, 2025

@pehala pehala requested a review from fruch January 29, 2025 13:35
@fruch fruch changed the base branch from next to master March 10, 2025 17:23
Copy link
Contributor

@fruch fruch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pehala
Copy link
Contributor Author

pehala commented Apr 22, 2025

@fruch Rebased to the latest version, is there something else that needs to be done to get this merged?

@fruch fruch merged commit 18cacc5 into scylladb:master Apr 22, 2025
4 checks passed
@fruch
Copy link
Contributor

fruch commented Apr 22, 2025

@pehala

you'll now need to update the sub-module in dtest

@pehala
Copy link
Contributor Author

pehala commented Apr 22, 2025

@fruch One thing I apparently did here, is to change version from 2.0.5 to 0.1.0? Does it matter?

In dtest it can be update easily, but I am not sure if it wont affect more stuff

EDIT: I created #655 to revert it

@dkropachev
Copy link
Contributor

dkropachev commented Apr 23, 2025

We need to revert it, it broke ccm:

Download Scylla (2025.1.1) image        0s

Run rm -rf /tmp/download.ccm || true 
  rm -rf /tmp/download.ccm || true 
  mkdir /tmp/download.ccm || true
  ccm create ccm_1 -i 127.0.1. -n 3:0 -v "release:2025.1.1" --scylla --config-dir=/tmp/download.ccm
  rm -rf /tmp/download.ccm
  shell: /usr/bin/bash -e {0}
  env:
    JAVA_HOME: /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/8.0.442-6/x64
    JAVA_HOME_8_X64: /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/8.0.442-6/x64
    pythonLocation: /opt/hostedtoolcache/Python/3.11.12/x64
    PKG_CONFIG_PATH: /opt/hostedtoolcache/Python/3.11.12/x64/lib/pkgconfig
    Python_ROOT_DIR: /opt/hostedtoolcache/Python/3.11.12/x64
    Python2_ROOT_DIR: /opt/hostedtoolcache/Python/3.11.12/x64
    Python3_ROOT_DIR: /opt/hostedtoolcache/Python/3.11.12/x64
    LD_LIBRARY_PATH: /opt/hostedtoolcache/Python/3.11.12/x64/lib
Traceback (most recent call last):
  File "/opt/hostedtoolcache/Python/3.11.12/x64/bin/ccm", line 5, in <module>
    from ccm import main
ModuleNotFoundError: No module named 'ccm'
Error: Process completed with exit code 1.

Only one example: scylladb/java-driver#526

@pehala
Copy link
Contributor Author

pehala commented Apr 23, 2025

Could it be caused by rhe changed version, or do you believe there is a bigger problem here?

@pehala
Copy link
Contributor Author

pehala commented Apr 23, 2025

We need to revert it, it broke ccm:

Download Scylla (2025.1.1) image        0s

Run rm -rf /tmp/download.ccm || true 
  rm -rf /tmp/download.ccm || true 
  mkdir /tmp/download.ccm || true
  ccm create ccm_1 -i 127.0.1. -n 3:0 -v "release:2025.1.1" --scylla --config-dir=/tmp/download.ccm
  rm -rf /tmp/download.ccm
  shell: /usr/bin/bash -e {0}
  env:
    JAVA_HOME: /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/8.0.442-6/x64
    JAVA_HOME_8_X64: /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/8.0.442-6/x64
    pythonLocation: /opt/hostedtoolcache/Python/3.11.12/x64
    PKG_CONFIG_PATH: /opt/hostedtoolcache/Python/3.11.12/x64/lib/pkgconfig
    Python_ROOT_DIR: /opt/hostedtoolcache/Python/3.11.12/x64
    Python2_ROOT_DIR: /opt/hostedtoolcache/Python/3.11.12/x64
    Python3_ROOT_DIR: /opt/hostedtoolcache/Python/3.11.12/x64
    LD_LIBRARY_PATH: /opt/hostedtoolcache/Python/3.11.12/x64/lib
Traceback (most recent call last):
  File "/opt/hostedtoolcache/Python/3.11.12/x64/bin/ccm", line 5, in <module>
    from ccm import main
ModuleNotFoundError: No module named 'ccm'
Error: Process completed with exit code 1.

Only one example: scylladb/java-driver#526

I found the root cause, it was incorrect script path specified. I added it to the version fix PR: #655 Could you try if it fixed your problems?

@fruch
Copy link
Contributor

fruch commented Apr 23, 2025

I can confirm it work, like the following

uv python install 3.11

uv venv -p 3.11 ~/ttt
source ~/ttt/bin/activate
python -m pip install https://github.com/pehala/scylla-ccm/archive/refs/heads/change-version.zip
ccm --help

with master version the ccm call was broken

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants