Merge branch 'master' into python3.10

fastapi · Nov 5, 2022 · 99078aa · 99078aa
2 parents c02a8ec + f55e62e
commit 99078aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,6 +25,11 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
+        if: ${{ matrix.python-version != '3.6' }}
+        run: python -m flit install --symlink
+      - name: Install Dependencies
+        if: ${{ matrix.python-version == '3.6' }}
+        # This doesn't install the editable install, so coverage doesn't get subprocesses
         run: python -m pip install ".[test]"
       - name: Install Click 7
         if: matrix.click-7

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -8,5 +8,5 @@ export TERMINAL_WIDTH=3000
 # Force disable terminal for tests inside of pytest, takes precedence over GITHUB_ACTIONS env var
 export _TYPER_FORCE_DISABLE_TERMINAL=1
 bash ./scripts/test-files.sh
-# Use xdist-pytest --forked to ensure modified sys.path to import relative modules in examples keeps working
-pytest --cov=typer --cov=tests --cov=docs_src --cov-report=term-missing -o console_output_style=progress --numprocesses=auto ${@}
+# It seems xdist-pytest ensures modified sys.path to import relative modules in examples keeps working
+pytest --cov-config=.coveragerc --cov --cov-report=term-missing -o console_output_style=progress --numprocesses=auto ${@}