Merge branch 'release/v0.5.1'

mordred-descriptor · Sep 3, 2017 · 873a230 · 873a230
2 parents 590fd85 + 21247fe
commit 873a230
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -0,0 +1,8 @@
+{
+    "license": "BSD3",
+    "creators": [
+        {
+            "name": "Hirotomo Moriwaki"
+        }
+    ]
+}
diff --git a/README.rst b/README.rst
@@ -186,6 +186,7 @@ Documentation
 -  `master <http://mordred-descriptor.github.io/documentation/master>`__
 -  `develop <http://mordred-descriptor.github.io/documentation/develop>`__
 
+-  `v0.5.1 <http://mordred-descriptor.github.io/documentation/v0.5.1>`__
 -  `v0.5.0 <http://mordred-descriptor.github.io/documentation/v0.5.0>`__
 -  `v0.4.1 <http://mordred-descriptor.github.io/documentation/v0.4.1>`__
 -  `v0.4.0 <http://mordred-descriptor.github.io/documentation/v0.4.0>`__

diff --git a/mordred/RingCount.py b/mordred/RingCount.py
@@ -79,10 +79,18 @@ def description(self):
         else:
             o = "{}-membered ".format(self._order)
 
-        return "{}{}{}ring count".format(
+        if self._aromatic is None:
+            a = ""
+        elif self._aromatic is True:
+            a = "aromatic "
+        else:
+            a = "aliphatic "
+
+        return "{}{}{}{}ring count".format(
             o,
+            a,
             "fused " if self._fused else "",
-            "aromatic " if self._aromatic else "",
+            "hetero " if self._hetero else "",
         )
 
     @classmethod

diff --git a/mordred/_version.txt b/mordred/_version.txt
@@ -1 +1 @@
-0.5.0
+0.5.1