Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cephfs-shell: use pkg_resources rather than packaging module #53710

Merged
merged 2 commits into from
Oct 20, 2023

Conversation

vshankar
Copy link
Contributor

Fixes: https://tracker.ceph.com/issues/62739

Follow up on #53529

Contribution Guidelines

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@vshankar vshankar added the cephfs Ceph File System label Sep 28, 2023
@vshankar vshankar requested a review from a team September 28, 2023 07:57
@vshankar vshankar requested a review from a team as a code owner September 28, 2023 07:57
Copy link
Member

@joscollin joscollin left a comment

Choose a reason for hiding this comment

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

There are other instances:

$ source vstart_environment.sh && source venv/bin/activate && python3 ../src/tools/cephfs/shell/cephfs-shell
Traceback (most recent call last):
File "/home/jcollin/workspace/ceph/build/../src/tools/cephfs/shell/cephfs-shell", line 1848, in
read_shell_conf(shell, get_shell_conffile_path(args.config))
File "/home/jcollin/workspace/ceph/build/../src/tools/cephfs/shell/cephfs-shell", line 1704, in read_shell_conf
if version.parse(cmd2_version) >= version.parse("0.10.0"):
^^^^^^^
NameError: name 'version' is not defined. Did you mean: 'Version'?

@vshankar
Copy link
Contributor Author

vshankar commented Oct 3, 2023

There are other instances:

$ source vstart_environment.sh && source venv/bin/activate && python3 ../src/tools/cephfs/shell/cephfs-shell
Traceback (most recent call last):
File "/home/jcollin/workspace/ceph/build/../src/tools/cephfs/shell/cephfs-shell", line 1848, in
read_shell_conf(shell, get_shell_conffile_path(args.config))
File "/home/jcollin/workspace/ceph/build/../src/tools/cephfs/shell/cephfs-shell", line 1704, in read_shell_conf
if version.parse(cmd2_version) >= version.parse("0.10.0"):
^^^^^^^
NameError: name 'version' is not defined. Did you mean: 'Version'?

oh, bother :/

sending a fix...

`pkg_resources` is already being used by other py scripts.

Fixes: https://tracker.ceph.com/issues/62739
Signed-off-by: Venky Shankar <vshankar@redhat.com>
Signed-off-by: Venky Shankar <vshankar@redhat.com>
@vshankar
Copy link
Contributor Author

jenkins test api

Copy link
Member

@joscollin joscollin left a comment

Choose a reason for hiding this comment

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

Looks good to me, though it's better move the doc changes to separate commit.

@vshankar
Copy link
Contributor Author

Looks good to me, though it's better move the doc changes to separate commit.

The doc change is a separate commit :)

@vshankar
Copy link
Contributor Author

jenkins test api

@vshankar
Copy link
Contributor Author

@vshankar vshankar merged commit 89b644d into ceph:main Oct 20, 2023
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cephfs Ceph File System documentation
Projects
None yet
2 participants