From ccc356610468b13b3bbbd7efeb8f211a3762007a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 14:21:38 +0000 Subject: [PATCH 1/6] build(deps): bump mypy from 0.931 to 0.940 Bumps [mypy](https://github.com/python/mypy) from 0.931 to 0.940. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.931...v0.940) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index d6d16c626..8b453f29c 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,4 +1,4 @@ -mypy==0.931 +mypy==0.940 flake8==4.0.1 black==22.1.0 From 921364eccf0eb176357d272f492a4c8ef615d771 Mon Sep 17 00:00:00 2001 From: Jon Duckworth Date: Tue, 15 Mar 2022 07:51:35 -0400 Subject: [PATCH 2/6] Update Python 3.11. alpha version and add note on failed install --- .github/workflows/continuous-integration.yml | 13 ++++++++++--- README.md | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 816d34563..7b3729751 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -32,13 +32,13 @@ jobs: experimental: - false include: - - python-version: "3.11.0-alpha.3" + - python-version: "3.11.0-alpha.5" os: ubuntu-latest experimental: true - - python-version: "3.11.0-alpha.3" + - python-version: "3.11.0-alpha.5" os: windows-latest experimental: true - - python-version: "3.11.0-alpha.3" + - python-version: "3.11.0-alpha.5" os: macos-latest experimental: true @@ -89,6 +89,13 @@ jobs: pip install --upgrade pip pip install -r requirements-test.txt pip install -e ".[validation]" + + - name: Install toml library + # tomllib is not yet available in the 3.11.0-alpha.5 release, which causes failures when trying + # to build orjson. We patch this by installing tomli until tomllib is available in the next release. + if: ${{ startsWith(matrix.python-version, '3.11')}} + run: | + pip install tomli==2.0.1 - name: Execute test suite run: ./scripts/test diff --git a/README.md b/README.md index 50d23b0de..af0c8d913 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,9 @@ Note that while we support Python 3.10.\*, wheels for the `orjson` library are n platforms. If you install PySTAC with the `orjson` extra, you may need to have the Rust toolchain installed (e.g. via [rustup](https://rustup.rs/)) in order to build the package from source. -Support for Python 3.11 should be considered experimental until further notice. +Support for Python 3.11 should be considered experimental until further notice. There is a known issue with failing build of `orjson` on 3.11.0 alpha releases prior to alpha.6 (see +[#765(comment)](https://github.com/stac-utils/pystac/pull/765#pullrequestreview-908908772) for +some additional detail). The workaround is to install `tomli` prior to installing `orjson`. PySTAC has a single required dependency (`python-dateutil`). PySTAC can be installed from pip or the source repository. From c6ed34f4b6f3f1ed307384ae488f9bc62dfe5dc1 Mon Sep 17 00:00:00 2001 From: Jon Duckworth Date: Tue, 15 Mar 2022 08:38:14 -0400 Subject: [PATCH 3/6] Install tomli before orjson --- .github/workflows/continuous-integration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7b3729751..44589bc37 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -84,18 +84,18 @@ jobs: # Cache based on OS, Python version, and dependency hash key: pip-test-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }} - - name: Install dependencies - run: | - pip install --upgrade pip - pip install -r requirements-test.txt - pip install -e ".[validation]" - - name: Install toml library # tomllib is not yet available in the 3.11.0-alpha.5 release, which causes failures when trying # to build orjson. We patch this by installing tomli until tomllib is available in the next release. if: ${{ startsWith(matrix.python-version, '3.11')}} run: | pip install tomli==2.0.1 + + - name: Install dependencies + run: | + pip install --upgrade pip + pip install -r requirements-test.txt + pip install -e ".[validation]" - name: Execute test suite run: ./scripts/test From b2ef5a7b4bc0d5f06047494b14952348fea4207a Mon Sep 17 00:00:00 2001 From: Jon Duckworth Date: Thu, 17 Mar 2022 12:26:07 -0400 Subject: [PATCH 4/6] Revert "Install tomli before orjson" This reverts commit c6ed34f4b6f3f1ed307384ae488f9bc62dfe5dc1. --- .github/workflows/continuous-integration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 44589bc37..7b3729751 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -84,18 +84,18 @@ jobs: # Cache based on OS, Python version, and dependency hash key: pip-test-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }} + - name: Install dependencies + run: | + pip install --upgrade pip + pip install -r requirements-test.txt + pip install -e ".[validation]" + - name: Install toml library # tomllib is not yet available in the 3.11.0-alpha.5 release, which causes failures when trying # to build orjson. We patch this by installing tomli until tomllib is available in the next release. if: ${{ startsWith(matrix.python-version, '3.11')}} run: | pip install tomli==2.0.1 - - - name: Install dependencies - run: | - pip install --upgrade pip - pip install -r requirements-test.txt - pip install -e ".[validation]" - name: Execute test suite run: ./scripts/test From 30c2741cc9f61a6abc5382803846428b45a1e254 Mon Sep 17 00:00:00 2001 From: Jon Duckworth Date: Thu, 17 Mar 2022 12:26:11 -0400 Subject: [PATCH 5/6] Revert "Update Python 3.11. alpha version and add note on failed install" This reverts commit 921364eccf0eb176357d272f492a4c8ef615d771. --- .github/workflows/continuous-integration.yml | 13 +++---------- README.md | 4 +--- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7b3729751..816d34563 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -32,13 +32,13 @@ jobs: experimental: - false include: - - python-version: "3.11.0-alpha.5" + - python-version: "3.11.0-alpha.3" os: ubuntu-latest experimental: true - - python-version: "3.11.0-alpha.5" + - python-version: "3.11.0-alpha.3" os: windows-latest experimental: true - - python-version: "3.11.0-alpha.5" + - python-version: "3.11.0-alpha.3" os: macos-latest experimental: true @@ -89,13 +89,6 @@ jobs: pip install --upgrade pip pip install -r requirements-test.txt pip install -e ".[validation]" - - - name: Install toml library - # tomllib is not yet available in the 3.11.0-alpha.5 release, which causes failures when trying - # to build orjson. We patch this by installing tomli until tomllib is available in the next release. - if: ${{ startsWith(matrix.python-version, '3.11')}} - run: | - pip install tomli==2.0.1 - name: Execute test suite run: ./scripts/test diff --git a/README.md b/README.md index af0c8d913..50d23b0de 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,7 @@ Note that while we support Python 3.10.\*, wheels for the `orjson` library are n platforms. If you install PySTAC with the `orjson` extra, you may need to have the Rust toolchain installed (e.g. via [rustup](https://rustup.rs/)) in order to build the package from source. -Support for Python 3.11 should be considered experimental until further notice. There is a known issue with failing build of `orjson` on 3.11.0 alpha releases prior to alpha.6 (see -[#765(comment)](https://github.com/stac-utils/pystac/pull/765#pullrequestreview-908908772) for -some additional detail). The workaround is to install `tomli` prior to installing `orjson`. +Support for Python 3.11 should be considered experimental until further notice. PySTAC has a single required dependency (`python-dateutil`). PySTAC can be installed from pip or the source repository. From 47f77eb1fb36257508e914e4f0726689d3ca3cd6 Mon Sep 17 00:00:00 2001 From: Jon Duckworth Date: Thu, 17 Mar 2022 12:27:15 -0400 Subject: [PATCH 6/6] Add note on failing orjson install in Python 3.11 --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 50d23b0de..07aa7291e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,9 @@ Note that while we support Python 3.10.\*, wheels for the `orjson` library are n platforms. If you install PySTAC with the `orjson` extra, you may need to have the Rust toolchain installed (e.g. via [rustup](https://rustup.rs/)) in order to build the package from source. -Support for Python 3.11 should be considered experimental until further notice. +Support for Python 3.11 should be considered experimental until further notice. There is a known issue with failing build of `orjson` on 3.11.0 alpha releases prior to alpha.6 (see +[#765(comment)](https://github.com/stac-utils/pystac/pull/765#pullrequestreview-908908772) for +some additional detail). PySTAC has a single required dependency (`python-dateutil`). PySTAC can be installed from pip or the source repository.