Rename integration tests. Change Qualified roles.

Signed-off-by: Juanjo Alvarez <[email protected]>

Author: juanjux

.travis.yml

@@ -7,7 +7,7 @@ services:
   - docker
 
 before_script:
-  - CGO_ENABLED=0 go get -v gopkg.in/bblfsh/sdk.v1/...
+  - go get -v gopkg.in/bblfsh/sdk.v1/...
   - bblfsh-sdk prepare-build .
   - go get -v -t ./...
 

Dockerfile.build.tpl

@@ -3,7 +3,6 @@ FROM alpine:3.6
 RUN mkdir -p /opt/driver/src && \
     adduser $BUILD_USER -u $BUILD_UID -D -h /opt/driver/src
 
-RUN apk add --no-cache --update python python-dev python3 python3-dev py-pip py2-pip git build-base bash
-RUN pip3 install git+https://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
+RUN apk add --no-cache --update python python3 git make
 
 WORKDIR /opt/driver/src

Makefile

@@ -2,7 +2,6 @@ DEV_DEPS ?= native/dev_deps
 
 test-native-internal:
 	pip3 install --user ${DEV_DEPS}/python-pydetector/ || pip3 install --user pydetector-bblfsh
-	pip3 install --user git+https://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
 	cd native/python_package/test && \
 	python3 -m unittest discover
 

README.md

@@ -156,9 +156,6 @@ var AnnotationRules = On(Any).Self(
 			argumentsAnn,
 		),
 
-		On(pyast.Attribute).Roles(uast.Identifier, uast.Expression).Children(
-			On(pyast.Name).Roles(uast.Qualified)),
-
 		On(pyast.Call).Roles(uast.Function, uast.Call, uast.Expression).Children(
 			On(HasInternalRole("args")).Roles(uast.Function, uast.Call, uast.Positional, uast.Argument, uast.Name),
 			On(HasInternalRole("keywords")).Roles(uast.Function, uast.Call, uast.Argument, uast.Name).Children(
@@ -187,6 +184,16 @@ var AnnotationRules = On(Any).Self(
 			On(HasInternalRole("value")).Roles(uast.Right),
 		),
 
+		// a.b.c ("a" and "b" will be Qualified, "c" will be just Identifier). Python does the
+		// reverse thing
+		On(pyast.Attribute).Self(
+			On(HasProperty("ctx", "Load")).Roles(uast.Qualified, uast.Identifier, uast.Expression),
+			On(HasProperty("ctx", "Store")).Roles(uast.Identifier, uast.Expression),
+			On(HasChild(pyast.Name)).Children(
+				On(Any).Roles(uast.Qualified), // Identifier and Expr added on all Name(s) below
+			),
+		),
+
 		On(pyast.Expression).Roles(uast.Expression),
 		On(pyast.Expr).Roles(uast.Expression),
 		On(pyast.Name).Roles(uast.Identifier, uast.Expression),

driver/normalizer/annotation.go

@@ -1,5 +1,6 @@
 {
     "status": "ok",
+    "language": "",
     "errors": [],
     "ast": {
         "PY3AST": {

fixtures/annotations.py.source renamed to fixtures/annotations.py

@@ -1,4 +1,5 @@
 Status:  ok
+Language:  
 Errors: 
 UAST: 
 Module {

fixtures/annotations.py.native

@@ -1,5 +1,6 @@
 {
     "status": "ok",
+    "language": "",
     "errors": [],
     "ast": {
         "PY3AST": {