Merge ast and parser from forward

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.9
       - name: Set up Poetry cache for Python dependencies
         uses: actions/cache@v2
         if: startsWith(runner.os, 'Linux')

.gitignore

@@ -49,6 +49,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+testreport.xml
 
 # Translations
 *.mo

Makefile

@@ -2,7 +2,7 @@
 
 .DEFAULT: help
 help:
-	@echo "Available targets: install, lint, mypy, test, docs, clean"
+	@echo "Available targets: install, lint, mypy, test, docs, clean, format"
 
 install:
 	poetry install
@@ -21,3 +21,7 @@ docs:
 
 clean:
 	rm -rf docs/build
+
+format:
+	poetry run yapf -r -i probably/ tests/
+	poetry run isort probably/ tests/

docs/source/conf.py

@@ -62,3 +62,6 @@
 
 # nitpicky emits warnings for all broken links
 # nitpicky = True
+
+autodoc_type_aliases = {"Expr" : "probably.pgcl.ast.Expr", "Instr" : "probably.pgcl.ast.Instr", "Type" : "probably.pgcl.ast.Type",
+                        "Decl" : "probably.pgcl.ast.Decl", "DistrExpr" : "probably.pgcl.ast.DistrExpr", "Query" : "probably.pgcl.ast.Query"}

mypy.ini

@@ -14,3 +14,6 @@ ignore_missing_imports = True
 
 [mypy-networkx.*]
 ignore_missing_imports = True
+
+[mypy-click.*]
+ignore_missing_imports = True