From 69d6ca4fd317cee3e24c63c234e1e20e9dfed17c Mon Sep 17 00:00:00 2001 From: Becker Awqatty Date: Mon, 25 Oct 2021 20:28:38 -0400 Subject: [PATCH 1/7] added Python 3.10 to test platforms --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index d4b872f..433457d 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] - python-version: [3.7, 3.8, 3.9] + python-version: ['3.7', '3.8', '3.9', '3.10'] env: OS: ${{ matrix.os }} From 49d8c145e5444c54676216732ed7977ccfbc76b4 Mon Sep 17 00:00:00 2001 From: Becker Awqatty Date: Mon, 25 Oct 2021 20:30:28 -0400 Subject: [PATCH 2/7] added `pytest-xdist` to test requirements --- .github/workflows/unit-tests.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 433457d..1c44cd8 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -31,7 +31,7 @@ jobs: - run: python -m pip install .[test] - - run: python -m pytest tests --cov=endaq.batch + - run: python -m pytest tests --cov=endaq.batch --numprocesses auto - uses: codecov/codecov-action@v2 with: diff --git a/setup.py b/setup.py index deec2c6..d177ef4 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,7 @@ TEST_REQUIRES = [ "pytest", "pytest-cov", + "pytest-xdist[psutil]", "hypothesis", "sympy", "numpy-quaternion==2020.11.2.17.0.49", From 45c174268cdc0be5f64042a075a5780ac8d15ac9 Mon Sep 17 00:00:00 2001 From: Becker Awqatty Date: Mon, 25 Oct 2021 20:40:20 -0400 Subject: [PATCH 3/7] Revert "added Python 3.10 to test platforms" This reverts commit 69d6ca4fd317cee3e24c63c234e1e20e9dfed17c. --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 1c44cd8..1e22f06 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: [3.7, 3.8, 3.9] env: OS: ${{ matrix.os }} From b2bc0afe1929875a72c9f1c97db894623c91334b Mon Sep 17 00:00:00 2001 From: Becker Awqatty Date: Mon, 25 Oct 2021 20:45:20 -0400 Subject: [PATCH 4/7] added names to action stages --- .github/workflows/unit-tests.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 1e22f06..003812e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -22,18 +22,25 @@ jobs: steps: - - uses: actions/setup-python@v2 + - name: Setup Python + uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - run: python -m pip install --upgrade pip - - uses: actions/checkout@v2 + - name: Upgrade pip + run: python -m pip install --upgrade pip - - run: python -m pip install .[test] + - name: Clone code + uses: actions/checkout@v2 - - run: python -m pytest tests --cov=endaq.batch --numprocesses auto + - name: Install package & (test) dependencies + run: python -m pip install .[test] - - uses: codecov/codecov-action@v2 + - name: Run Tests + run: python -m pytest tests --cov=endaq.batch --numprocesses auto + + - name: Generate Codecov Report + uses: codecov/codecov-action@v2 with: token: ${{ secrets.CODECOV_TOKEN }} env_vars: OS,PYTHON-VERSION From cea9ad024ebf5a8f9e72084e91e8e9ebbdca6f40 Mon Sep 17 00:00:00 2001 From: Becker Awqatty Date: Mon, 25 Oct 2021 20:49:11 -0400 Subject: [PATCH 5/7] added pip caching to tests --- .github/workflows/unit-tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 003812e..0d83a6f 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -27,6 +27,16 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Get pip Cache Location + id: pip-cache + run: echo "::set-output name=dir::$(pip cache dir)" + + - name: Load pip Cache + uses: actions/cache@v2 + with: + path: ${{ steps.pip-cache.outputs.dir }} + key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }} + - name: Upgrade pip run: python -m pip install --upgrade pip From 9f9354a9f70cf910682292143684a7f8ca41f3c9 Mon Sep 17 00:00:00 2001 From: Becker Awqatty Date: Mon, 25 Oct 2021 20:59:23 -0400 Subject: [PATCH 6/7] refactor descriptions --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 0d83a6f..b4ab4a0 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -40,7 +40,7 @@ jobs: - name: Upgrade pip run: python -m pip install --upgrade pip - - name: Clone code + - name: Checkout code uses: actions/checkout@v2 - name: Install package & (test) dependencies From 501bde25958b474e56235d1742e6258a3f1b2b6d Mon Sep 17 00:00:00 2001 From: Becker Awqatty Date: Tue, 26 Oct 2021 11:38:38 -0400 Subject: [PATCH 7/7] Revert "added pip caching to tests" This reverts commit cea9ad024ebf5a8f9e72084e91e8e9ebbdca6f40. --- .github/workflows/unit-tests.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index b4ab4a0..7a7da53 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -27,16 +27,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Get pip Cache Location - id: pip-cache - run: echo "::set-output name=dir::$(pip cache dir)" - - - name: Load pip Cache - uses: actions/cache@v2 - with: - path: ${{ steps.pip-cache.outputs.dir }} - key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }} - - name: Upgrade pip run: python -m pip install --upgrade pip