diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index acf167678b..d5266fae1c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -69,6 +69,7 @@ RUN apt-get update -y && apt-get install -y \ RUN pip3 install -U \ # Required by setup.py setuptools==50.3.2 \ + 'pyzmq==22.3.0'\ # Linting tools pep8==1.7.1 \ pep8-naming==0.6.1 \ @@ -78,4 +79,4 @@ RUN pip3 install -U \ # install rake RUN gem install --no-document rake ## install fpm; needs to be pinned to 1.13.1 because some packages cannot be built with the newest release 1.14.0 -RUN gem install --no-document fpm -v 1.13.1 \ No newline at end of file +RUN gem install --no-document fpm -v 1.14.2 \ No newline at end of file diff --git a/.github/workflows/build/Dockerfile.ubuntu-2004 b/.github/workflows/build/Dockerfile.ubuntu-2004 index 13bf109d57..119806eef4 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2004 +++ b/.github/workflows/build/Dockerfile.ubuntu-2004 @@ -69,7 +69,7 @@ RUN pip3 install -U \ # install rake RUN gem install --no-document rake ## install fpm; needs to be pinned to 1.13.1 because some packages cannot be built with the newest release 1.14.0 -RUN gem install --no-document fpm -v 1.13.1 +RUN gem install --no-document fpm -v 1.14.2 RUN apt-get -y autoremove \ && rm -rf /var/lib/apt/lists/* diff --git a/.github/workflows/reuseable_test.yaml b/.github/workflows/reuseable_test.yaml index e66ff434b1..cbc77d0901 100644 --- a/.github/workflows/reuseable_test.yaml +++ b/.github/workflows/reuseable_test.yaml @@ -56,7 +56,7 @@ jobs: - name: Publish Test Report if: success() || failure() - uses: scacap/action-surefire-report@v1.0.7 + uses: scacap/action-surefire-report@v1 continue-on-error: true with: check_name: Indy Plenum ${{ matrix.module }} Test Report for slice ${{ matrix.slice }}/${{ strategy.job-total }} @@ -108,7 +108,7 @@ jobs: run: python3 -m pytest -l -vv --junitxml=test-result-plenum-${{ matrix.module }}.xml ${{ matrix.module }} - name: Publish Test Report - uses: scacap/action-surefire-report@v1.0.7 + uses: scacap/action-surefire-report@v1 continue-on-error: true with: check_name: Indy Plenum ${{ matrix.module }} Test Report diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index d08ef9d532..a0864b7a6e 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,4 +1,4 @@ -FROM gitpod/workspace-full as base +FROM gitpod/workspace-base:2022-12-09-04-00-52 as base USER gitpod @@ -65,9 +65,10 @@ RUN pip3 install -U \ # Linting tools pep8==1.7.1 \ pep8-naming==0.6.1 \ + 'pyzmq==22.3.0'\ flake8==3.8.4 # install rake RUN sudo gem install --no-document rake ## install fpm; needs to be pinned to 1.13.1 because some packages cannot be built with the newest release 1.14.0 -RUN sudo gem install --no-document fpm -v 1.13.1 \ No newline at end of file +RUN sudo gem install --no-document fpm -v 1.14.2 \ No newline at end of file diff --git a/build-scripts/ubuntu-2004/build-3rd-parties.sh b/build-scripts/ubuntu-2004/build-3rd-parties.sh index 0268f021a9..de599fb5ab 100755 --- a/build-scripts/ubuntu-2004/build-3rd-parties.sh +++ b/build-scripts/ubuntu-2004/build-3rd-parties.sh @@ -110,7 +110,7 @@ build_from_pypi leveldb build_from_pypi libnacl 1.6.1 build_from_pypi msgpack-python build_from_pypi orderedset -build_from_pypi packaging +build_from_pypi packaging 21.3 build_from_pypi portalocker build_from_pypi prompt-toolkit 3.0.18 build_from_pypi psutil diff --git a/setup.py b/setup.py index 92f9368e3a..f2251f5d4e 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ exec(f.read(), metadata) tests_require = ['attrs==20.3.0', 'pytest==6.2.2', 'pytest-xdist==2.2.1', 'pytest-forked==1.3.0', - 'python3-indy==1.15.0-dev-1625', 'pytest-asyncio==0.14.0'] + 'python3-indy==1.16.0.post236', 'pytest-asyncio==0.14.0'] class PyZMQCommand(distutils.cmd.Command): @@ -156,4 +156,4 @@ def run(self): 'scripts/init_bls_keys', 'scripts/process_logs/process_logs', 'scripts/process_logs/process_logs.yml'] -) \ No newline at end of file +)