Merge pull request #59 from digital-asset/version-bump

Version bump

Makefile

@@ -1,15 +1,16 @@
 DIT_NAME=$(shell ddit targetname)
 BASENAME=$(shell ddit targetname --basename)
 VERSION=$(shell ddit ditversion)
+BOT_VERSION=$(shell ddit ditversion | sed "s/-rc./rc/")
 
 NAME=${BASENAME}-${VERSION}
 
 PKG_FILES=$(shell find pkg -type f)
 
 PYTHON := pipenv run python
 
-operator_bot := target/daml-chat-operator-bot-$(VERSION).tar.gz
-user_bot := target/daml-chat-user-bot-$(VERSION).tar.gz
+operator_bot := target/daml-chat-operator-bot-$(BOT_VERSION).tar.gz
+user_bot := target/daml-chat-user-bot-$(BOT_VERSION).tar.gz
 ui := target/daml-chat-ui-$(VERSION).zip
 
 .PHONY: all package publish
@@ -29,17 +30,17 @@ target:
 	mkdir $@
 
 $(operator_bot):
-	cd python/operator && DDIT_VERSION=$(VERSION) $(PYTHON) setup.py sdist
+	cd python/operator && BOT_VERSION=$(BOT_VERSION) $(PYTHON) setup.py sdist
 	rm -fr python/operator/daml_chat_operator_bot.egg-info
 	mkdir -p $(@D)
-	mv python/operator/dist/daml-chat-operator-bot-$(VERSION).tar.gz $@
+	mv python/operator/dist/daml-chat-operator-bot-$(BOT_VERSION).tar.gz $@
 	rm -r python/operator/dist
 
 $(user_bot):
-	cd python/user && DDIT_VERSION=$(VERSION) $(PYTHON) setup.py sdist
+	cd python/user && BOT_VERSION=$(BOT_VERSION) $(PYTHON) setup.py sdist
 	rm -fr python/user/daml_chat_user_bot.egg-info
 	mkdir -p $(@D)
-	mv python/user/dist/daml-chat-user-bot-$(VERSION).tar.gz $@
+	mv python/user/dist/daml-chat-user-bot-$(BOT_VERSION).tar.gz $@
 	rm -r python/user/dist
 
 $(ui): $(user_bot)

dabl-meta.yaml

@@ -1,10 +1,10 @@
 catalog:
   name: daml-chat
-  version: 0.2.3
+  version: 2.0.0-rc.1
   short_description: Daml Chat
   description: A straightforward web chat app.
   author: Digital Asset (Switzerland) GmbH
   source_url: https://github.com/digital-asset/dablchat
   license: Apache-2.0
-  tags: [dabl-sample-app, application]
+  tags: [dabl-sample-app, application, experimental]
   icon_file: dabl-chat.png

package.json

@@ -1,6 +1,6 @@
 {
   "name": "daml-chat",
-  "version": "1.8.5",
+  "version": "2.0.0-rc.1",
   "private": true,
   "dependencies": {
     "@webscopeio/react-textarea-autocomplete": "^4.6.1",

python/operator/setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup
 
 setup(name='daml-chat-operator-bot',
-      version=os.environ.get('DDIT_VERSION', 'release'),
+      version=os.environ.get('BOT_VERSION', 'release'),
       description='Daml Chat Operator',
       author='Digital Asset',
       license='Apache2',

python/user/setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup
 
 setup(name='daml-chat-user-bot',
-      version=os.environ.get('DDIT_VERSION', 'release'),
+      version=os.environ.get('BOT_VERSION', 'release'),
       description='Daml Chat User',
       author='Digital Asset',
       license='Apache2',