Merge branch 'release/3.0'

doc/sphinx/source/conf.py

@@ -57,9 +57,9 @@ author = u'APS/SDM'
 # built documents.
 #
 # The short X.Y version.
-version = "dev"
+version = "3.0.0"
 # The full version, including alpha/beta/rc tags.
-release = "dev"
+release = "3.0.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

etc/dm.deploy.conf

@@ -14,5 +14,5 @@ DM_DAQ_WEB_SERVICE_URL=https://DM_HOSTNAME:33336
 DM_CAT_WEB_SERVICE_URL=https://DM_HOSTNAME:44436
 DM_PROC_WEB_SERVICE_URL=https://DM_HOSTNAME:55536
 DM_APS_DB_WEB_SERVICE_URL=https://DM_HOSTNAME:11236
-DM_SOFTWARE_VERSION=dev
+DM_SOFTWARE_VERSION=3.0.1
 

src/python/dm/__init__.py

@@ -40,5 +40,5 @@ from dm.aps_db_web_service.api.bssApsDbApi import BssApsDbApi
 from dm.aps_db_web_service.api.esafApsDbApi import EsafApsDbApi
 from dm.aps_db_web_service.api.serviceMonitorApsDbApi import ServiceMonitorApsDbApi
 
-__version__ = "dev"
+__version__ = "3.0.0"
 

tools/conda/etc/BUILD.conf

-EPICS_BASE_VERSION=7.0.2.2
+EPICS_BASE_VERSION=7.0.3
 SDDS_VERSION=4.1