浏览代码

Merge branch 'release/v1.1.0'

Jérôme BUISINE 3 年之前
父节点
当前提交
12210dd28f
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 3 2
      docs/source/conf.py
  2. 1 1
      macop/__init__.py

+ 3 - 2
docs/source/conf.py

@@ -15,6 +15,7 @@
 import os
 import sys
 import asteroid_sphinx_theme
+import macop
 
 sys.path.insert(0, os.path.abspath('../../../macop'))
 
@@ -25,9 +26,9 @@ copyright = '2021, Jérôme BUISINE'
 author = 'Jérôme BUISINE'
 
 # The short X.Y version
-version = '1.0.16'
+version = version=macop.__version__
 # The full version, including alpha/beta/rc tags
-release = 'v1.0.16'
+release = version=macop.__version__
 
 
 # -- General configuration ---------------------------------------------------

+ 1 - 1
macop/__init__.py

@@ -28,4 +28,4 @@ from macop.solutions import discrete
 
 from macop.utils import progress
 
-__version__ = "v1.0.16"
+__version__ = "v1.1.0"