Python3 support for restapi #2117

waychal · 2018-10-25T14:42:35Z

No description provided.

select working version of PycCifRW for python2 and python3

…o write text instead of bytes.

…o cif_fixes

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

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

…o cif_fixes

still to do: fix base64 conversion

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

…ke them runnable both on Python 2 and Python 3.

giovannipizzi

Also try to reduce the number of exclusions when possible, thanks!

giovannipizzi · 2018-10-25T15:31:24Z

aiida/restapi/resources.py

-            id=id,
-            query_string=request.query_string,
+            id=node_id,
+            query_string=query_string,


Before it was unquoted. Was it wrong before or now? Note there is another place in the code which has a similar pattern, good to check what is done there.

Unquoted and quoted query string in response object both works in same way.

coveralls · 2018-10-25T16:19:04Z

Coverage decreased (-7.7%) to 60.888% when pulling 85308fb on waychal:python3_restapi into 9cceedb on aiidateam:develop.

coveralls · 2018-10-25T16:19:04Z

Coverage increased (+7.7%) to 68.622% when pulling de993a0 on waychal:python3_restapi into 0f8721a on aiidateam:develop.

dev-zero

there is one common anti-pattern here:

def func(something=None):
  if something is None:
    something = "some default value"
  pass

where I would do instead:

def func(something="some default value"):
  pass

dev-zero · 2018-10-26T13:38:29Z

aiida/restapi/common/utils.py

-            for k, v in headers.items():
-                response.headers[k] = v
+            for key, val in headers.items():
+                response.headers[key] = val


for next time, possibly use respone.headers.update(headers) as a shorthand

Here response.header is not a type of dict so we can not directly update it with another dictionary.

dev-zero · 2018-10-26T13:47:23Z

aiida/restapi/translator/data/structure.py


    @staticmethod
-    def get_visualization_data(node, format=None):
+    def get_visualization_data(node, visformat=None):


why not put visformat="xsf" here directly? then its clear by looking at the signature of the function what the default is

dev-zero · 2018-10-26T13:48:00Z

aiida/restapi/translator/data/structure.py

    @staticmethod
-    def get_downloadable_data(node, format=None):
+    def get_downloadable_data(node, download_format=None):


... same here

… into python3_restapi

giovannipizzi · 2018-10-26T16:30:34Z

This fixes #2086

ltalirz and others added 30 commits October 23, 2018 10:50

select working pycifrw in setup requirements

57906c3

select working version of PycCifRW for python2 and python3

Merge branch 'develop' into cif_fixes

7b6517c

Explicitly setting the mode for tempfile.NamedTemporaryFile() calls t…

f80ddec

…o write text instead of bytes.

Merge branch 'cif_fixes' of https://github.com/ltalirz/aiida_core int…

a4c7fb9

…o cif_fixes

rename _exportstring => _exportcontent

f3f789f

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

fix 3 errors in db.cmdline.commands.data

6c4d4f4

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.

8557c57

Merge branch 'cif_fixes' of https://github.com/ltalirz/aiida_core int…

db83723

…o cif_fixes

fix regular exprs in cif_encode_contents

c979179

still to do: fix base64 conversion

Merge branch 'cif_fixes' of github.com:ltalirz/aiida_core into cif_fixes

b2deed9

Merge branch 'develop' into cif_fixes

ec5ccc2

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

839cfe7

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

a710c7d

Change strings to bytes for python3 compatibility

f899303

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

Merge branch 'cif_fixes' of github.com:ltalirz/aiida_core into cif_fixes

1ecfcea

remove unnecessary imports

3b475e5

Merge branch 'cif_fixes' of github.com:ltalirz/aiida_core into cif_fixes

f0aa0d1

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

729fef1

fix test_collect_files test

c14648c

Merge branch 'cif_fixes' of github.com:ltalirz/aiida_core into cif_fixes

7abccb4

Explicitly marking strings as Unicode in Tcodexporter test case to ma…

9351f12

…ke them runnable both on Python 2 and Python 3.

fixes to make restapi compatible with python3

f2d3e0d

Merge branch 'cif_fix' into python3_restapi

6725cc5

enabled rest api tests

2d33a5e

updated rest api tests

e836ba7

removed unused import

8f1ab03

updated pre-commit

0b87d69

Updated files to run prospector for restapi data translators

4315fb8

Added calculation translator file in pre-commit hook

f004bbf

Added code, computer, group and user rest translators for prospectors

688632e

Snehal Kumbhar added 10 commits October 24, 2018 16:44

Added more files from rest api for prospector

2677601

files updated by yapf

a4c66a8

Merge branch 'develop' into python3_restapi

ceadc75

Updated and included all rest api translator files in pre-commit

a0ac363

Added all rest api files for pre-commit

9425730

added rest api tests file to process in pre-commit

0ce7f0d

Merge branch 'develop' into python3_restapi

c3dd652

docs fix

8ae6599

small fix

f2b4020

Merge branch 'develop' into python3_restapi

85308fb

giovannipizzi requested changes Oct 25, 2018

View reviewed changes

Snehal Kumbhar added 6 commits October 26, 2018 11:49

Fixed merge of aiida/backends/tests/tcodexporter.py

fb70d6c

Fixed some prospectos in rest api

5c08a70

Merge branch 'develop' into python3_restapi

49ddfc0

small fix

e4e96d5

small fix again

e493c47

Fix for datetime.tzinfo.utcoffset

49bb2aa

dev-zero previously approved these changes Oct 26, 2018

View reviewed changes

dev-zero and others added 4 commits October 26, 2018 15:53

Merge branch 'develop' into python3_restapi

94d97be

Merge branch 'develop' into python3_restapi

b5348b2

small changes

ac2cf77

Merge branch 'python3_restapi' of https://github.com/waychal/aiida_core…

de993a0

… into python3_restapi

waychal dismissed dev-zero’s stale review via de993a0 October 26, 2018 15:41

giovannipizzi approved these changes Oct 26, 2018

View reviewed changes

giovannipizzi merged commit d8fca45 into aiidateam:develop Oct 26, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Python3 support for restapi #2117

Python3 support for restapi #2117

waychal commented Oct 25, 2018

giovannipizzi left a comment

giovannipizzi Oct 25, 2018

waychal Oct 26, 2018

coveralls commented Oct 25, 2018

coveralls commented Oct 25, 2018 •

edited

dev-zero left a comment

dev-zero Oct 26, 2018

waychal Oct 26, 2018

dev-zero Oct 26, 2018

dev-zero Oct 26, 2018

giovannipizzi commented Oct 26, 2018

Python3 support for restapi #2117

Python3 support for restapi #2117

Conversation

waychal commented Oct 25, 2018

giovannipizzi left a comment

Choose a reason for hiding this comment

giovannipizzi Oct 25, 2018

Choose a reason for hiding this comment

waychal Oct 26, 2018

Choose a reason for hiding this comment

coveralls commented Oct 25, 2018

coveralls commented Oct 25, 2018 • edited

dev-zero left a comment

Choose a reason for hiding this comment

dev-zero Oct 26, 2018

Choose a reason for hiding this comment

waychal Oct 26, 2018

Choose a reason for hiding this comment

dev-zero Oct 26, 2018

Choose a reason for hiding this comment

dev-zero Oct 26, 2018

Choose a reason for hiding this comment

giovannipizzi commented Oct 26, 2018

coveralls commented Oct 25, 2018 •

edited