Merge pull request #30 from ds-wizard/develop

Release 3.0.0
ds-wizard · Jun 1, 2021 · 018feed · 018feed
2 parents 9b5c5d3 + 1f2dbce
commit 018feed
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/docs/admin/upgrade.rst b/docs/admin/upgrade.rst
@@ -43,6 +43,11 @@ Upgrade process
 
 Usually, nothing special is required for upgrade. Internal structure changes are migrated automatically using DB migrations and Metamodel migrations *(since 1.8.0)*. See below the changes that needs to be done by you *(since 1.10.0)*:
 
+2.14.X to 3.0.X
+----------------
+
+- All data must be migrated as we switched from MongoDB and RabbitMQ to PostgreSQL and S3. To support data migration, we provide `dsw2to3 tool <https://github.com/ds-wizard/dsw2to3>`_ with step-by-step instructions.
+
 2.13.X to 2.14.X
 ----------------
 
@@ -169,11 +174,13 @@ The DS Wizard is compatible with all recent versions of web browsers Chrome, Ope
 +------------------+--------------+--------------------+-----------+
 | DS Wizard        | KM Metamodel | Template Metamodel | Registry  | 
 +==================+==============+====================+===========+
-| 2.14.0           |            6 |                  3 |    2.14.0 |
+| 3.0.0            |            7 |                  3 |     3.0.0 |
++------------------+--------------+--------------------+-----------+
+| 2.14.0           |            7 |                  3 |    2.14.0 |
 +------------------+--------------+--------------------+-----------+
-| 2.13.0           |            6 |                  3 |    2.13.0 |
+| 2.13.0           |            7 |                  3 |    2.13.0 |
 +------------------+--------------+--------------------+-----------+
-| 2.12.0           |            5 |                  3 |    2.12.0 |
+| 2.12.0           |            6 |                  3 |    2.12.0 |
 +------------------+--------------+--------------------+-----------+
 | 2.11.0           |            5 |                  2 |    2.11.0 |
 +------------------+--------------+--------------------+-----------+

diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'DSW Team'
 
 # The full version, including alpha/beta/rc tags
-release = '2.14.0'
+release = '3.0.0'
 
 
 # -- General configuration ---------------------------------------------------
@@ -63,7 +63,7 @@
 }
 
 def setup(app):
-    app.add_stylesheet('style.css')
+    app.add_css_file('style.css')
 
     make_confval(app)
 

diff --git a/docs/dev/roadmap.rst b/docs/dev/roadmap.rst
@@ -9,20 +9,30 @@ Roadmap
 Planned
 =======
 
-3.0.0
+3.1.0
 -----
 
-- Release (expected): 1 June 2021
-- `Jira issues 3.0.0 <https://ds-wizard.atlassian.net/browse/DSW-1054?jql=project%20%3D%20DSW%20AND%20fixVersion%20%3D%203.0.0%20ORDER%20BY%20priority%20DESC>`_
+- Release (expected): 29 June 2021
+- `Jira issues 3.1.0 <https://ds-wizard.atlassian.net/browse/DSW-1091?jql=project%20%3D%20DSW%20AND%20fixVersion%20%3D%203.1.0%20ORDER%20BY%20priority%20DESC>`_
 - Key changes:
 
-   - Migration from MongoDB and RabbitMQ to PostgreSQL and S3
-   - Deep links feature
+   - Project templates
+   - Minor UI improvements
 
 
 Released
 ========
 
+3.0.0
+-----
+
+- Release: 1 June 2021
+- `Jira issues 3.0.0 <https://ds-wizard.atlassian.net/browse/DSW-1054?jql=project%20%3D%20DSW%20AND%20fixVersion%20%3D%203.0.0%20ORDER%20BY%20priority%20DESC>`_
+- Key changes:
+
+   - Migration from MongoDB and RabbitMQ to PostgreSQL and S3
+   - Deep links feature
+
 2.14.0
 ------
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -8,6 +8,8 @@ DS Wizard Documentation
 
 The `Data Stewardship Wizard <https://ds-wizard.org>`_ is an international project to help serious researchers and data stewards with building smart **Data Management Plans for FAIR Open Science**.
 
+This is a technical documentation covering configuration and advanced things. For user documentation, please visit `our guide <https://guide.ds-wizard.org>`_.
+
 .. image:: _static/process_overview.png
    :alt: Process of the DS Wizard
    :scale: 25%