2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-14 09:14:04 +00:00
Commit Graph

1080 Commits

Author SHA1 Message Date
Rushabh Mehta
0f2c490066 Merge branch 'master' into minor 2017-08-17 15:41:49 +05:30
vishalseshagiri
753c739d8b Added docker repo link to README.md (#471)
* Added docker repo link to README.md

* Update README.md

* Update README.md
2017-08-17 15:35:00 +05:30
Agus Syahputra
6b50f4c220 Update README.md (#462) 2017-08-03 16:34:18 +05:30
Rushabh Mehta
aea6bf5e4b Develop (#463)
* Add arguments for mysql_root_password and admin_password
Consider existing passwords.txt

* Remove duplicated --overwrite after rebase

* python 3 compatible changes for `update_npm_packages` (#434)

* Fix travis (#446)

* python 3 compatible changes for `update_npm_packages`

* install urllib3 pyOpenSSL ndg-httpsclient pyasn1 to fix wkhtmltopdf download failure on Travis

* use latest version of ansible

* test should look for mysqlclient-1.3.10 not mysqlclient-1.3.8

* `exec_cmd` causes TypeError on Python 3 (#451) (#452)

* python 3 compatible changes for `update_npm_packages`

* add universal_newlines=True to Popen

* Added docker specific changes to bench (#460)

* Added skip_bench_mkdir flag

* added skip_bench_mkdir and skip_redis_config_generation

* Removed the brackets around not in the utils.py/redis.generate_config()

* Replace lines 56-61 in utils.py since the tests failed.

* Reinstated lines 56-61

* printing the dirname

* Removed the rogue break

* Update utils.py
2017-08-03 16:33:57 +05:30
Saurabh
c9c75bda17 Merge pull request #449 from saurabh6790/staging_release_build
command to staging branch from develop brach
2017-07-26 13:04:39 +05:30
Saurabh
ce4a02b224 [fix] to make compatible with new release functionality 2017-07-25 18:00:54 +05:30
Saurabh
9b99b1d34f command to staging branch from develop brach 2017-07-25 16:50:13 +05:30
Saurabh
abae508cb9 Merge pull request #450 from saurabh6790/release_from_staging
[fix] provision to handle release from staging branch
2017-07-25 15:53:19 +05:30
Saurabh
25b96886ad [fix] keyword fixes, use from-branch for develop and to-branch for master. Configure branches to update via common_site_config 2017-07-25 13:09:12 +05:30
Saurabh
8632817268 [fix] provision to handle release from staging branch 2017-07-25 13:09:12 +05:30
Saurabh
102bda273b Merge pull request #457 from saurabh6790/branching_details
[test-case][fix] for mysqlclient version check
2017-07-25 13:08:18 +05:30
Saurabh
756d4b0817 [test-case][fix] for mysqlclient version check 2017-07-25 12:32:15 +05:30
Saurabh
909c677e32 Merge pull request #455 from saurabh6790/branching_details
[fix] detailed release policy
2017-07-24 15:29:11 +05:30
Saurabh
f9e3dedf3b [fix] detailed release policy 2017-07-24 15:26:34 +05:30
Saurabh
cc6c58ed3c Merge pull request #454 from saurabh6790/branching_details
[fix] typo fix
2017-07-24 12:47:10 +05:30
Saurabh
12fbd8aea0 [fix] typo fix 2017-07-24 12:46:18 +05:30
Saurabh
f3cc754f73 Merge pull request #453 from saurabh6790/branching_details
[fix] branching details
2017-07-24 12:44:22 +05:30
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
Rushabh Mehta
794287d971 [fixes] 2017-07-05 09:19:01 +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
hansel
549d442aa7 use certbot with -n option
allows us to use yes | bench setup lets-encrypt {clientsite}

it gets rid of certbot prompt

Cert not yet due for renewal

You have an existing certificate that has exactly the same domains or certificate name you requested and isn't close to expiry.
(ref: /etc/letsencrypt/renewal/stupidclientid.erp.openb.net.conf)

What would you like to do?
-------------------------------------------------------------------------------
1: Keep the existing certificate for now
2: Renew & replace the cert (limit ~5 per 7 days)
-------------------------------------------------------------------------------

automatically chooses option 1
2017-06-06 12:40:11 +08:00
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