change version from tuple to string, update version using bumpversion…

… ext
jasonrbriggs · Mar 11, 2023 · acea1bb · acea1bb
1 parent 47fa67c
commit acea1bb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -18,10 +18,6 @@ docs:
 	cd docs && make html
 
 
-updateversion:
-	sed -i "s/__version__\s*=.*/__version__ = \($(VERSION)\)/g" stomp/__init__.py
-
-
 install: updateversion test
 	poetry update
 	poetry build

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -61,7 +61,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '.'.join(map(str, stomp.__version__))
+version = stomp.__version__
 # The full version, including alpha/beta/rc tags.
 release = version + ''
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "stomp.py"
-version = "8.1.0"
+version = "8.1.1"
 description = "Python STOMP client, supporting versions 1.0, 1.1 and 1.2 of the protocol"
 authors = ["Jason R Briggs <jasonrbriggs@gmail.com>"]
 license = "Apache-2.0"
@@ -33,6 +33,8 @@ pytest-ordering = ">=0.6"
 [tool.poetry.scripts]
 stomp = "stomp.__main__:main"
 
+[tool.poetry_bumpversion.file."stomp/__init__.py"]
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"
diff --git a/stomp/__init__.py b/stomp/__init__.py
@@ -14,7 +14,7 @@
 import stomp.listener as listener
 import stomp.logging as logging
 
-__version__ = (8, 1, 0)
+__version__ = "8.1.1"
 
 ##
 # Alias for STOMP 1.0 connections.

diff --git a/stomp/__main__.py b/stomp/__main__.py
@@ -49,8 +49,6 @@
 sys.path.append(".")
 import stomp
 
-version_string = "%s.%s.%s" % stomp.__version__
-
 heartbeat_pattern = re.compile(r"[0-9]+,[0-9]+")
 
 
@@ -370,7 +368,7 @@ def help_sendfile(self):
 
     def do_version(self, args):
         self.__sysout("%s%s [Protocol version %s]%s" %
-                      (stomp.colours.BOLD, version_string, self.conn.version, stomp.colours.NO_COLOUR))
+                      (stomp.colours.BOLD, stomp.version, self.conn.version, stomp.colours.NO_COLOUR))
     do_ver = do_version
 
     def help_version(self):