2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 00:06:36 +00:00
Commit Graph

911 Commits

Author SHA1 Message Date
Saurabh
c1767f8a43 [fix] branching details 2017-07-24 12:43:41 +05:30
Saurabh
3b2c1ca4b3 Merge pull request #448 from saurabh6790/bench-docs
[docs] documentation for release strategy and contribution guidelines
2017-07-21 19:35:05 +05:30
Saurabh
85e32346c3 [update] release documentation 2017-07-21 19:34:10 +05:30
Saurabh
8faf03988c [docs] documentation for release strategy and contribution guidelines 2017-07-19 18:18:41 +05:30
Saurabh
3a93dfa53d Merge pull request #436 from saurabh6790/sync_domains_fix
[fix] accept domains as tuple argument
2017-06-26 14:42:45 +05:30
Saurabh
0808b8ba24 Merge pull request #438 from sagarvora/fix-travis
[ci] use deprecated trusty build for now
2017-06-22 17:26:01 +05:30
Sagar Vora
48b82043c1 use deprecated trusty build for now 2017-06-22 16:26:58 +05:30
Saurabh
88bc56fed5 Merge pull request #435 from bohlian/patch-2
Installation fails for PDFKit - no module named six
2017-06-16 17:34:25 +05:30
Saurabh
7ae4f993d4 [fix] accept domains as tuple argument 2017-06-16 17:21:54 +05:30
Javier Wong
b9b38d4c35 Installation fails for PDFKit - no module named six
Get the following error when installing:

`./env/bin/pip install -e git+https://github.com/frappe/python-pdfkit.git#egg=pdfkit
Obtaining pdfkit from git+https://github.com/frappe/python-pdfkit.git#egg=pdfkit
  Updating ./env/src/pdfkit clone
Installing collected packages: pdfkit
  Running setup.py develop for pdfkit
    Complete output from command /home/strella/frappe-bench/env/bin/python -c "import setuptools, tokenize;__file__='/home/strella/frappe-bench/env/src/pdfkit/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" develop --no-deps:
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
      File "/home/strella/frappe-bench/env/src/pdfkit/setup.py", line 51, in <module>
        'Topic :: Utilities'
      File "/usr/lib/python2.7/distutils/core.py", line 137, in setup
        ok = dist.parse_command_line()
      File "/home/strella/frappe-bench/env/local/lib/python2.7/site-packages/setuptools/dist.py", line 363, in parse_command_line
        result = _Distribution.parse_command_line(self)
      File "/usr/lib/python2.7/distutils/dist.py", line 467, in parse_command_line
        args = self._parse_command_opts(parser, args)
      File "/home/strella/frappe-bench/env/local/lib/python2.7/site-packages/setuptools/dist.py", line 674, in _parse_command_opts
        nargs = _Distribution._parse_command_opts(self, parser, args)
      File "/usr/lib/python2.7/distutils/dist.py", line 523, in _parse_command_opts
        cmd_class = self.get_command_class(command)
      File "/home/strella/frappe-bench/env/local/lib/python2.7/site-packages/setuptools/dist.py", line 495, in get_command_class
        self.cmdclass[command] = cmdclass = ep.load()
      File "/home/strella/frappe-bench/env/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2303, in load
        return self.resolve()
      File "/home/strella/frappe-bench/env/local/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2309, in resolve
        module = __import__(self.module_name, fromlist=['__name__'], level=0)
      File "/home/strella/frappe-bench/env/local/lib/python2.7/site-packages/setuptools/command/develop.py", line 11, in <module>
        from setuptools.command.easy_install import easy_install
      File "/home/strella/frappe-bench/env/local/lib/python2.7/site-packages/setuptools/command/easy_install.py", line 49, in <module>
        from setuptools.py27compat import rmtree_safe
      File "/home/strella/frappe-bench/env/local/lib/python2.7/site-packages/setuptools/py27compat.py", line 7, in <module>
        import six
    ImportError: No module named six`
