Bump version: 2.3.0 → 2.3.1

wRAR · wRAR · commit 6057cac5103c · 2025-01-27T19:20:45.000+05:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.3.0
+current_version = 2.3.1
 commit = True
 tag = True
 tag_name = v{new_version}
diff --git a/NEWS b/NEWS
@@ -1,6 +1,11 @@
 w3lib release notes
 ===================
 
+2.3.1 (2025-01-27)
+------------------
+
+- Fix a merge error, no code changes.
+
 2.3.0 (2025-01-27)
 ------------------
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,7 +54,7 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = "2.3.0"
+release = "2.3.1"
 # The short X.Y version.
 version = ".".join(release.split(".")[:2])
 
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="w3lib",
-    version="2.3.0",
+    version="2.3.1",
     license="BSD",
     description="Library of web-related functions",
     long_description=long_description,
diff --git a/w3lib/__init__.py b/w3lib/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "2.3.0"
+__version__ = "2.3.1"
 version_info = tuple(int(v) if v.isdigit() else v for v in __version__.split("."))

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`# built documents.`
`55`	`55`	`#`
`56`	`56`	`# The full version, including alpha/beta/rc tags.`
`57`		`-release = "2.3.0"`
	`57`	`+release = "2.3.1"`
`58`	`58`	`# The short X.Y version.`
`59`	`59`	`version = ".".join(release.split(".")[:2])`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-__version__ = "2.3.0"`
	`1`	`+__version__ = "2.3.1"`
`2`	`2`	`version_info = tuple(int(v) if v.isdigit() else v for v in __version__.split("."))`