diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3efe495e..e7d9e903 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -8,7 +8,7 @@ env: jobs: test-without-integration: runs-on: ubuntu-latest - container: quarkchaindocker/pyquarkchain:mainnet1.1.1 + container: quarkchaindocker/pyquarkchain:test-py3.13 steps: - uses: actions/checkout@v4 @@ -22,7 +22,7 @@ jobs: evm-tests-runner-1: runs-on: ubuntu-latest - container: quarkchaindocker/pyquarkchain:mainnet1.1.1 + container: quarkchaindocker/pyquarkchain:test-py3.13 steps: - uses: actions/checkout@v4 @@ -35,7 +35,7 @@ jobs: evm-tests-runner-2: runs-on: ubuntu-latest - container: quarkchaindocker/pyquarkchain:mainnet1.1.1 + container: quarkchaindocker/pyquarkchain:test-py3.13 steps: - uses: actions/checkout@v4 @@ -48,7 +48,7 @@ jobs: test-integration-and-qkc-specific-state: runs-on: ubuntu-latest - container: quarkchaindocker/pyquarkchain:mainnet1.1.1 + container: quarkchaindocker/pyquarkchain:test-py3.13 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/nightly-check-db.yml b/.github/workflows/nightly-check-db.yml index 4975b3dc..e07e1c90 100644 --- a/.github/workflows/nightly-check-db.yml +++ b/.github/workflows/nightly-check-db.yml @@ -10,7 +10,7 @@ env: jobs: download-snapshot-and-checkdb: runs-on: self-hosted - container: quarkchaindocker/pyquarkchain:mainnet1.6.1 + container: quarkchaindocker/pyquarkchain:test-py3.13 timeout-minutes: 4320 steps: diff --git a/mainnet/singularity/Dockerfile b/mainnet/singularity/Dockerfile index 6bd30191..265ceb24 100644 --- a/mainnet/singularity/Dockerfile +++ b/mainnet/singularity/Dockerfile @@ -1,7 +1,19 @@ -FROM python:3.7-buster +FROM python:3.13-slim LABEL maintainer="quarkchain" -RUN sed -i 's/deb.debian.org/archive.debian.org/' /etc/apt/sources.list +# install rocksdb RUN apt-get update && apt-get upgrade -y && apt-get install -y \ + build-essential \ + gcc \ + g++ \ + make \ + git \ + libbz2-dev \ + libgflags-dev \ + liblz4-dev \ + librocksdb-dev \ + libsnappy-dev \ + libzstd-dev \ + zlib1g-dev \ vim \ && rm -rf /var/lib/apt/lists/* # set up code @@ -17,6 +29,7 @@ RUN git checkout $GIT_TAG # py dep RUN pip install -r requirements.txt +RUN python setup.py build_ext --inplace # add qkchash c++ lib ADD https://s3-us-west-2.amazonaws.com/pyqkcmainnet/libqkchash.so /code/pyquarkchain/qkchash/ diff --git a/requirements.txt b/requirements.txt index e3ae6cfa..83cd2d29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,34 +1,31 @@ -aiohttp==3.1.3 -aioprocessing==1.0.1 -async_armor==0.0.2 -coincurve==7.1.0 -decorator==4.2.1 -ecdsa==0.13.3 -jsonrpcclient==2.5.2 -jsonrpcserver==3.5.4 -jsonrpc-async==0.6 -numpy==1.15.1 -psutil==5.6.6 -rocksdict==0.3.29 -requests==2.20.0 -aiohttp_cors==0.7.0 -eth-utils==1.2.0 -eth-keys==0.2.0b3 -eth-bloom==1.0.0 -pyethash>=0.1.27,<1.0.0 -py_ecc==1.4.3 -eth-hash[pycryptodome]==0.1.4 -pytest-timeout==1.3.3 -cachetools==3.1.1 -websockets==8.0.2 +aiohttp>=3.9 +aiohttp_cors>=0.7.0 +aioprocessing>=2.0 +cachetools>=5 +coincurve>=19.0.1 +decorator>=5 +ecdsa>=0.18 +eth-hash[pycryptodome]>=0.5,<0.6 +eth-utils>=2.3 +eth-keys>=0.5 +eth-bloom>=2.0 +httpx>=0.28 +Cython>=3 +setuptools>=80.8.0 +numpy>=1.26 +psutil>=6 +rocksdict>=0.3.24 +requests>=2.28.0 +py_ecc>=7 +pytest-timeout>=2.0.1 +websockets>=12 # p2p -pytest>=3.6,<3.7 -pytest-asyncio==0.9.0 -cryptography==2.3.1 -upnpclient==0.0.8 -netifaces==0.10.7 -rlp>=1.0.0,<2.0.0 +async-upnp-client>=0.38 +pytest>=8 +pytest-asyncio>=0.23 +cryptography>=42 +rlp>=3 # pyethapp/accounts.py dependency -pbkdf2 +pbkdf2>=1.3 diff --git a/setup.py b/setup.py index 314502a2..f084e0c2 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,6 @@ def read(fname): long_description=read("README.md"), classifiers=["Development Status :: 0 - Development", "License :: MIT License"], install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.13", cmdclass={"develop": custom_develop}, )