Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
saxix committed Sep 19, 2019
1 parent 7f64bac commit 742f286
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.2.0a
current_version = 2.2
commit = False
tag = False
allow_dirty = True
Expand Down
8 changes: 5 additions & 3 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
2.2 (dev)
---------
*
2.2
---
* fixes InterventionBudgetLoader
* admin improvements
* improves indexing

2.1
---
Expand Down
16 changes: 8 additions & 8 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DATABASE_URL_ETOOLS?=
DEVELOP?=1
DOCKER_PASS?=
DOCKER_USER?=
TARGET?=2.2.0a
TARGET?=2.2
BASE=2.0
# below vars are used internally
BUILD_OPTIONS?=--squash
Expand All @@ -18,7 +18,7 @@ DOCKERFILE?=Dockerfile
RUN_OPTIONS?=
PIPENV_ARGS?=
PORTS=
ABSOLUTE_BASE_URL?="http://192.2.0a68.66.66:8000"
ABSOLUTE_BASE_URL?="http://192.268.66.66:8000"

help:
@echo "dev build dev image (based on local code)"
Expand Down Expand Up @@ -71,12 +71,12 @@ build_old:
cd .. && docker run \
--rm \
-e ABSOLUTE_BASE_URL=${ABSOLUTE_BASE_URL} \
-e CACHE_URL=redis://192.2.0a68.66.66:6379/1 \
-e CACHE_URL_API=redis://192.2.0a68.66.66:6379/2 \
-e CACHE_URL_LOCK=redis://192.2.0a68.66.66:6379/3 \
-e CACHE_URL_TEMPLATE=redis://192.2.0a68.66.66:6379/4 \
-e CELERY_BROKER_URL=redis://192.2.0a68.66.66:6379/2 \
-e CELERY_RESULT_BACKEND=redis://192.2.0a68.66.66:6379/3 \
-e CACHE_URL=redis://192.268.66.66:6379/1 \
-e CACHE_URL_API=redis://192.268.66.66:6379/2 \
-e CACHE_URL_LOCK=redis://192.268.66.66:6379/3 \
-e CACHE_URL_TEMPLATE=redis://192.268.66.66:6379/4 \
-e CELERY_BROKER_URL=redis://192.268.66.66:6379/2 \
-e CELERY_RESULT_BACKEND=redis://192.268.66.66:6379/3 \
-e CSRF_COOKIE_SECURE=false \
-e DATABASE_URL=${DATABASE_URL} \
-e DATABASE_URL_ETOOLS=${DATABASE_URL_ETOOLS} \
Expand Down
2 changes: 1 addition & 1 deletion src/etools_datamart/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import warnings

NAME = 'etools-datamart'
VERSION = __version__ = '2.2.0a'
VERSION = __version__ = '2.2'
__author__ = ''

# UserWarning: The psycopg2 wheel package will be renamed from release 2.8;
Expand Down

0 comments on commit 742f286

Please sign in to comment.