From 967f1cb775241a659ea87f75589940f1c1c4a154 Mon Sep 17 00:00:00 2001 From: Josh Zamor Date: Thu, 30 Mar 2017 15:17:09 -0700 Subject: [PATCH] Releasing 3.0.1 * bump requisition to 3.1.1 and remove SM * update api links for release * update collect docs for 3.0.1 * Update ERD links for release For v3.0.1. Remove stock management. * bump ref ui to 4.0.0 * remove auth erd live link * remove fulfillment erd live link * remove reference data erd live link * remove requisition erd live link --- docker-compose.yml | 14 ++---------- docs/source/api/index.rst | 30 +++++-------------------- docs/source/collect-docs.py | 9 ++++---- docs/source/erd/erd-auth.rst | 3 +-- docs/source/erd/erd-fulfillment.rst | 3 +-- docs/source/erd/erd-referencedata.rst | 3 +-- docs/source/erd/erd-requisition.rst | 3 +-- docs/source/erd/erd-stockmanagement.rst | 8 ------- docs/source/erd/index.rst | 1 - 9 files changed, 15 insertions(+), 59 deletions(-) delete mode 100644 docs/source/erd/erd-stockmanagement.rst diff --git a/docker-compose.yml b/docker-compose.yml index 7a370ce2..6c84c449 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,12 +23,12 @@ services: depends_on: [consul] reference-ui: - image: openlmis/reference-ui:4.0.0-SNAPSHOT + image: openlmis/reference-ui:4.0.0 env_file: .env depends_on: [consul] requisition: - image: openlmis/requisition:3.1.2-SNAPSHOT + image: openlmis/requisition:3.1.1 env_file: .env environment: JAVA_OPTS: '-Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data' @@ -77,16 +77,6 @@ services: - 'service-config:/config' depends_on: [log] - stockmanagement: - image: openlmis/stockmanagement:1.0.0-BETA-SNAPSHOT - env_file: .env - environment: - JAVA_OPTS: '-Dlogging.config=/config/log/logback.xml -Dspring.jpa.properties.hibernate.hbm2ddl.import_files=/bootstrap.sql,file:///demo-data/data.sql' - spring_profiles_active: ${spring_profiles_active} - volumes: - - 'service-config:/config' - depends_on: [log] - db: image: openlmis/postgres:9.4 env_file: .env diff --git a/docs/source/api/index.rst b/docs/source/api/index.rst index de256bce..e230af93 100644 --- a/docs/source/api/index.rst +++ b/docs/source/api/index.rst @@ -7,9 +7,7 @@ Auth Service Security credentials, Authentication and Authorization. Uses OAuth2. -`Live Documentation for Auth API `_ - -`Static Documentation for Auth API `_ +`Static Documentation for Auth API `_ ********************** Reference Data Service @@ -17,9 +15,7 @@ Reference Data Service Provides the reference data for the rest of the processes: facilities, programs, products, etc. -`Live Documentation for Reference Data API `_ - -`Static Documentation for Reference Data API `_ +`Static Documentation for Reference Data API `_ ******************* Requisition Service @@ -27,9 +23,7 @@ Requisition Service Requisition (pull) based replenishment process. -`Live Documentation for Requisition API `_ - -`Static Documentation for Requisition API `_ +`Static Documentation for Requisition API `_ ******************* Fulfillment Service @@ -37,9 +31,7 @@ Fulfillment Service Includes the basics of fulfillment. -`Live Documentation for Fulfillment API `_ - -`Static Documentation for Fulfillment API `_ +`Static Documentation for Fulfillment API `_ ******************** Notification Service @@ -47,16 +39,4 @@ Notification Service Notifying users when their attention is needed. -`Live Documentation for Notification API `_ - -`Static Documentation for Notification API `_ - -******************** -Stock Management Service -******************** - -Electronic stock cards. - -`Live Documentation for Stock Management API `_ - -`Static Documentation for Stock Management API `_ +`Static Documentation for Notification API `_ diff --git a/docs/source/collect-docs.py b/docs/source/collect-docs.py index 522eea2c..5851a34f 100644 --- a/docs/source/collect-docs.py +++ b/docs/source/collect-docs.py @@ -1,10 +1,9 @@ import urllib -urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-fulfillment/master/README.md", "developer-docs/fulfillment.md") -urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-requisition/master/README.md", "developer-docs/requisition.md") -urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth/master/README.md", "developer-docs/auth.md") -urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-referencedata/master/README.md", "developer-docs/referencedata.md") -urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-stockmanagement/master/README.md", "developer-docs/stockmanagement.md") +urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-fulfillment/v3.0.1/README.md", "developer-docs/fulfillment.md") +urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-requisition/v3.1.1/README.md", "developer-docs/requisition.md") +urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth/v3.0.1/README.md", "developer-docs/auth.md") +urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-referencedata/v4.0.0/README.md", "developer-docs/referencedata.md") urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/README.md", "developer-docs/templateService.md") urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-reference-ui/master/README.md", "developer-docs/refereceUI.md") urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/STYLE-GUIDE.md", "developer-docs/codeStyleguide.md") diff --git a/docs/source/erd/erd-auth.rst b/docs/source/erd/erd-auth.rst index 6f624e4d..391830f6 100644 --- a/docs/source/erd/erd-auth.rst +++ b/docs/source/erd/erd-auth.rst @@ -4,5 +4,4 @@ Auth ERD ERD schema of Auth service: -* `Live ERD `_ -* `Zip ERD `_ +* `Zip ERD `_ diff --git a/docs/source/erd/erd-fulfillment.rst b/docs/source/erd/erd-fulfillment.rst index 945ba6d6..e1b52b5d 100644 --- a/docs/source/erd/erd-fulfillment.rst +++ b/docs/source/erd/erd-fulfillment.rst @@ -4,5 +4,4 @@ Fulfillment ERD ERD schema of Fulfillment service: -* `Live ERD `_ -* `Zip ERD `_ +* `Zip ERD `_ diff --git a/docs/source/erd/erd-referencedata.rst b/docs/source/erd/erd-referencedata.rst index 787c942f..c0ab67fe 100644 --- a/docs/source/erd/erd-referencedata.rst +++ b/docs/source/erd/erd-referencedata.rst @@ -4,8 +4,7 @@ Reference Data ERD ERD schema of Reference Data service: -* `Live ERD `_ -* `Zip ERD `_ +* `Zip ERD `_ diff --git a/docs/source/erd/erd-requisition.rst b/docs/source/erd/erd-requisition.rst index adb20ef9..7a2d768a 100644 --- a/docs/source/erd/erd-requisition.rst +++ b/docs/source/erd/erd-requisition.rst @@ -4,8 +4,7 @@ Requisition ERD ERD schema of Requisition service: -* `Live ERD `_ -* `Zip ERD `_ +* `Zip ERD `_ diff --git a/docs/source/erd/erd-stockmanagement.rst b/docs/source/erd/erd-stockmanagement.rst deleted file mode 100644 index 6b620e34..00000000 --- a/docs/source/erd/erd-stockmanagement.rst +++ /dev/null @@ -1,8 +0,0 @@ -=============== -Stock Management ERD -=============== - -ERD schema of Stock Management service: - -* `Live ERD `_ -* `Zip ERD `_ diff --git a/docs/source/erd/index.rst b/docs/source/erd/index.rst index 15e59f1b..b8e51af2 100644 --- a/docs/source/erd/index.rst +++ b/docs/source/erd/index.rst @@ -11,4 +11,3 @@ Generated OpenLMIS v3 ERD. erd-requisition erd-fulfillment erd-auth - erd-stockmanagement