Просмотр исходного кода

Merge branch '2.0.0'

# Conflicts:
#	setup.py
Alec Nikolas Reiter 6 лет назад
Родитель
Сommit
3240220f70
5 измененных файлов с 14 добавлено и 6 удалено
  1. 3 1
      .bumpversion.cfg
  2. 7 1
      CHANGES
  3. 2 2
      docs/conf.py
  4. 1 1
      flaskbb/__init__.py
  5. 1 1
      setup.py

+ 3 - 1
.bumpversion.cfg

@@ -1,9 +1,11 @@
 [bumpversion]
-current_version = 2.0.1
+current_version = 2.0.2
 commit = True
 tag = True
 
 [bumpversion:file:setup.py]
+search = version="{current_version}"
+replace = version="{new_version}"
 
 [bumpversion:file:flaskbb/__init__.py]
 

+ 7 - 1
CHANGES

@@ -3,11 +3,17 @@ Changelog
 
 Here you can see the full list of changes between each release.
 
+Version 2.0.2
+-------------
+
+Released July 15th, 2018
+
+* Fix issue with declaring log config file path
 
 Version 2.0.1
 -------------
 
-Releases June 21st, 2018
+Released June 21st, 2018
 
 * Fix issue where activation tokens would fail with an exception
 

+ 2 - 2
docs/conf.py

@@ -60,9 +60,9 @@ author = u'Peter Justin'
 # built documents.
 #
 # The short X.Y version.
-version = u'2.0.1'
+version = u'2.0.2'
 # The full version, including alpha/beta/rc tags.
-release = u'2.0.1'
+release = u'2.0.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

+ 1 - 1
flaskbb/__init__.py

@@ -9,7 +9,7 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 
 import logging
 

+ 1 - 1
setup.py

@@ -100,7 +100,7 @@ tests_require = ["py", "pytest", "pytest-cov", "cov-core", "coverage"]
 
 setup(
     name="FlaskBB",
-    version="2.0.1",
+    version="2.0.2",
     url="https://flaskbb.org",
     project_urls={
         "Documentation": "https://flaskbb.readthedocs.io/en/latest/",