diff --git a/.travis.yml b/.travis.yml index 65802c43..6d324010 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ python: - "3.7-dev" - "nightly" # command to install dependencies -# before_install: "sudo apt-get update; sudo apt-get install -y python3-nose python3-flask python3-stem python3-pyqt5" install: - pip install Flask==0.12 stem==1.5.4 pytest-cov coveralls # command to run tests diff --git a/BUILD.md b/BUILD.md index 63a30a44..fc31ce3c 100644 --- a/BUILD.md +++ b/BUILD.md @@ -11,9 +11,9 @@ cd onionshare Install the needed dependencies: -For Debian-like distros: `apt install -y build-essential fakeroot python3-all python3-stdeb dh-python python3-flask python3-stem python3-pyqt5 python-nautilus python3-nose tor` +For Debian-like distros: `apt install -y build-essential fakeroot python3-all python3-stdeb dh-python python3-flask python3-stem python3-pyqt5 python-nautilus python3-pytest tor` -For Fedora-like distros: `dnf install -y rpm-build python3-flask python3-stem python3-qt5 nautilus-python tor` +For Fedora-like distros: `dnf install -y rpm-build python3-flask python3-stem python3-qt5 python3-pytest nautilus-python tor` After that you can try both the CLI and the GUI version of OnionShare: @@ -126,10 +126,8 @@ This will prompt you to codesign three binaries and execute one unsigned binary. ## Tests -OnionShare includes [nose](https://nose.readthedocs.org/en/latest/) unit tests. First, `sudo apt-get install python3-nose` or `sudo pip3 install nose`. - -To run the tests: +OnionShare includes PyTest unit tests. To run the tests: ```sh -nosetests3 test +pytest test/ ``` diff --git a/git-hooks/pre-push b/git-hooks/pre-push index 0ffd106c..1d8e57f8 100755 --- a/git-hooks/pre-push +++ b/git-hooks/pre-push @@ -2,5 +2,3 @@ # Pre-push hook. If you want to test with a different version of firefox, put # the path in the CFX_FIREFOX environment variable. - -nosetests test diff --git a/stdeb.cfg b/stdeb.cfg index 2e782824..cc811197 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,6 +1,6 @@ [DEFAULT] Package3: onionshare Depends3: python3-flask, python3-stem, python3-pyqt5, python-nautilus, tor -Build-Depends: python3-nose, python3-flask, python3-stem, python3-pyqt5 +Build-Depends: python3-pytest, python3-flask, python3-stem, python3-pyqt5 Suite: xenial X-Python3-Version: >= 3.4