From 8ba7be9946468c1227cfa93225792cd2a138aa6f Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 8 Jan 2025 09:43:53 +0100 Subject: [PATCH 1/8] Set poetry version to `1.8.5` --- .github/workflows/checks.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index dab3ceb8c..3bd87e3f7 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -6,6 +6,7 @@ env: DEVNET_SHA: 7e7dbb5 LEDGER_APP_SHA: dd58c5c LEDGER_APP_DEV_TOOLS_SHA: a037d42181f4bed9694246256e2c9e2a899e775c302a9c6482c81f87c28e1432 + POETRY_VERSION: "1.8.5" on: push: @@ -31,7 +32,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python 3.12 @@ -84,7 +85,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -165,7 +166,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -277,7 +278,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python 3.12 @@ -364,7 +365,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -426,7 +427,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -493,7 +494,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} From d8cab894dd33ac4f980e90ca902aec39cff4eb95 Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 8 Jan 2025 10:16:21 +0100 Subject: [PATCH 2/8] Temporarily bring back poetry to latest version --- .github/workflows/checks.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3bd87e3f7..dab3ceb8c 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -6,7 +6,6 @@ env: DEVNET_SHA: 7e7dbb5 LEDGER_APP_SHA: dd58c5c LEDGER_APP_DEV_TOOLS_SHA: a037d42181f4bed9694246256e2c9e2a899e775c302a9c6482c81f87c28e1432 - POETRY_VERSION: "1.8.5" on: push: @@ -32,7 +31,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python 3.12 @@ -85,7 +84,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -166,7 +165,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -278,7 +277,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python 3.12 @@ -365,7 +364,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -427,7 +426,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -494,7 +493,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} From 07c893cc27c288615ab440fb641348e440e7832a Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 8 Jan 2025 10:16:49 +0100 Subject: [PATCH 3/8] Revert "Temporarily bring back poetry to latest version" This reverts commit d8cab894dd33ac4f980e90ca902aec39cff4eb95. --- .github/workflows/checks.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index dab3ceb8c..3bd87e3f7 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -6,6 +6,7 @@ env: DEVNET_SHA: 7e7dbb5 LEDGER_APP_SHA: dd58c5c LEDGER_APP_DEV_TOOLS_SHA: a037d42181f4bed9694246256e2c9e2a899e775c302a9c6482c81f87c28e1432 + POETRY_VERSION: "1.8.5" on: push: @@ -31,7 +32,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python 3.12 @@ -84,7 +85,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -165,7 +166,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -277,7 +278,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python 3.12 @@ -364,7 +365,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -426,7 +427,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -493,7 +494,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry + pip install poetry==${{ env.POETRY_VERSION }} poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} From f247f213597b6341180f7f873dcc09e1db1a9f4f Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 8 Jan 2025 14:53:55 +0100 Subject: [PATCH 4/8] Use latest poetry; Require python >= 3.9 --- .github/workflows/checks.yml | 17 ++++++++--------- pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3bd87e3f7..95a3dfa31 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -6,7 +6,6 @@ env: DEVNET_SHA: 7e7dbb5 LEDGER_APP_SHA: dd58c5c LEDGER_APP_DEV_TOOLS_SHA: a037d42181f4bed9694246256e2c9e2a899e775c302a9c6482c81f87c28e1432 - POETRY_VERSION: "1.8.5" on: push: @@ -32,7 +31,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python 3.12 @@ -47,7 +46,7 @@ jobs: - name: Check poetry.lock run: | - poetry lock --check + poetry check --lock - name: Lint run: | @@ -85,7 +84,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -166,7 +165,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -278,7 +277,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python 3.12 @@ -365,7 +364,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -427,7 +426,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} @@ -494,7 +493,7 @@ jobs: - name: Install poetry run: | python -m pip install --upgrade pip - pip install poetry==${{ env.POETRY_VERSION }} + pip install poetry poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} diff --git a/pyproject.toml b/pyproject.toml index 508830be8..26e87c355 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ repository = "https://github.com/software-mansion/starknet.py" documentation = "https://starknetpy.rtfd.io/" [tool.poetry.dependencies] -python = ">=3.8, <3.13" +python = ">=3.9, <3.13" asgiref = "^3.4.1" marshmallow = "^3.15.0" marshmallow-oneofschema = "3.1.1" From 777db985e08c9d572bbf6eb399b0ca439358a29b Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 8 Jan 2025 14:56:10 +0100 Subject: [PATCH 5/8] Run `poetry lock --no-update` --- poetry.lock | 44 +++----------------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/poetry.lock b/poetry.lock index c7998882d..b145aa7bd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "aiohappyeyeballs" @@ -281,9 +281,6 @@ files = [ {file = "babel-2.16.0.tar.gz", hash = "sha256:d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316"}, ] -[package.dependencies] -pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} - [package.extras] dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] @@ -1175,8 +1172,6 @@ files = [ ] [package.dependencies] -importlib-metadata = {version = ">=3.6.0", markers = "python_version < \"3.9\""} -importlib-resources = {version = ">=3.0.0", markers = "python_version < \"3.9\""} natsort = ">=7.0.1" typing-extensions = ">=3.7.4.1" @@ -1642,28 +1637,6 @@ doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linke perf = ["ipython"] test = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] -[[package]] -name = "importlib-resources" -version = "6.4.4" -description = "Read resources from Python packages" -optional = true -python-versions = ">=3.8" -files = [ - {file = "importlib_resources-6.4.4-py3-none-any.whl", hash = "sha256:dda242603d1c9cd836c3368b1174ed74cb4049ecd209e7a1a0104620c18c5c11"}, - {file = "importlib_resources-6.4.4.tar.gz", hash = "sha256:20600c8b7361938dc0bb2d5ec0297802e575df486f5a544fa414da65e13721f7"}, -] - -[package.dependencies] -zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} - -[package.extras] -check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"] -cover = ["pytest-cov"] -doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -enabler = ["pytest-enabler (>=2.2)"] -test = ["jaraco.test (>=5.4)", "pytest (>=6,!=8.1.*)", "zipp (>=3.17)"] -type = ["pytest-mypy"] - [[package]] name = "iniconfig" version = "2.0.0" @@ -2757,17 +2730,6 @@ files = [ [package.extras] cli = ["click (>=5.0)"] -[[package]] -name = "pytz" -version = "2024.1" -description = "World timezone definitions, modern and historical" -optional = true -python-versions = "*" -files = [ - {file = "pytz-2024.1-py2.py3-none-any.whl", hash = "sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319"}, - {file = "pytz-2024.1.tar.gz", hash = "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812"}, -] - [[package]] name = "pywin32" version = "306" @@ -3455,5 +3417,5 @@ ledger = ["bip-utils", "ledgerwallet"] [metadata] lock-version = "2.0" -python-versions = ">=3.8, <3.13" -content-hash = "d425fc5f86d5b80aa33b8cf00cb83ea541e0960268770978dd8daa257fc7c955" +python-versions = ">=3.9, <3.13" +content-hash = "d3f3941a1e884d731220a446e343e2c8142ed8e6f963b297591e2269cd77d648" From d57748f92222fdcd55b52cc8748873abf71cc9dc Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 8 Jan 2025 15:04:56 +0100 Subject: [PATCH 6/8] Remove poetry configuration of `modern-installation` --- .github/workflows/checks.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 95a3dfa31..8ced05440 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -32,7 +32,6 @@ jobs: run: | python -m pip install --upgrade pip pip install poetry - poetry config installer.modern-installation false - name: Set up Python 3.12 uses: actions/setup-python@v4 @@ -85,7 +84,6 @@ jobs: run: | python -m pip install --upgrade pip pip install poetry - poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 @@ -166,7 +164,6 @@ jobs: run: | python -m pip install --upgrade pip pip install poetry - poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 @@ -278,7 +275,6 @@ jobs: run: | python -m pip install --upgrade pip pip install poetry - poetry config installer.modern-installation false - name: Set up Python 3.12 uses: actions/setup-python@v4 @@ -365,7 +361,6 @@ jobs: run: | python -m pip install --upgrade pip pip install poetry - poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 @@ -427,7 +422,6 @@ jobs: run: | python -m pip install --upgrade pip pip install poetry - poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 @@ -494,7 +488,6 @@ jobs: run: | python -m pip install --upgrade pip pip install poetry - poetry config installer.modern-installation false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 From b4833c94d49b6a4495282d2341f194a239e95a08 Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 8 Jan 2025 15:40:07 +0100 Subject: [PATCH 7/8] Add `poetry self add poetry-plugin-export` in docs workflow --- .readthedocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index a4d4a4949..07a510124 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,6 +9,7 @@ build: jobs: pre_install: - pip install poetry + - poetry self add poetry-plugin-export - poetry export -f requirements.txt --output requirements.txt --without-hashes -E docs -E ledger sphinx: From 76e36eab3a4d6bad1acddd9238ecb4b287312f44 Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 8 Jan 2025 16:10:28 +0100 Subject: [PATCH 8/8] Update migration guide --- docs/migration_guide.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/migration_guide.rst b/docs/migration_guide.rst index 3132611d8..04e434230 100644 --- a/docs/migration_guide.rst +++ b/docs/migration_guide.rst @@ -5,6 +5,8 @@ Migration guide [unreleased] Migration guide ****************************** +This version of starknet.py requires Python 3.9 as a minimum version. + [unreleased] Minor changes --------------------------