integrate simple changes without conflict

cloudmesh · Dec 26, 2023 · d0b5fe4 · d0b5fe4
1 parent dba5d61
commit d0b5fe4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@
     this program modifies the following files.
 
     It reads the VERSION form the ./VERSION file
-    the number is of the form MAYOR.MINOR.PATCH
+    the number is of the form MAJOR.MINOR.PATCH
     It increase the specified number
     It writes the number to the files
     ./VERSION

diff --git a/pyproject.toml b/pyproject.toml
@@ -50,6 +50,8 @@ classifiers = [
 
 dependencies = [
     "toml",
+    "pyyaml",
+    "docopt"
 ]
 
 [project.urls]
@@ -61,7 +63,7 @@ Changelog = "https://github.com/cloudmesh/cloudmesh-bumpversion/blob/main/CHANGE
 
 [tool.setuptools.packages.find]
 where = ["src"]
-# include = ["bumpversion", "cloudmesh.bumpversion.*"]
+include = ["bumpversion", "bumpversion.*"]
 
 [project.scripts]
 bumpversion = "bumpversion.bumpversion_command:main"
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,3 @@
-toml
+toml
+pyyaml
+docopt
diff --git a/src/bumpversion/bumpversion_command.py b/src/bumpversion/bumpversion_command.py
@@ -22,7 +22,7 @@
     this program modifies the following files.
 
     It reads the VERSION form the ./VERSION file
-    the number is of the form MAYOR.MINOR.PATCH
+    the number is of the form MAJOR.MINOR.PATCH
     It increase the specified number
     It writes the number to the files
     ./VERSION
-Original file line number
+Diff line change
@@ -1 +1,3 @@
-    toml
+    toml
+    pyyaml
+    docopt