diff options
| author | Joan Touzet <wohali@apache.org> | 2018-11-27 19:29:42 -0500 |
|---|---|---|
| committer | Joan Touzet <joant@atypical.net> | 2018-11-27 21:15:12 -0500 |
| commit | d0f76b9f7f93e3843c8bc202dacc5e082e571547 (patch) | |
| tree | f0aa0d43ad74b6fbb011bcb86626ab5716ba94e2 | |
| parent | 9870a7c0aa1801bd30f19f8abfc3fbe8d45bae12 (diff) | |
| download | couchdb-switch-scripts-to-python3.tar.gz | |
Don't use activate script; Windows fixesswitch-scripts-to-python3
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | Makefile.win | 5 | ||||
| -rw-r--r-- | README-DEV.rst | 4 | ||||
| -rw-r--r-- | src/mango/test/README.md | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 1349e986e..a8ed1d5a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: erlang -sudo: false - os: linux +dist: trusty + otp_release: - 21.1 - 20.3 @@ -18,16 +18,14 @@ addons: - libicu-dev - libmozjs185-dev - pkg-config - - python-requests - - python-sphinx - - python-virtualenv + - python3 + - python3-requests + - python3-sphinx + - python3.4-venv # - sphinx-rtd-theme - help2man - shunit2 -python: - - "3.4" - git: depth: 10 @@ -281,10 +281,9 @@ build-test: # target: mango-test - Run Mango tests mango-test: devclean all @cd src/mango && \ - virtualenv --python=python3 venv && \ - . ./venv/bin/activate && \ - pip3 install -r requirements.txt - @cd src/mango && ../../dev/run -n 1 --admin=testuser:testpass ./venv/bin/nosetests + python3 -m venv venv && \ + venv/bin/pip3 install -r requirements.txt + @cd src/mango && ../../dev/run -n 1 --admin=testuser:testpass venv/bin/nosetests ################################################################################ # Developing diff --git a/Makefile.win b/Makefile.win index e93445e59..6b62ba9fd 100644 --- a/Makefile.win +++ b/Makefile.win @@ -201,7 +201,10 @@ endif .PHONY: mango-test mango-test: devclean all - @cd src\mango && ..\..\dev\run -n 1 --admin=testuser:testpass nosetests + @cd src\mango && \ + python.exe -m venv venv && \ + venv\Scripts\pip.exe install -r requirements.txt + @cd src\mango && venv\Scripts\python.exe ..\..\dev\run -n 1 --admin=testuser:testpass venv\Scripts\nosetests .PHONY: check-qs diff --git a/README-DEV.rst b/README-DEV.rst index 7f483a7c7..f4031b767 100644 --- a/README-DEV.rst +++ b/README-DEV.rst @@ -57,7 +57,7 @@ Debian-based (inc. Ubuntu) Systems :: sudo apt-get install help2man python-sphinx gnupg nodejs npm \ - python3 python3-virtualenv + python3 python3-venv Gentoo-based Systems ~~~~~~~~~~~~~~~~~~~~ @@ -73,7 +73,7 @@ Centos 7 and RHEL 7 :: sudo yum install help2man python-sphinx python-docutils \ - python-pygments gnupg nodejs npm python34-virtualenv + python-pygments gnupg nodejs npm Mac OS X diff --git a/src/mango/test/README.md b/src/mango/test/README.md index 3e75f72d1..509e32e47 100644 --- a/src/mango/test/README.md +++ b/src/mango/test/README.md @@ -5,10 +5,10 @@ CouchDB should be started with `./dev/run -a testuser:testpass`. To run these, do this in the Mango top level directory: - $ virtualenv --python=python3 venv + $ python3 -m venv venv $ . venv/bin/activate $ pip3 install -r requirements.txt - $ ./venv/bin/nosetests + $ venv/bin/nosetests To run an individual test suite: nosetests --nocapture test/12-use-correct-index.py |