Support Python2 targets!! #85

kanghyojun · 2016-10-23T11:16:27Z

@dahlia @Kroisse 이런식으로 진행하면될까요?.. 근데 겹치는 로직(type annotation만 없으면된다던지)은 어떻게처리해야할지 감이안오네요. 대충 머리속에선 이런걸 그렸는데...

pythonMethod PythonVersion T.Text PythonArgument Code
pythonMethod Python2 name arguments body returnType = [qq|
    def $name($arguments) # return $returnType:
        $body
|]
pythonMethod Python3 name arguments Code returnType = [qq|
    def $name($arguments) -> $returnType:
        $body
|]

compileTypeExpression pythonVersion RecordType ... =
   ....
   {pythonMethod pythonVersion "hash" .... .... PythonStr}
   ....

#50 해결

리뷰 받은 사항 남은거 정리
nirum_fixture 를 밖으로 빼서 정리하고 원래 scanPacakage 테스트 케이스 살리기
tox 적용

kanghyojun · 2016-10-25T01:40:10Z

테스트 통과시키기
python2 테스트하면서 쉘스크립트로 옮겨서 pytest가 테스트하게하기

kanghyojun · 2016-11-03T14:51:18Z

stack test 통과
python3 에서 annotation 이상하게보이는것 수정

dahlia

Python 3에서는 __eq__만 구현해도 __ne__가 같이 구현되는데, Python 2는 __ne__도 직접 구현해줘야 합니다.

dahlia · 2016-11-03T14:52:13Z

pythontest.sh

+#!/usr/bin/env bash
+
+stack build && stack exec -- nirum -o nirum_fixture test/nirum_fixture
+pushd "nirum_fixture";


세미콜론 필요 없습니다. (기존에 .travis.yml 파일에서 세미콜론을 쓰는 이유는 여러줄로 써도 Travis CI가 한 줄로 합쳐버리기 때문…)

dahlia · 2016-11-03T14:52:28Z

pythontest.sh

+stack build && stack exec -- nirum -o nirum_fixture test/nirum_fixture
+pushd "nirum_fixture";
+  pip install -e .
+popd;


여기도 마찬가지로 세미콜론 필요 없습니다.

dahlia · 2016-11-03T14:52:46Z

pythontest.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash


set -e 옵션 줍시다.

dahlia · 2016-11-03T14:53:19Z

pythontest.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+stack build && stack exec -- nirum -o nirum_fixture test/nirum_fixture


&& 연산자로 잇지 않고 이 스크립트 자체에 set -e 옵션을 주고 두 줄로 고치는 게 나을 듯

dahlia · 2016-11-03T14:54:03Z

.travis.yml

 - ./lint.sh
+- ./pythontest.sh


앞으로 다른 타겟 테스트까지 한번에 다 돌리는 스크립트로 만드는 게 나을 듯합니다. 그러려먼 파일명도 test.sh 정도로 줄이는 게 낫겠네요.

dahlia · 2016-11-03T14:55:26Z

src/Nirum/Targets/Python.hs

@@ -210,6 +233,21 @@ toIndentedCodes :: (a -> T.Text) -> [a] -> T.Text -> T.Text
 toIndentedCodes f traversable concatenator =
    T.intercalate concatenator $ map f traversable

+quote :: T.Text -> T.Text
+quote s = '\'' `T.cons` s `T.snoc` '\''


그냥 [qq|'{s}'|]로 쓰면 더 깔끔하지 않을까요?

dahlia · 2016-11-03T14:57:43Z

src/Nirum/Targets/Python.hs