2017-06-16 08:46:56 +08:00
Makarand Bauskar
e968df3e39 [hotfix] get wkhtmltopdf from frappe/wkhtmltopdf repo, setup npm dependencies in bench init (#428) 2017-06-09 15:28:04 +05:30
Nabin Hait
bee3de44e4 Merge pull request #416 from frappe/develop
Develop to master
2017-05-25 15:08:51 +05:30
Sagar Vora
90cedf22fa Merge pull request #415 from frappe/file-watcher-port
Add file_watcher_port to common_site_config.json
2017-05-25 14:51:15 +05:30
Sagar Vora
31fb1d3da5 Merge pull request #414 from jevonearth/fix-wkhtolto-pdf-url
Use downloads.wkhtmltopdf.org instead of gna.org
2017-05-25 11:32:46 +05:30
Faris Ansari
726a8a5517 Add file_watcher_port to common_site_config.json 2017-05-25 11:23:38 +05:30
jevonearth
3a4da6b47e Use downloads.wkhtmltopdf.org instead of gna.org
gna.org is supposedly shutting down, and was unavailable for most of
today.
2017-05-24 10:47:15 -07:00
Revant Nandgaonkar
1aeb5078cc Merge pull request #398 from DRogue1337/develop
Add '--overwrite' flag to 'bench init' #396
2017-05-24 16:59:58 +05:30
Revant Nandgaonkar
00a42a4cd9 Merge pull request #412 from sagarvora/fix-travis
Fix travis error for mysql
2017-05-24 15:59:12 +05:30
Sagar Vora
fad1cbed50 Fix travis check for mysql 2017-05-23 12:39:35 +05:30
Sagar Vora
1a2376e8e2 Merge branch 'develop' of https://github.com/sagarvora/bench into fix-travis 2017-05-23 11:53:56 +05:30
Rushabh Mehta
b5a029033d Develop (#411)
* [fix] readme

* Removed swtich-to-v4 and switch-to-v5 commands

* consider passwords.txt (#408)

* Fixes bench release github username error (#406)

* ran 2to3 script

* Correct urllib.parse import

* Backward compatible urllib import

* removed test_setup_production_v6

* Fix bug global hashlib is not defined (#399)

* Don't need $query_string (#390)

* removed semicolon, click.prompt adds it

* Letsencrypt fix develop (#407)

* [Fix] Letsencrypt error - Please specify user or filename to write.

* Fix bug global hashlib is not defined (#399)

* Don't need $query_string (#390)

* [Fix] Issue #404 - write to system cron

* letsencrypt.py - renamed user_crontab to system_crontab

* Npm dependency management using package.json (#409)

* Fix bug global hashlib is not defined (#399)

* Don't need $query_string (#390)

* Develop (#400)

* [fix] readme

* Removed swtich-to-v4 and switch-to-v5 commands

* Add "bench setup babel" command

* Add "less" package

* Npm dependency management using package.json

* Add default package.json
2017-05-23 11:14:16 +05:30
Faris Ansari
b1e598f528 Npm dependency management using package.json (#409)
* Fix bug global hashlib is not defined (#399)

* Don't need $query_string (#390)

* Develop (#400)

* [fix] readme

* Removed swtich-to-v4 and switch-to-v5 commands

* Add "bench setup babel" command

* Add "less" package

* Npm dependency management using package.json

* Add default package.json
2017-05-23 11:12:18 +05:30
Revant Nandgaonkar
d53f2b07fd Letsencrypt fix develop (#407)
* [Fix] Letsencrypt error - Please specify user or filename to write.

* Fix bug global hashlib is not defined (#399)

* Don't need $query_string (#390)

* [Fix] Issue #404 - write to system cron

* letsencrypt.py - renamed user_crontab to system_crontab
2017-05-22 15:07:40 +05:30
Revant Nandgaonkar
de0d88c0fa Fixes bench release github username error (#406)
* ran 2to3 script

* Correct urllib.parse import

* Backward compatible urllib import

* removed test_setup_production_v6

* Fix bug global hashlib is not defined (#399)

* Don't need $query_string (#390)

* removed semicolon, click.prompt adds it
2017-05-22 15:07:21 +05:30
DRogue
485d10089a consider passwords.txt (#408) 2017-05-19 16:26:52 +05:30
Rushabh Mehta
a6a1ee9a82 Develop (#400)
* [fix] readme

* Removed swtich-to-v4 and switch-to-v5 commands
2017-05-19 16:25:51 +05:30
Daniel Weipert
6d2afdd9ec Add overwrite help message 2017-05-16 11:54:52 +02:00
Daniel Weipert
b38ba7f7b5 Remove bench dir for new install 2017-05-16 11:54:52 +02:00
Daniel Weipert
c21554519f Set directory permissions recursively 2017-05-16 11:54:52 +02:00
Daniel Weipert
a04f45b0d9 Add --overwrite argument 2017-05-16 11:54:52 +02:00
gmplab
a39fb1eb8d Don't need $query_string (#390) 2017-05-16 11:39:22 +05:30
Mạnh Tài
02e0743532 Fix bug global hashlib is not defined (#399) 2017-05-16 11:38:31 +05:30
Rushabh Mehta
a309747f24 Merge branch 'master' into develop 2017-05-16 11:38:06 +05:30
Rushabh Mehta
2f03e9f838 [fix] path 2017-05-10 14:30:54 +05:30
Nabin Hait
eeab0e8d25 Merge pull request #391 from rmehta/socket-2
[update] socketio
2017-05-10 14:00:47 +05:30
Rushabh Mehta
109a647633 [update] socketio 2017-05-10 13:44:36 +05:30
Nabin Hait
e3fa8c4423 Merge pull request #388 from saurabh6790/unicode_fix_for_domain_sync
[fix] check for unicode type while creating nginx conf
2017-04-26 11:28:09 +05:30
Saurabh
44a566b9ec [fix] check for unicode type while creating nginx conf 2017-04-25 12:29:41 +05:30
Nabin Hait
c1af9ca4e9 Removed swtich-to-v4 and switch-to-v5 commands 2017-04-18 14:52:14 +05:30
Revant Nandgaonkar
080ca173a6 ran 2to3 script (#381)
* ran 2to3 script

* Correct urllib.parse import

* Backward compatible urllib import

* removed test_setup_production_v6
2017-04-17 17:28:18 +05:30
Makarand Bauskar
a1587b783f [fixes] fixes in pull_all_apps so, bench update can backup and sync sites (#376) 2017-04-07 17:18:21 +05:30
robert schouten
c6e7477abf [hotfix] fix update reset (#374)
@rmehta
2017-04-07 13:33:25 +05:30
allan2
2a5289fce8 Update README.md (#352)
crontab was required for `bench init frappe-bench` to succeed.
`bench use site1.local` was also required for bench to start.
2017-04-05 12:21:50 +05:30
Yashodhan
27f50277c1 Corrected Guides URLs (#359)
- For issue #333 - [Change Hostname]
- [Stopping Production] - temporarily pointed to github wiki article
2017-04-05 12:20:01 +05:30
Elliot Schep
1a230cceb1 Proposed a number in README.md (#371)
Please preview the changes to see a full list.
2017-04-05 12:17:56 +05:30
Faris Ansari
7946d17cc1 less verbose app install (#369) 2017-04-05 12:17:22 +05:30
ckosiegbu
4eef5d1b1a Update pull_all_apps to use regex for check (#373)
pull_all_apps calls a "git status" and checks if the response contains "nothing to commit, working directory clean". However, it seems that at least some versions of git output the message "nothing to commit, working directory clean". This causes bench update to not work in systems where the output message uses "tree" instead of "directory". This update is to allow both strings to be used.
2017-04-05 12:16:58 +05:30
Rushabh Mehta
893b55991b fix message 2017-04-03 13:11:51 +05:30
Rushabh Mehta
4f37c6cf03 [enhance] check for uncommitted code before pulling 2017-04-03 12:56:53 +05:30
Nabin Hait
ae17b6b18d Merge pull request #357 from saurabh6790/shallow_clone
[fix] check shallow clone param in common site config too
2017-02-10 13:21:07 +05:30