Merge branch 'branch-0.18' into fp-rolling-row-number

cpp/src/io/csv/writer_impl.cu

@@ -311,19 +311,15 @@ struct column_to_strings_fn {
     }();
 
     // handle the cases where delimiter / line-terminator can be
-    // "-" or ":", in which case they are to be dropped from the format:
+    // "-" or ":", in which case we need to add quotes to the format
     //
     std::string delimiter{options_.get_inter_column_delimiter()};
     std::string newline{options_.get_line_terminator()};
 
     constexpr char const* dash{"-"};
     constexpr char const* colon{":"};
-    if (delimiter == dash || newline == dash) {
-      format.erase(std::remove(format.begin(), format.end(), dash[0]), format.end());
-    }
-
-    if (delimiter == colon || newline == colon) {
-      format.erase(std::remove(format.begin(), format.end(), colon[0]), format.end());
+    if (delimiter == dash || newline == dash || delimiter == colon || newline == colon) {
+      format = "\"" + format + "\"";
     }
 
     auto conv_col_ptr = cudf::strings::from_timestamps(column, format, mr_);

python/cudf/cudf/io/csv.py

@@ -136,18 +136,6 @@ def to_csv(
                 "Dataframe doesn't have the labels provided in columns"
             )
 
-    if sep == "-":
-        # TODO: Remove this error once following issue is fixed:
-        # https://github.com/rapidsai/cudf/issues/6699
-        if any(
-            isinstance(col, cudf.core.column.DatetimeColumn)
-            for col in df._data.columns
-        ):
-            raise ValueError(
-                "sep cannot be '-' when writing a datetime64 dtype to csv, "
-                "refer to: https://github.com/rapidsai/cudf/issues/6699"
-            )
-
     # TODO: Need to typecast categorical columns to the underlying
     # categories dtype to write the actual data to csv. Remove this
     # workaround once following issue is fixed:

python/cudf/cudf/tests/test_csv.py

@@ -1905,21 +1905,14 @@ def test_csv_reader_category_error():
         cudf.read_csv(StringIO(csv_buf), dtype="category")
 
 
-def test_csv_writer_datetime_sep_error():
-    # TODO: Remove this test once following
-    # issues is fixed: https://github.com/rapidsai/cudf/issues/6699
+def test_csv_writer_datetime_sep():
     df = cudf.DataFrame(
         {"a": cudf.Series([22343, 2323423, 234324234], dtype="datetime64[ns]")}
     )
-
-    with pytest.raises(
-        ValueError,
-        match=re.escape(
-            "sep cannot be '-' when writing a datetime64 dtype to csv, "
-            "refer to: https://github.com/rapidsai/cudf/issues/6699"
-        ),
-    ):
-        df.to_csv(sep="-")
+    df["a"] = df["a"].astype("datetime64[s]")
+    expected = df.to_pandas().to_csv(date_format="%Y-%m-%dT%H:%M:%SZ", sep="-")
+    actual = df.to_csv(sep="-")
+    assert expected == actual
 
 
 def test_na_filter_empty_fields():