Merge pull request #289 from i18n-now/master

fix cmd conflict
oceanbase · Jul 3, 2024 · 429c38a · 429c38a
2 parents 1681921 + ba9a8fa
commit 429c38a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/main.py b/main.py
@@ -16,7 +16,7 @@
 """
 
 import sys
-from cmd import MainCommand
+from obcmd import MainCommand
 from stdio import IO
 
 ROOT_IO = IO(1)

diff --git a/cmd.py → obcmd.py b/cmd.py → obcmd.py
diff --git a/requirements3.txt b/requirements3.txt
@@ -19,7 +19,7 @@ tabulate==0.8.9
 zstandard==0.17.0
 pycryptodome~=3.14.1
 pick==1.2.0
-PyYAML==6.0
+PyYAML==6.0.2rc1
 prettytable==3.5.0
 oyaml==1.0
 xmltodict==0.13.0
@@ -34,4 +34,4 @@ ruamel.yaml==0.17.4
 progressbar==2.5
 halo==0.0.31
 inspect2==0.1.2
-netifaces==0.11.0
+netifaces==0.11.0