Skip to content

Commit

Permalink
Problem: Node operators with Python 3.12 version cannot install the p…
Browse files Browse the repository at this point in the history
…ackage.

Solution: Upgrade dependencies to be able to use Python 3.12.
  • Loading branch information
Andres D. Molins authored and Psycojoker committed Jul 11, 2024
1 parent d40c1f5 commit 70ebfbf
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
# Fetch the whole history for all tags and branches (required for aleph.__version__)
fetch-depth: 0

- name: Set up Python 3.11
- name: Set up Python 3.12
id: setup-python
uses: actions/setup-python@v2
with:
python-version: 3.11
python-version: 3.12

- name: Install latest Rust nightly toolchain
uses: actions-rs/toolchain@v1
Expand Down
12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "hatchling.build"
name = "pyaleph"
dynamic = ["version"]
description = "Reference implementation of Aleph.im next generation network of decentralized big data applications."
requires-python = ">=3.11,<3.12"
requires-python = ">=3.12,<3.13"
readme = "README.md"
license = { file = "LICENSE.txt" }
authors = [
Expand All @@ -21,15 +21,15 @@ dependencies = [
"aiocache==0.12.2",
"aiohttp-cors==0.7.0",
"aiohttp-jinja2==1.5",
"aiohttp==3.8.4",
"aiohttp==3.9.5",
"aioipfs@git+https://github.com/aleph-im/aioipfs.git@d671c79b2871bb4d6c8877ba1e7f3ffbe7d20b71",
"alembic==1.12.1",
"aleph-message==0.4.2",
"aleph-p2p-client@git+https://github.com/aleph-im/p2p-service-client-python@2c04af39c566217f629fd89505ffc3270fba8676",
"aleph-pytezos@git+https://github.com/aleph-im/aleph-pytezos.git@32dd1749a4773da494275709060632cbeba9a51b",
"asyncpg==0.28.0",
"base58>=1.0.3",
"coincurve==18.0.0",
"coincurve==20.0.0",
"configmanager==1.35.1",
"configparser==6.0.0",
"cosmospy==6.0.0",
Expand All @@ -48,13 +48,13 @@ dependencies = [
"pynacl==1.5.0",
"python-dateutil==2.8.2",
"pytz==2023.3",
"pyyaml==6.0",
"pyyaml==6.0.1",
"redis[hiredis]==5.0.1",
"requests==2.31.0",
"secp256k1==0.14.0",
"sentry-sdk==1.34.0",
"setproctitle==1.3.3",
"sqlalchemy[mypy]==1.4.41",
"sqlalchemy[mypy]==1.4.52",
"sqlalchemy-utils==0.38.3",
"substrate-interface==1.7.4",
"ujson==5.1.0", # required by aiocache
Expand Down Expand Up @@ -185,7 +185,7 @@ all = [
]

[tool.mypy]
python_version = 3.11
python_version = 3.12
mypy_path = "src"
plugins = [
"sqlalchemy.ext.mypy.plugin",
Expand Down
14 changes: 7 additions & 7 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ pkgs.mkShell {
pkgs.hatch
pkgs.rustup

pkgs.python311
pkgs.python311Packages.virtualenv
pkgs.python311Packages.pip
pkgs.python311Packages.setuptools
pkgs.python312
pkgs.python312Packages.virtualenv
pkgs.python312Packages.pip
pkgs.python312Packages.setuptools

pkgs.python311Packages.secp256k1
pkgs.python311Packages.fastecdsa
pkgs.python311Packages.greenlet
pkgs.python312Packages.secp256k1
pkgs.python312Packages.fastecdsa
pkgs.python312Packages.greenlet
];

shellHook = ''
Expand Down
2 changes: 1 addition & 1 deletion tests/api/test_p2p.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ async def test_post_message_sync(ccn_api_client, mocker):
assert pub_status["failed"] == []

# Check that we cleaned up the queue
assert mocked_queue.delete.called_once
mocked_queue.assert_called_once()
2 changes: 1 addition & 1 deletion tests/storage/test_store_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ async def test_handle_new_storage_file(
assert stored_file.type == FileType.FILE
assert stored_file.size == len(raw_content)

assert get_hash_content_mock.called_once
get_hash_content_mock.assert_called_once()


@pytest.mark.asyncio
Expand Down

0 comments on commit 70ebfbf

Please sign in to comment.