Merge branch 'cross-platform-testing'

scientific-python · Jan 12, 2023 · 128a2c1 · 128a2c1
2 parents b66ca5c + e4dad67
commit 128a2c1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,24 +16,37 @@ permissions:
 
 jobs:
   test_devpy:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python_version: ["3.7"]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
+          python-version: ${{ matrix.python_version }}
       - name: Install
         run: |
           pip install -e .
           pip install pytest meson-python ninja
       - name: Library tests
+        env:
+          PYTHONPATH: "."
         run: |
-          PYTHONPATH=. pytest --pyargs devpy
-      - name: Functional tests
+          pytest --pyargs devpy
+      - name: Functional tests (linux)
+        if: matrix.os == 'ubuntu-latest'
         shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"'
         env:
           TERM: xterm-256color
         run: |
           cd example_pkg
           ./dev.py build
           ./dev.py test
+      - name: Functional tests (other)
+        if: matrix.os != 'ubuntu-latest'
+        run: |
+          cd example_pkg
+          ./dev.py build
+          ./dev.py test
diff --git a/devpy/__main__.py b/devpy/__main__.py
@@ -1,3 +1,4 @@
+import collections
 import os
 import sys
 import importlib
@@ -16,22 +17,16 @@
 click.Context.formatter_class = ColorHelpFormatter
 
 
-class DotDict(dict):
+class DotDict(collections.UserDict):
     def __getitem__(self, key):
-        subitem = self
+        subitem = self.data
         for subkey in key.split("."):
             try:
-                subitem = dict.__getitem__(subitem, subkey)
+                subitem = subitem[subkey]
             except KeyError:
                 raise KeyError(f"`{key}` not found in configuration") from None
         return subitem
 
-    def get(self, key, default=None, /):
-        try:
-            return self.__getitem__(key)
-        except KeyError:
-            return default
-
 
 if __name__ == "__main__":
     if not os.path.exists("pyproject.toml"):

diff --git a/devpy/cmds/util.py b/devpy/cmds/util.py
@@ -12,7 +12,8 @@ def run(cmd, cwd=None, replace=False, sys_exit=True, output=True, *args, **kwarg
     if cwd:
         click.secho(f"$ cd {cwd}", bold=True, fg="bright_blue")
         os.chdir(cwd)
-    click.secho(f"$ {shlex.join(cmd)}", bold=True, fg="bright_blue")
+    cmdstr = ' '.join(shlex.quote(arg) for arg in cmd)
+    click.secho(f"$ {cmdstr}", bold=True, fg="bright_blue")
 
     if output is False:
         output_kwargs = {"stdout": subprocess.PIPE, "stderr": subprocess.STDOUT}