Merge hell

Author: rocky

__pkginfo__.py

@@ -87,8 +87,9 @@
     "pyficache >= 2.3.0",
     "xdis >= 6.1.1,<6.2.0",
     "pygments %s" % pygments_version,
-    "spark_parser >= 1.8.9, <1.9.1",
-    "tracer >= 0.3.2",
+    "spark_parser >= 1.8.9,<1.9.2",
+    "tracer >= 1.9.0",
+>>>>>>> Stashed changes
     "term-background >= 1.0.1",
 ]