Browse Source

Use msgpack pip package everywhere

pull/489/merge
shortcutme 4 years ago
parent
commit
bca5d8a6c5
No known key found for this signature in database GPG Key ID: 5B63BAE6CB9613AE
  1. 2
      Dockerfile
  2. 2
      README-ru.md
  3. 2
      README-zh-cn.md
  4. 2
      Vagrantfile
  5. 2
      src/Connection/ConnectionServer.py

2
Dockerfile

@ -6,7 +6,7 @@ ENV HOME /root
#Install ZeroNet
RUN apk --update upgrade \
&& apk --no-cache --no-progress add musl-dev gcc python python-dev py2-pip tor \
&& pip install gevent msgpack-python \
&& pip install gevent msgpack \
&& apk del musl-dev gcc python-dev py2-pip \
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/* \
&& echo "ControlPort 9051" >> /etc/tor/torrc \

2
README-ru.md

@ -138,7 +138,7 @@ article](https://wiki.archlinux.org/index.php/ZeroNet) для дальнейше
* `virtualenv env`
* `source env/bin/activate`
* `pip install msgpack-python gevent`
* `pip install msgpack gevent`
* `python2 zeronet.py`
* Откройте http://127.0.0.1:43110/ в вашем браузере.

2
README-zh-cn.md

@ -112,7 +112,7 @@
* `virtualenv env`
* `source env/bin/activate`
* `pip install msgpack-python gevent`
* `pip install msgpack gevent`
* `python2 zeronet.py`
* 在你的浏览器中打开 http://127.0.0.1:43110/

2
Vagrantfile

@ -40,6 +40,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision "shell",
inline: "sudo apt-get install msgpack-python python-gevent python-pip python-dev -y"
config.vm.provision "shell",
inline: "sudo pip install msgpack-python --upgrade"
inline: "sudo pip install msgpack --upgrade"
end

2
src/Connection/ConnectionServer.py

@ -56,7 +56,7 @@ class ConnectionServer(object):
# Check msgpack version
if msgpack.version[0] == 0 and msgpack.version[1] < 4:
self.log.error(
"Error: Unsupported msgpack version: %s (<0.4.0), please run `sudo apt-get install python-pip; sudo pip install msgpack-python --upgrade`" %
"Error: Unsupported msgpack version: %s (<0.4.0), please run `sudo apt-get install python-pip; sudo pip install msgpack --upgrade`" %
str(msgpack.version)
)
sys.exit(0)

Loading…
Cancel
Save