aiidateam / aiida_core / 4194

74%

push

travis-ci

Fix CifData and tcod exporters for python3 (#2092)

* select working pycifrw in setup requirements

select working version of PycCifRW for python2 and python3

* Explicitly setting the mode for tempfile.NamedTemporaryFile() calls to write text instead of bytes.

* rename _exportstring => _exportcontent

_exportstring should return bytes.
to reflect this, we are renaming it and updating its docstring

* fix 3 errors in db.cmdline.commands.data

errors were only converted to test failures
(the interactive part of the test is failing now)

* Using both Python 2 and Python 3 proof method to merge two dictionaries.

* fix regular exprs in cif_encode_contents

still to do: fix base64 conversion

* Decoding bytes to UTF-8 in one of CifData test cases.

* No need to encode the output of export_cif() as it is in bytes already.

* Change strings to bytes for python3 compatibility

Functions affected:
1) test_contents_encoding_1()
2) cif_encode_contents
3) encode_textfield_quoted_printable

* remove unnecessary imports

* Ceasing encode the output of export_cif() as it is in bytes already.

* fix test_collect_files test

* Explicitly marking strings as Unicode in Tcodexporter test case to make them runnable both on Python 2 and Python 3.

* Tcodexporter test case test_cmdline_parameters() works on Python 3 now.

* Fixing CIF production using PyCIFRW: strings of bytes have to be decoded to Unicode as PyCIFRW is not able to process bytes.

* Test test_export_trajectory() is no longer broken in Python 3.

* Test test_nwcpymatgen_translation() is no longer broken in Python 3.

* fix docs build

 + yapf fix

* Reformatting text affected by the recent changes in order to satisfy yapf.

* Sorting the search keywords before building the SQL query in order to produce more or less comparable output by CodImporter.

* Enable one test and skip 2, as they fixed solved:

1) test_cif_structure_roundtrip is solved with ... (continued)

86 of 86 new or added lines in 14 files covered. (100.0%)

25125 of 36620 relevant lines covered (68.61%)

2.36 hits per line