aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2018-10-11 20:08:23 -0700
committerMicah Lee <micah@micahflee.com>2018-10-11 20:08:23 -0700
commitb91f1d71bb9f3c5376b43011d948112e86eed50b (patch)
treef1a9827dbcac2df268e149068b8ab0f0f60d359d
parentf8f705313b01386c5d8ab708d8d4034bf19f5d8c (diff)
downloadonionshare-b91f1d71bb9f3c5376b43011d948112e86eed50b.tar.gz
onionshare-b91f1d71bb9f3c5376b43011d948112e86eed50b.zip
Bump python required version down to 3.5.3, and finish removing python3-nacl as a dependency
-rw-r--r--.travis.yml1
-rw-r--r--BUILD.md12
-rwxr-xr-xinstall/build_rpm.sh2
-rw-r--r--stdeb.cfg6
4 files changed, 14 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index e0b5b822..53fd661c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
dist: trusty
sudo: required
python:
+ - "3.5.3"
- "3.6"
- "3.6-dev"
- "3.7-dev"
diff --git a/BUILD.md b/BUILD.md
index 00d24cd2..c47dc427 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -11,11 +11,17 @@ cd onionshare
Install the needed dependencies:
-For Debian-like distros: `apt install -y python3-flask python3-stem python3-pyqt5 python3-cryptography python3-crypto python3-nacl python3-socks python-nautilus tor obfs4proxy python3-pytest build-essential fakeroot python3-all python3-stdeb dh-python`
+For Debian-like distros:
-On some older versions of Debian you may need to install pysha3 with `pip3 install pysha3` if python3-sha3 is not available.
+```
+apt install -y python3-flask python3-stem python3-pyqt5 python3-cryptography python3-crypto python3-socks python-nautilus tor obfs4proxy python3-pytest build-essential fakeroot python3-all python3-stdeb dh-python
+```
+
+For Fedora-like distros:
-For Fedora-like distros: `dnf install -y python3-flask python3-stem python3-qt5 python3-pynacl python3-cryptography python3-crypto python3-pysocks nautilus-python tor obfs4 python3-pytest rpm-build`
+```
+dnf install -y python3-flask python3-stem python3-qt5 python3-cryptography python3-crypto python3-pysocks nautilus-python tor obfs4 python3-pytest rpm-build
+```
After that you can try both the CLI and the GUI version of OnionShare:
diff --git a/install/build_rpm.sh b/install/build_rpm.sh
index 3f7a68ac..7a34b271 100755
--- a/install/build_rpm.sh
+++ b/install/build_rpm.sh
@@ -9,7 +9,7 @@ VERSION=`cat share/version.txt`
rm -r build dist >/dev/null 2>&1
# build binary package
-python3 setup.py bdist_rpm --requires="python3-flask, python3-stem, python3-qt5, python3-pynacl, python3-cryptography, python3-crypto, python3-pysocks, nautilus-python, tor, obfs4"
+python3 setup.py bdist_rpm --requires="python3-flask, python3-stem, python3-qt5, python3-cryptography, python3-crypto, python3-pysocks, nautilus-python, tor, obfs4"
# install it
echo ""
diff --git a/stdeb.cfg b/stdeb.cfg
index 2fc3d3bf..0980ef54 100644
--- a/stdeb.cfg
+++ b/stdeb.cfg
@@ -1,6 +1,6 @@
[DEFAULT]
Package3: onionshare
-Depends3: python3-flask, python3-stem, python3-pyqt5, python3-cryptography, python3-crypto, python3-nacl, python3-socks, python-nautilus, tor, obfs4proxy
-Build-Depends: python3-pytest, python3-flask, python3-stem, python3-pyqt5, python3-cryptography, python3-crypto, python3-nacl, python3-socks, python-nautilus, tor, obfs4proxy
+Depends3: python3-flask, python3-stem, python3-pyqt5, python3-cryptography, python3-crypto, python3-socks, python-nautilus, tor, obfs4proxy
+Build-Depends: python3-pytest, python3-flask, python3-stem, python3-pyqt5, python3-cryptography, python3-crypto, python3-socks, python-nautilus, tor, obfs4proxy
Suite: bionic
-X-Python3-Version: >= 3.6
+X-Python3-Version: >= 3.5.3