2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-13 16:56:33 +00:00

Merge remote-tracking branch 'upstream/develop' into fix-crontab-backups

This commit is contained in:
Rohan Bansal 2020-07-06 16:52:39 +05:30
commit 10d913a051
3 changed files with 3 additions and 13 deletions

View File

@ -3,7 +3,7 @@ dist: bionic
sudo: true
git:
depth: 2
depth: 1
cache:
- pip
@ -70,16 +70,6 @@ matrix:
env: TEST=easy_install
script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
before_install:
- |
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
TRAVIS_COMMIT_RANGE="FETCH_HEAD...$TRAVIS_BRANCH"
fi
git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '\.md$|^docs' || {
echo "Only docs were updated, stopping build process."
exit
}
install:
- pip install urllib3 pyOpenSSL ndg-httpsclient pyasn1

View File

@ -32,7 +32,7 @@ def cli():
change_dir()
change_uid()
if is_dist_editable(bench.PROJECT_NAME) and len(sys.argv) > 1 and sys.argv[1] != "src":
if is_dist_editable(bench.PROJECT_NAME) and len(sys.argv) > 1 and sys.argv[1] != "src" and not get_config(".").get("developer_mode"):
log("bench is installed in editable mode!\n\nThis is not the recommended mode of installation for production. Instead, install the package from PyPI with: `pip install frappe-bench`\n", level=3)
if not is_bench_directory() and not cmd_requires_root() and len(sys.argv) > 1 and sys.argv[1] not in ("init", "find", "src"):

View File

@ -88,4 +88,4 @@ TLDR; Save the logs!
3. A lot of things can go wrong in setting up the environment due to prior settings, company protocols or even breaking changes in system packages and their dependencies.
4. Sharing your logfile in any issues opened related to this can help us find solutions to it faster and make the sript better!
4. Sharing your logfile in any issues opened related to this can help us find solutions to it faster and make the script better!