Merge branch 'release/0.6'

vnmabus · Nov 3, 2021 · 6641a66 · 6641a66
2 parents c74c638 + 43c6d3a
commit 6641a66
Show file tree

Hide file tree

Showing 10 changed files with 501 additions and 307 deletions.
diff --git a/README.rst b/README.rst
@@ -103,9 +103,9 @@ Pandas `Categorical` objects:
 >>> converted = rdata.conversion.convert(parsed, new_dict)
 >>> converted
 {'test_dataframe':   class  value
-    0     b'a'      1
-    1     b'b'      2
-    2     b'b'      3}
+    1     b'a'      1
+    2     b'b'      2
+    3     b'b'      3}
 
 
 .. |build-status| image:: https://github.com/vnmabus/rdata/actions/workflows/main.yml/badge.svg?branch=master

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5
+0.6
diff --git a/docs/simpleusage.rst b/docs/simpleusage.rst
@@ -70,6 +70,6 @@ Pandas :class:`~pandas.Categorical` objects:
 >>> converted = rdata.conversion.convert(parsed, new_dict)
 >>> converted
 {'test_dataframe':   class  value
-    0     b'a'      1
-    1     b'b'      2
-    2     b'b'      3}
+    1     b'a'      1
+    2     b'b'      2
+    3     b'b'      3}
diff --git a/rdata/conversion/__init__.py b/rdata/conversion/__init__.py
@@ -1,8 +1,17 @@
-from ._conversion import (RExpression, RLanguage,
-                          convert_list, convert_attrs, convert_vector,
-                          convert_char, convert_symbol, convert_array,
-                          Converter, SimpleConverter,
-                          dataframe_constructor,
-                          factor_constructor,
-                          ts_constructor,
-                          DEFAULT_CLASS_MAP, convert)
+from ._conversion import (
+    DEFAULT_CLASS_MAP,
+    Converter,
+    RExpression,
+    RLanguage,
+    SimpleConverter,
+    convert,
+    convert_array,
+    convert_attrs,
+    convert_char,
+    convert_list,
+    convert_symbol,
+    convert_vector,
+    dataframe_constructor,
+    factor_constructor,
+    ts_constructor,
+)