Skip to content

Commit

Permalink
Update Version number for v1.13.1
Browse files Browse the repository at this point in the history
- Update version from release of v1.13.1
- Fix 3rd Party Dependency build issues
  - Pin portalocker to 2.7.0 which is the most recent release to still support setup.py.
  - Pin Cython to 0.29.36 to fix python-rocksdb build/install.

Signed-off-by: Wade Barnes <wade@neoterictech.ca>
  • Loading branch information
WadeBarnes committed Feb 6, 2024
1 parent 698b950 commit 33023fd
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ RUN pip3 install -U \
# Linting tools
pep8==1.7.1 \
pep8-naming==0.6.1 \
flake8==3.8.4
flake8==3.8.4 \
Cython==0.29.36


# install rake
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build/Dockerfile.ubuntu-2004
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/
RUN apt-get update -y && apt-get install -y \
# Python
python3-pip \
rubygems &&\
gem install --no-document fpm -v 1.14.2

rubygems && \
gem install --no-document fpm -v 1.14.2 && \
pip3 install Cython==0.29.36
16 changes: 8 additions & 8 deletions build-scripts/ubuntu-2004/build-3rd-parties.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function build_from_pypi {
--before-remove ${PREREM_TMP} \
--package ${OUTPUT_PATH} \
${PACKAGE_NAME}${PACKAGE_VERSION}

# --python-pip "$(which pip)" \
# ERROR: download_if_necessary': Unexpected directory layout after easy_install. Maybe file a bug? The directory is /tmp/package-python-build-c42d23109dcca1e98d9f430a04fe79a815f10d8ed7a719633aa969424f94 (RuntimeError)
fi
Expand All @@ -103,27 +103,27 @@ build_rocksdb_deb 5.8.8
build_from_pypi pyzmq 22.3.0 --zmq=bundled

##### install_requires
build_from_pypi base58
build_from_pypi base58
### Needs to be pinned to 3.10.1 because from v4.0.0 the package name ends in python3-importlib-metadata_0.0.0_amd64.deb
### https://github.com/hyperledger/indy-plenum/runs/4166593170?check_suite_focus=true#step:5:5304
build_from_pypi importlib-metadata 3.10.1
build_from_pypi ioflo
build_from_pypi ioflo
build_from_pypi jsonpickle
build_from_pypi leveldb
build_from_pypi leveldb
build_from_pypi libnacl 1.6.1
build_from_pypi msgpack-python
build_from_pypi orderedset
build_from_pypi packaging 21.3
build_from_pypi portalocker
build_from_pypi portalocker 2.7.0
build_from_pypi prompt-toolkit 3.0.18
build_from_pypi psutil
build_from_pypi psutil
build_from_pypi pympler 0.8
build_from_pypi python-dateutil
build_from_pypi python-rocksdb
build_from_pypi python-ursa 0.1.1
build_from_pypi rlp 0.6.0
build_from_pypi semver 2.13.0
build_from_pypi sha3
build_from_pypi six
build_from_pypi sha3
build_from_pypi six
build_from_pypi sortedcontainers 1.5.7
build_from_pypi ujson 1.33
2 changes: 1 addition & 1 deletion dev-setup/ubuntu/ubuntu-2004/SetupVMTest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
packaging==20.9 \
pip==9.0.3 \
pluggy==0.13.1 \
portalocker==2.2.1 \
portalocker==2.7.0 \
prompt-toolkit==3.0.16 \
psutil==5.6.6 \
py==1.10.0 \
Expand Down
2 changes: 1 addition & 1 deletion plenum/__version__.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[1, 13, 1, "rc", 4]
[1, 13, 1, "", ""]
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ def run(self):
'orderedset',
# 'packaging==20.9',
'packaging',
# 'portalocker==2.2.1',
'portalocker',
# Pinned because 3rd party dependency build fails with portalocker > 2.7.0',
'portalocker==2.7.0',
'prompt_toolkit>=3.0.18',
# 'psutil==5.6.6',
'psutil',
Expand Down

0 comments on commit 33023fd

Please sign in to comment.