Update devenv and cicd (#326)

* update devenv and cicd * update cicd * fix 3.9 incompatibility * update dependencies * update * update
fugue-project · May 8, 2022 · 3c51e28 · 3c51e28
1 parent 1eeb4ff
commit 3c51e28
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 61 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "Fugue Development Environment",
-	"image": "fugueproject/devenv:latest",
+	"image": "fugueproject/devenv:0.4.4",
 	"settings": {
 		"terminal.integrated.shell.linux": "/bin/bash",
 		"python.pythonPath": "/usr/local/bin/python",
@@ -22,9 +22,7 @@
 	"forwardPorts": [
 		8888
 	],
-	"postCreateCommand": [
-		"make devenv"
-	],
+	"postCreateCommand": "make devenv",
 	"mounts": [
 		"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
 	]

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: '3.7'
+        python-version: '3.8'
     - name: Install dependencies
       run: make devenv
     - name: Test

diff --git a/.github/workflows/test37.yml b/.github/workflows/test37.yml
diff --git a/.github/workflows/test38.yml → .github/workflows/test_all.yml b/.github/workflows/test38.yml → .github/workflows/test_all.yml
@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Test 3.8 & Lint
+name: All Tests & Lint
 
 on:
   push:
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
@@ -24,9 +24,13 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: make devenv
-    - name: Uninstall pytest-spark
-      run: pip uninstall -y pytest-spark
-    - name: Test
-      run: make testcore testsql
     - name: Lint
+      if: matrix.python-version == 3.8
       run: make lint
+    - name: Test
+      run: make test
+    - name: "Upload coverage to Codecov"
+      if: matrix.python-version == 3.8
+      uses: codecov/codecov-action@v1
+      with:
+        fail_ci_if_error: true
diff --git a/.github/workflows/test36.yml → .github/workflows/test_core.yml b/.github/workflows/test36.yml → .github/workflows/test_core.yml
@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Test 3.6 & Core
+name: Core Tests
 
 on:
   push:
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6]
+        python-version: [3.6, "3.10"]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/testnotebook.yml → .github/workflows/test_notebook.yml b/.github/workflows/testnotebook.yml → .github/workflows/test_notebook.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: [3.8]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/testwin.yml → .github/workflows/test_win.yml b/.github/workflows/testwin.yml → .github/workflows/test_win.yml
@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Test 3.8 Windows
+name: Test Windows
 
 on:
   push:
@@ -14,7 +14,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/.pylintrc b/.pylintrc
@@ -1,3 +1,3 @@
 [MESSAGES CONTROL]
-disable = C0103,C0114,C0115,C0116,C0122,C0200,C0201,C0302,C0411,C0415,E0401,E0712,E1130,R0201,R0205,R0801,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R1705,R1710,R1718,R1720,R1724,W0102,W0107,W0108,W0201,W0212,W0221,W0223,W0511,W0613,W0631,W0640,W0703,W0707,W1116
+disable = C0103,C0114,C0115,C0116,C0122,C0200,C0201,C0302,C0411,C0415,E0401,E0712,E1130,R0201,R0205,R0801,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R1705,R1710,R1718,R1720,R1724,W0102,W0107,W0108,W0201,W0212,W0221,W0223,W0237,W0511,W0613,W0631,W0640,W0703,W0707,W1116
 # TODO: R0205: inherits from object, can be safely removed
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 0.7.0
+
+-   [326](https://github.com/fugue-project/fugue/pull/326): Added tests for Python 3.6 - 3.10, Linux and Windows. Updated devenv and CICD to Python 3.8.
+
 ## 0.6.6
 
 -   Create a hybrid [engine](https://github.com/fugue-project/fugue/issues/300) of DuckDB and Dask

diff --git a/fugue/_utils/exception.py b/fugue/_utils/exception.py
@@ -34,7 +34,7 @@ def frames_to_traceback(
             limit -= 1
             frame = frame.f_back
             continue
-        break
+        break  # pragma: no cover
 
     return ctb
 

diff --git a/fugue/_utils/interfaceless.py b/fugue/_utils/interfaceless.py
@@ -282,7 +282,8 @@ def _parse_param(  # noqa: C901
         if (
             annotation == Optional[Callable]
             or annotation == Optional[callable]
-            or str(annotation).startswith("typing.Union[typing.Callable")
+            or str(annotation).startswith("typing.Union[typing.Callable")  # 3.8-
+            or str(annotation).startswith("typing.Optional[typing.Callable")  # 3.9+
         ):
             return _OptionalCallableParam(param)
         for _, c in _ANNOTATION_CONVERTERS:

diff --git a/fugue/rpc/flask.py b/fugue/rpc/flask.py
@@ -4,7 +4,7 @@
 from threading import Thread
 from typing import Any, Optional, Tuple, Dict, List
 
-import requests
+import requests  # type: ignore
 from fugue.rpc.base import RPCClient, RPCServer
 from triad.utils.convert import to_timedelta
 from werkzeug.serving import make_server

diff --git a/setup.py b/setup.py
@@ -29,8 +29,8 @@ def get_version() -> str:
     keywords="distributed spark dask sql dsl domain specific language",
     url="http://github.com/fugue-project/fugue",
     install_requires=[
-        "triad>=0.6.0",
-        "adagio>=0.2.3",
+        "triad>=0.6.1",
+        "adagio>=0.2.4",
         "qpd>=0.2.6",
         "antlr4-python3-runtime>=4.9,<4.10",
         "sqlalchemy",
@@ -69,6 +69,8 @@ def get_version() -> str:
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3 :: Only",
     ],
     python_requires=">=3.6",