Merge pull request #966 from qstokkink/automated_version_update

Automated Version Update
Tribler · Feb 24, 2021 · 27f5d87 · 27f5d87
2 parents 76da077 + 0a07ce7
commit 27f5d87
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -6,6 +6,8 @@
 # full list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
 
+# pylint: disable=W0622
+
 # -- Path setup --------------------------------------------------------------
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -20,13 +22,13 @@
 # -- Project information -----------------------------------------------------
 
 project = u'IPv8'
-copyright = '2017-2020, Tribler'  # Do not change manually! Handled by github_increment_version.py
+copyright = '2017-2021, Tribler'  # Do not change manually! Handled by github_increment_version.py
 author = u'Tribler'
 
 # The short X.Y version
-version = '2.5'  # Do not change manually! Handled by github_increment_version.py
+version = '2.6'  # Do not change manually! Handled by github_increment_version.py
 # The full version, including alpha/beta/rc tags
-release = '2.5.0'  # Do not change manually! Handled by github_increment_version.py
+release = '2.6.0'  # Do not change manually! Handled by github_increment_version.py
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/ipv8/REST/rest_manager.py b/ipv8/REST/rest_manager.py
@@ -84,7 +84,7 @@ async def start(self, port=8085, host='127.0.0.1', api_key=None, ssl_context=Non
         aiohttp_apispec = AiohttpApiSpec(
             app=self.root_endpoint.app,
             title="IPv8 REST API documentation",
-            version="v2.5",  # Do not change manually! Handled by github_increment_version.py
+            version="v2.6",  # Do not change manually! Handled by github_increment_version.py
             url="/docs/swagger.json",
             swagger_path="/docs",
         )

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
     description='The Python implementation of the IPV8 library',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    version='2.5.0',  # Do not change manually! Handled by github_increment_version.py
+    version='2.6.0',  # Do not change manually! Handled by github_increment_version.py
     url='https://github.com/Tribler/py-ipv8',
     package_data={'': ['*.*']},
     packages=find_packages(),