From 9ee19b36343d00b4d00ed973afaeb874d0e124b0 Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 14:15:19 +0100 Subject: [PATCH 1/9] MAINT: Show python info on Windows --- .github/workflows/test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e8d7152e6..59f8f8de4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,6 +37,12 @@ jobs: - name: Install project dependencies run: poetry install -vvv --no-root + - name: Show poetry python location (Windows) + shell: pwsh + run: | + poetry run where python + if: matrix.os == 'windows-latest' + - name: Run mypy on 'tests' (using the local stubs) and on the local stubs run: poetry run poe mypy From 9d0e69336d2ee5ba92e1ecc5f69b195723a089fe Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 14:35:07 +0100 Subject: [PATCH 2/9] EXP: Examine the effect of changing the pyproject file --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a8678c611..0e9b4e821 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ pandas = "1.4.3" typing-extensions = ">=4.2.0" matplotlib = ">=3.3.2" pre-commit = ">=2.19.0" -black = ">=22.6.0" +black = ">=22.8.0" isort = ">=5.10.1" openpyxl = ">=3.0.10" tables = ">=3.7.0" From bf57dd9971b5b66f85f129c523ef1f10d9277060 Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 14:44:31 +0100 Subject: [PATCH 3/9] MAINT: More info --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59f8f8de4..42d4f0d55 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,12 @@ jobs: - name: Show poetry python location (Windows) shell: pwsh run: | + echo "Python location" poetry run where python + echo "poe location" + poetry run where.exe poe + echo "Installed packages" + poetry run python -m pip list if: matrix.os == 'windows-latest' - name: Run mypy on 'tests' (using the local stubs) and on the local stubs From 0a7088eccd69a6fa5676792e89c6637afcc1f777 Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 19:05:50 +0100 Subject: [PATCH 4/9] Skip cache windows --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 42d4f0d55..9231b1d66 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,11 +28,12 @@ jobs: run: echo "::set-output name=VERSION::$(poetry --version)" id: poetry_version - - name: Cache poetry.lock + - name: Cache poetry.lock (*nix) uses: actions/cache@v3 with: path: poetry.lock key: ${{ matrix.os }}-${{ matrix.python-version }}-poetry-${{ steps.poetry_version.outputs.VERSION }}-${{ hashFiles('pyproject.toml') }} + if: matrix.os != 'windows-latest' - name: Install project dependencies run: poetry install -vvv --no-root From 8f6900891216f32e993985b36758453194f44e1c Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 19:12:38 +0100 Subject: [PATCH 5/9] Change condition --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9231b1d66..6d76236ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: with: path: poetry.lock key: ${{ matrix.os }}-${{ matrix.python-version }}-poetry-${{ steps.poetry_version.outputs.VERSION }}-${{ hashFiles('pyproject.toml') }} - if: matrix.os != 'windows-latest' + if: (matrix.os == 'ubuntu-latest') || (matrix.os == 'macos-latest') - name: Install project dependencies run: poetry install -vvv --no-root From 7a653091d69bdae01bc22fa7807ff4137a3c3d1c Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 23:09:14 +0100 Subject: [PATCH 6/9] Pin some packages so match older working environment --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0e9b4e821..8e56864b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,10 @@ mypy = ">=0.971" pyarrow = ">=9.0.0" pytest = ">=7.1.2" pyright = ">=1.1.266" -poethepoet = ">=0.13.1" +virtualenv = "20.16.3" +poethepoet = "0.16.0" +pathspec = "0.9.0" +distlib = "0.3.5" loguru = ">=0.6.0" pandas = "1.4.3" typing-extensions = ">=4.2.0" From 9ea9e8c5eecfcb55a333d3265b375a6a564bf2c1 Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 23:13:43 +0100 Subject: [PATCH 7/9] Rollback some pins --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8e56864b1..4f1a89da4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,10 +39,7 @@ mypy = ">=0.971" pyarrow = ">=9.0.0" pytest = ">=7.1.2" pyright = ">=1.1.266" -virtualenv = "20.16.3" poethepoet = "0.16.0" -pathspec = "0.9.0" -distlib = "0.3.5" loguru = ">=0.6.0" pandas = "1.4.3" typing-extensions = ">=4.2.0" From ea2c38e895f7a07450a6bff7c872cd639e5532d9 Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 23:20:08 +0100 Subject: [PATCH 8/9] Rollback other changes --- .github/workflows/test.yml | 12 ------------ pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d76236ae..f71a41e0e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,22 +33,10 @@ jobs: with: path: poetry.lock key: ${{ matrix.os }}-${{ matrix.python-version }}-poetry-${{ steps.poetry_version.outputs.VERSION }}-${{ hashFiles('pyproject.toml') }} - if: (matrix.os == 'ubuntu-latest') || (matrix.os == 'macos-latest') - name: Install project dependencies run: poetry install -vvv --no-root - - name: Show poetry python location (Windows) - shell: pwsh - run: | - echo "Python location" - poetry run where python - echo "poe location" - poetry run where.exe poe - echo "Installed packages" - poetry run python -m pip list - if: matrix.os == 'windows-latest' - - name: Run mypy on 'tests' (using the local stubs) and on the local stubs run: poetry run poe mypy diff --git a/pyproject.toml b/pyproject.toml index 4f1a89da4..415cc4f09 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ pandas = "1.4.3" typing-extensions = ">=4.2.0" matplotlib = ">=3.3.2" pre-commit = ">=2.19.0" -black = ">=22.8.0" +black = ">=22.6.0" isort = ">=5.10.1" openpyxl = ">=3.0.10" tables = ">=3.7.0" From ab302945f2c65e447eadd1caa1903de17d669784 Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Thu, 1 Sep 2022 23:21:16 +0100 Subject: [PATCH 9/9] Rollback other changes --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f71a41e0e..e8d7152e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: run: echo "::set-output name=VERSION::$(poetry --version)" id: poetry_version - - name: Cache poetry.lock (*nix) + - name: Cache poetry.lock uses: actions/cache@v3 with: path: poetry.lock