Merge branch 'release/2.11' into develop

* release/2.11: bump version
unicef · Feb 19, 2020 · 135bba6 · 135bba6
2 parents d26c07c + c1237d7
commit 135bba6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.11.0a0
+current_version = 2.11
 commit = False
 tag = False
 allow_dirty = True

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2.11
+----
+* fixes #18276 - Add `Achievement in reporting period` field to the prp/datareport endpoint
+
 2.10.1
 ------
 * use poetry instead of pipenv

diff --git a/docker/Makefile b/docker/Makefile
@@ -4,7 +4,7 @@ DATABASE_URL_ETOOLS?=
 DEVELOP?=1
 DOCKER_PASS?=
 DOCKER_USER?=
-TARGET?=2.11.0a
+TARGET?=2.11
 PUSH_BASE?=1
 BASE?=$(shell echo "${TARGET}" | sed "s/\([0-9]*\)\.\([0-9]*\)\.\(.*\)/\1.\2/g" )
 #BASE?=$(shell echo "${TARGET}" | sed "s/\([0-9]*\)\.\([0-9]*\)\.\(.*\)/\1.\2/g" | echo "`xargs`xx" )

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamart-core"
-version = "2.11.0a"
+version = "2.11"
 description = ""
 authors = ["sax <s.apostolico@gmail.com>"]
 

diff --git a/src/etools_datamart/__init__.py b/src/etools_datamart/__init__.py
@@ -1,8 +1,8 @@
 import warnings
 
 NAME = 'etools-datamart'
-VERSION = __version__ = '2.11.0a'
+VERSION = __version__ = '2.11'
 __author__ = ''
 
-# UserWarning: The psycopg2 wheel package will be renamed from release 2.11.0a;
+# UserWarning: The psycopg2 wheel package will be renamed from release 2.11;
 warnings.simplefilter("ignore", UserWarning, 144)