Skip to content

Commit

Permalink
Merge pull request #1787 from WadeBarnes/update/distro-and-fpm-versions
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
swcurran authored Oct 26, 2022
2 parents 0dc0991 + a8a8f57 commit a8fb667
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ RUN pip3 install -U \

# install fpm
RUN gem install --no-document rake
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/*
2 changes: 1 addition & 1 deletion .github/workflows/build/Dockerfile.ubuntu-2004
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN pip3 install -U \

# install fpm
RUN gem install --no-document rake
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/*
2 changes: 1 addition & 1 deletion .gitpod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ RUN pip3 install -U \

# install fpm
RUN sudo gem install --no-document rake
RUN sudo gem install --no-document fpm -v 1.13.1
RUN sudo gem install --no-document fpm -v 1.14.2
4 changes: 2 additions & 2 deletions build-scripts/ubuntu-2004/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ RUN pip3 install -U \
setuptools==50.3.2 \
'pyzmq==22.3.0'


# install fpm
RUN gem install --no-document rake fpm
RUN gem install --no-document rake
RUN gem install --no-document fpm -v 1.14.2

RUN apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion build-scripts/ubuntu-2004/build-3rd-parties.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ SCRIPT_PATH="${BASH_SOURCE[0]}"
pushd `dirname ${SCRIPT_PATH}` >/dev/null

build_from_pypi timeout-decorator
build_from_pypi distro
build_from_pypi distro 1.7.0

popd >/dev/null
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
# https://github.com/hyperledger/indy-plenum/blob/eac38674252b539216be2c40bb13e53c5b70dad2/build-scripts/ubuntu-2004/build-3rd-parties.sh#L104-L106
'importlib-metadata==3.10.1',
'timeout-decorator>=0.5.0',
'distro>=1.5.0'],
'distro==1.7.0'],
setup_requires=['pytest-runner'],
extras_require={
'tests': tests_require
Expand Down

0 comments on commit a8fb667

Please sign in to comment.