fix build

.github/workflows/build.yml

@@ -13,11 +13,14 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os:
+          - ubuntu-18.04
+          - windows-latest
+          #- macos-latest
         python-version:
-          - 3.6
           - 3.7
           - 3.8
           - 3.9
@@ -37,12 +40,12 @@ jobs:
 
       - name: Install Python version
         run: |
-          scripts/make_setup.sh 0
+          python scripts/make_setup.py 0
           pip install -e .
 
       - name: Install CPP version
         run: |
-          scripts/make_setup.sh 1
+          python scripts/make_setup.py 1
           pip install -e .
 
       - name: Test
@@ -86,7 +89,7 @@ jobs:
           # Don't build osx 10.6 (no C++11 support)
           CIBW_SKIP: "*macosx_10_6*"
         run: |
-          scripts/make_setup.sh 1
+          python scripts/make_setup.py 1
           python -m cibuildwheel --output-dir wheelhouse
 
       - uses: actions/upload-artifact@v2
@@ -108,7 +111,7 @@ jobs:
 
       - name: Build sdist
         run: |
-          scripts/make_setup.sh 1
+          python scripts/make_setup.py 1
           python setup.py sdist
 
       - uses: actions/upload-artifact@v2
@@ -129,7 +132,7 @@ jobs:
 
       - name: Build sdist
         run: |
-          scripts/make_setup.sh 0
+          python scripts/make_setup.py 0
           python setup.py sdist
 
       - uses: actions/upload-artifact@v2

Makefile

@@ -43,9 +43,9 @@ test:
 	python3 -bb -m pytest --reruns 2 --only-rerun 'Overflow in cast' --only-rerun 'Table or view not found' tests/
 
 installlocal:
-	scripts/make_setup.sh 1
+	python scripts/make_setup.py 1
 	pip install -e .
-	scripts/make_setup.sh 0
+	python scripts/make_setup.py 0
 	pip install -e .
 
 sql:

fugue_sql_antlr_version/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.8"
+__version__ = "0.0.9"

scripts/make_setup.py

@@ -0,0 +1,10 @@
+import sys
+
+mode = bool(int(sys.argv[1]))
+
+with open("setup.py", "w") as f:
+    f.writelines(
+        ["# pylint: disable-all\n", "# flake8: noqa\n", f"_BUILD_CPP = {mode}\n\n"]
+    )
+    with open("setup.template", "r") as ff:
+        f.writelines(ff.readlines())

setup.py

@@ -1,6 +1,7 @@
 # pylint: disable-all
 # flake8: noqa
-_BUILD_CPP = bool(0)
+_BUILD_CPP = False
+
 import fnmatch
 import os
 import platform
@@ -53,7 +54,7 @@ def get_ext_modules() -> List[str]:
     if not _BUILD_CPP:
         return []
     extra_compile_args = {
-        "windows": ["/DANTLR4CPP_STATIC", "/Zc:__cplusplus"],
+        "windows": ["/DANTLR4CPP_STATIC", "/Zc:__cplusplus", "/std:c++17"],
         "linux": ["-std=c++17"],
         "darwin": ["-std=c++17"],
         "cygwin": ["-std=c++17"],

setup.template

@@ -50,7 +50,7 @@ def get_ext_modules() -> List[str]:
     if not _BUILD_CPP:
         return []
     extra_compile_args = {
-        "windows": ["/DANTLR4CPP_STATIC", "/Zc:__cplusplus"],
+        "windows": ["/DANTLR4CPP_STATIC", "/Zc:__cplusplus", "/std:c++17"],
         "linux": ["-std=c++17"],
         "darwin": ["-std=c++17"],
         "cygwin": ["-std=c++17"],