-    def __repr__(self) -> str:
-        return '\{0.__module__\}.\{0.__qualname__\}(\{1\})'.format(
+    def __repr__(self){ ret "str" }:
+        return '\{0.__module__\}.\{1\}(\{2\})'.format(


typing._type_repr()가 모듈 이름까지 포함해서 반환하는 걸로 알고 있습니다. 0.__module__을 덧붙이면 안될 겁니다.

- Use `set -e` - Remove useless semicolon - Don't use `&&`

dahlia

test/python/ 아래쪽 파일도 flake8 등을 돌립시다.

dahlia · 2016-11-14T12:45:37Z

src/Nirum/Targets/Python.hs

@@ -35,7 +35,7 @@ module Nirum.Targets.Python ( Code
                            , unionInstallRequires
                            ) where

-import Control.Monad.State (modify)
+import Control.Monad.State as ST (get, modify)


qualified 씁시다.

dahlia · 2016-11-14T12:46:01Z

src/Nirum/Targets/Python.hs

+python3SourceDirectory :: T.Text
+python3SourceDirectory = "src"
+python2SourceDirectory :: T.Text
+python2SourceDirectory = "src-py2"


dahlia · 2016-11-14T12:47:05Z

src/Nirum/Targets/Python.hs

+python2SourceDirectory = "src-py2"
+
+emptyContext :: PythonVersion -> CodeGenContext
+emptyContext pythonVersion' = CodeGenContext { standardImports = []


함수명 empty로 줄입시다.

dahlia · 2016-11-14T12:50:40Z

src/Nirum/Targets/Python.hs

+    typeHelpers' :: PythonVersion
+                 -> (T.Text -> T.Text -> T.Text, T.Text -> T.Text)
+    typeHelpers' Python2 = (\n _ -> n, \_ -> "")
+    typeHelpers' Python3 = (\n t -> [qq|$n: $t|], \t -> [qq| -> $t|])


typeHelpers :: CodeGen (T.Text -> T.Text -> T.Text, T.Text -> T.Text) typeHelpers = do ver <- getPythonVersion return $ case ver of Python2 -> ...

dahlia · 2016-11-14T12:52:20Z

src/Nirum/Targets/Python.hs

-        return '\{0.__module__\}.\{0.__qualname__\}(\{1\})'.format(
-            type(self),
+    def __repr__(self){ ret "str" }:
+        return '\{0\}(\{2\})'.format(


👀 __repr__도 테스트하죠

dahlia · 2016-11-14T12:53:28Z

src/Nirum/Targets/Python.hs


-    def __repr__(self) -> str:
+    def __repr__(self){ ret "str" }:
        return '\{0.__module__\}.\{0.__qualname__\}(\{1!r\})'.format(


dahlia · 2016-11-14T12:53:45Z

src/Nirum/Targets/Python.hs

-        return '\{0.__module__\}.\{0.__qualname__\}(\{1\})'.format(
-            type(self),
+    def __repr__(self){ret "bool"}:
+        return '\{0\}(\{1\})'.format(


테스트합시다.

dahlia · 2016-11-14T12:54:08Z

src/Nirum/Targets/Python.hs

        return isinstance(other, $className) and all(
            getattr(self, attr) == getattr(other, attr)
            for attr in self.__slots__
        )

-    def __nirum_serialize__(self) -> typing.Mapping[str, typing.Any]:
+    def __ne__(self, other){ ret "bool" }:
+        return not self.__eq__(other)


dahlia · 2016-11-14T12:55:38Z

src/Nirum/Targets/Python.hs

+
+SOURCE_ROOT = '{python3SourceDirectory}'
+
+if sys.version_info[0] == 2:


if sys.version_info < (3,0): 이렇게 비교하는 게 나을 듯

dahlia · 2016-11-14T12:58:01Z

test/Nirum/Targets/PythonSpec.hs

@@ -916,6 +576,7 @@ spec = parallel $ do
            (req4 `unionInstallRequires` req5) `shouldBe` req6
            (req5 `unionInstallRequires` req4) `shouldBe` req6

+


dahlia · 2016-11-23T13:13:42Z

tox.ini

+    six
+    flake8
+    nirum
+    pytest


여기에 git+git://github.com/spoqa/nirum.git@3.0.1 추가합시다.

Compile python package based on version

b6f68e7

kanghyojun added the typ:enhance Type: Enhancement/new feature label Oct 23, 2016

Kroisse and others added 3 commits October 24, 2016 21:06

Merge kroisse's commit

77e7273

Make can be built

54bffa7

Move python verison specific codes

90c72f2

Move python related test in python file

0c6d933

dahlia requested changes Nov 3, 2016

View reviewed changes

kanghyojun added 5 commits November 14, 2016 21:00

Rename pythontest.sh to test.sh

bac4a31

- Use `set -e` - Remove useless semicolon - Don't use `&&`

Use QuasiQuote instead of cons&snoc combi

e815e08

typing._type_repr contain module's name

c83b779

Show proper typehints

55c8fde

Implement __ne__ for python2

34684f0

kanghyojun changed the title ~~[WIP] Python2 targets~~ Support Python2 targets!! Nov 14, 2016

dahlia requested changes Nov 14, 2016

View reviewed changes

dahlia requested changes Nov 23, 2016

View reviewed changes

tox.ini

six

flake8

nirum

pytest

Copy link

Member

dahlia Nov 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기에 git+git://github.com/spoqa/nirum.git@3.0.1 추가합시다.

kanghyojun added 13 commits November 23, 2016 22:24

Remove useless space

59ab5a9

Install python2 if version lower than 3

2dc854b

Don't call __eq__ in __ne__

91a9465

Show representation properly

f1a1162

stash

a755504

Use qualified import

5b6f5b2

Refactor sourceDirectory

9be2dce

Rename emptyContext to empty

8466a27

Ignore pyc & tox

4e9683e

Use typeReprCompiler

6046984

Change missing return type annotation

a974eca

Test with tox

de2ba5b

Install nirum python runtime from git

be43955

Fix generated Python package to include both src and src-py2

6ffa991

kanghyojun force-pushed the python2-target branch from 5ff29ef to 6ffa991 Compare November 23, 2016 14:03

Fix appveyor & travis

3c118b5

kanghyojun force-pushed the python2-target branch from c6ac075 to 3c118b5 Compare November 23, 2016 14:18

Package generate MANIFEST.in as well

b30d5ff

kanghyojun force-pushed the python2-target branch 2 times, most recently from 3bffd62 to 08a199f Compare November 23, 2016 15:14

kanghyojun added 3 commits November 24, 2016 01:58

Tap deadsnakes for python34,35

3ddda68

Test metadata with pytest

f82b787

Install tox on AppVeyor CI

a6e7346

kanghyojun force-pushed the python2-target branch from ac42ed4 to a6e7346 Compare November 23, 2016 16:58

dahlia approved these changes Nov 24, 2016

View reviewed changes

kanghyojun merged commit 2527e07 into nirum-lang:master Nov 24, 2016

kanghyojun mentioned this pull request Nov 24, 2016

Python 2 support #50

Closed

dahlia added cmp:compiler Component: Compiler backend (e.g., annotation processors, code generators) target:python labels Aug 26, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Python2 targets!! #85

Support Python2 targets!! #85

kanghyojun commented Oct 23, 2016 •

edited

Loading

kanghyojun commented Oct 25, 2016 •

edited

Loading

kanghyojun commented Nov 3, 2016 •

edited

Loading

dahlia left a comment

dahlia Nov 3, 2016

dahlia Nov 3, 2016

dahlia Nov 3, 2016

dahlia Nov 3, 2016

dahlia Nov 3, 2016

dahlia Nov 3, 2016

dahlia Nov 3, 2016

dahlia left a comment

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 14, 2016

dahlia Nov 23, 2016

		@@ -0,0 +1,8 @@
		#!/usr/bin/env bash

		stack build && stack exec -- nirum -o nirum_fixture test/nirum_fixture


		SOURCE_ROOT = '{python3SourceDirectory}'

		if sys.version_info[0] == 2:

		@@ -916,6 +576,7 @@ spec = parallel $ do
		(req4 `unionInstallRequires` req5) `shouldBe` req6
		(req5 `unionInstallRequires` req4) `shouldBe` req6

Support Python2 targets!! #85

Support Python2 targets!! #85

Conversation

kanghyojun commented Oct 23, 2016 • edited Loading

kanghyojun commented Oct 25, 2016 • edited Loading

kanghyojun commented Nov 3, 2016 • edited Loading

dahlia left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dahlia left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kanghyojun commented Oct 23, 2016 •

edited

Loading

kanghyojun commented Oct 25, 2016 •

edited

Loading

kanghyojun commented Nov 3, 2016 •

edited

Loading