##// END OF EJS Templates
release: Merge default into stable for release preparation
milka -
r915:ed04aac5 merge stable
parent child
Show More
@@ -1,6 +1,5
1 [bumpversion]
1 [bumpversion]
2 current_version = 4.23.2
2 current_version = 4.24.0
3 message = release: Bump version {current_version} to {new_version}
3 message = release: Bump version {current_version} to {new_version}
4
4
5 [bumpversion:file:vcsserver/VERSION]
5 [bumpversion:file:vcsserver/VERSION]
6
@@ -5,12 +5,10 done = false
5 done = true
5 done = true
6
6
7 [task:fixes_on_stable]
7 [task:fixes_on_stable]
8 done = true
9
8
10 [task:pip2nix_generated]
9 [task:pip2nix_generated]
11 done = true
12
10
13 [release]
11 [release]
14 state = prepared
12 state = in_progress
15 version = 4.23.2
13 version = 4.24.0
16
14
@@ -1,28 +1,45
1
1 .DEFAULT_GOAL := help
2 .PHONY: clean test test-clean test-only generate-pkgs pip-packages
3
2
4 # set by: PATH_TO_OUTDATED_PACKAGES=/some/path/outdated_packages.py
3 # set by: PATH_TO_OUTDATED_PACKAGES=/some/path/outdated_packages.py
5 OUTDATED_PACKAGES = ${PATH_TO_OUTDATED_PACKAGES}
4 OUTDATED_PACKAGES = ${PATH_TO_OUTDATED_PACKAGES}
6
5
7 clean:
6 .PHONY: clean
7 clean: ## full clean
8 make test-clean
8 make test-clean
9 find . -type f \( -iname '*.c' -o -iname '*.pyc' -o -iname '*.so' -o -iname '*.orig' \) -exec rm '{}' ';'
9 find . -type f \( -iname '*.c' -o -iname '*.pyc' -o -iname '*.so' -o -iname '*.orig' \) -exec rm '{}' ';'
10
10
11 test:
11
12 .PHONY: test
13 test: ## run test-clean and tests
12 make test-clean
14 make test-clean
13 make test-only
15 make test-only
14
16
15 test-clean:
17
18 .PHONY:test-clean
19 test-clean: ## run test-clean and tests
16 rm -rf coverage.xml htmlcov junit.xml pylint.log result
20 rm -rf coverage.xml htmlcov junit.xml pylint.log result
17 find . -type d -name "__pycache__" -prune -exec rm -rf '{}' ';'
21 find . -type d -name "__pycache__" -prune -exec rm -rf '{}' ';'
22 find . -type f \( -iname '.coverage.*' \) -exec rm '{}' ';'
18
23
19 test-only:
24
25 .PHONY: test-only
26 test-only: ## run tests
20 PYTHONHASHSEED=random \
27 PYTHONHASHSEED=random \
21 py.test -x -vv -r xw -p no:sugar \
28 py.test -x -vv -r xw -p no:sugar \
22 --cov=vcsserver --cov-report=term-missing --cov-report=html vcsserver
29 --cov=vcsserver --cov-report=term-missing --cov-report=html \
30 vcsserver
23
31
24 generate-pkgs:
32
33 .PHONY: generate-pkgs
34 generate-pkgs: ## generate new python packages
25 nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
35 nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
26
36
27 pip-packages:
37
38 .PHONY: pip-packages
39 pip-packages: ## show outdated packages
28 python ${OUTDATED_PACKAGES}
40 python ${OUTDATED_PACKAGES}
41
42
43 .PHONY: help
44 help:
45 @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-24s\033[0m %s\n", $$1, $$2}'
@@ -762,11 +762,11 self: super: {
762 };
762 };
763 };
763 };
764 "redis" = super.buildPythonPackage {
764 "redis" = super.buildPythonPackage {
765 name = "redis-3.4.1";
765 name = "redis-3.5.3";
766 doCheck = false;
766 doCheck = false;
767 src = fetchurl {
767 src = fetchurl {
768 url = "https://files.pythonhosted.org/packages/ef/2e/2c0f59891db7db087a7eeaa79bc7c7f2c039e71a2b5b0a41391e9d462926/redis-3.4.1.tar.gz";
768 url = "https://files.pythonhosted.org/packages/b3/17/1e567ff78c83854e16b98694411fe6e08c3426af866ad11397cddceb80d3/redis-3.5.3.tar.gz";
769 sha256 = "07yaj0j9fs7xdkg5bg926fa990khyigjbp31si8ai20vj8sv7kqd";
769 sha256 = "0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2";
770 };
770 };
771 meta = {
771 meta = {
772 license = [ pkgs.lib.licenses.mit ];
772 license = [ pkgs.lib.licenses.mit ];
@@ -784,7 +784,7 self: super: {
784 };
784 };
785 };
785 };
786 "rhodecode-vcsserver" = super.buildPythonPackage {
786 "rhodecode-vcsserver" = super.buildPythonPackage {
787 name = "rhodecode-vcsserver-4.23.2";
787 name = "rhodecode-vcsserver-4.24.0";
788 buildInputs = [
788 buildInputs = [
789 self."pytest"
789 self."pytest"
790 self."py"
790 self."py"
@@ -20,7 +20,7 pyramid-mako==1.1.0
20 pygit2==0.28.2
20 pygit2==0.28.2
21
21
22 repoze.lru==0.7
22 repoze.lru==0.7
23 redis==3.4.1
23 redis==3.5.3
24 simplejson==3.16.0
24 simplejson==3.16.0
25 subprocess32==3.5.4
25 subprocess32==3.5.4
26 subvertpy==0.10.1
26 subvertpy==0.10.1
@@ -1,1 +1,1
1 4.23.2 No newline at end of file
1 4.24.0 No newline at end of file
@@ -25,6 +25,7 import wsgiref.util
25 import traceback
25 import traceback
26 import tempfile
26 import tempfile
27 import resource
27 import resource
28 import psutil
28 from itertools import chain
29 from itertools import chain
29 from cStringIO import StringIO
30 from cStringIO import StringIO
30
31
@@ -117,14 +118,21 def _string_setting(settings, name, defa
117 return settings[name]
118 return settings[name]
118
119
119
120
121 def log_max_fd():
122 try:
123 maxfd = psutil.Process().rlimit(psutil.RLIMIT_NOFILE)[1]
124 log.info('Max file descriptors value: %s', maxfd)
125 except Exception:
126 pass
127
128
120 class VCS(object):
129 class VCS(object):
121 def __init__(self, locale_conf=None, cache_config=None):
130 def __init__(self, locale_conf=None, cache_config=None):
122 self.locale = locale_conf
131 self.locale = locale_conf
123 self.cache_config = cache_config
132 self.cache_config = cache_config
124 self._configure_locale()
133 self._configure_locale()
125
134
126 maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
135 log_max_fd()
127 log.info('Max file descriptors value: %s', maxfd)
128
136
129 if GitFactory and GitRemote:
137 if GitFactory and GitRemote:
130 git_factory = GitFactory()
138 git_factory = GitFactory()
@@ -498,15 +498,15 class SvnRemote(RemoteBase):
498
498
499 return ''.join(p), ''.join(p.error)
499 return ''.join(p), ''.join(p.error)
500 except (EnvironmentError, OSError) as err:
500 except (EnvironmentError, OSError) as err:
501 cmd = ' '.join(cmd) # human friendly CMD
502 tb_err = ("Couldn't run svn command (%s).\n"
503 "Original error was:%s\n"
504 "Call options:%s\n"
505 % (cmd, err, _opts))
506 log.exception(tb_err)
507 if safe_call:
501 if safe_call:
508 return '', err
502 return '', err
509 else:
503 else:
504 cmd = ' '.join(cmd) # human friendly CMD
505 tb_err = ("Couldn't run svn command (%s).\n"
506 "Original error was:%s\n"
507 "Call options:%s\n"
508 % (cmd, err, _opts))
509 log.exception(tb_err)
510 raise exceptions.VcsException()(tb_err)
510 raise exceptions.VcsException()(tb_err)
511
511
512 @reraise_safe_exceptions
512 @reraise_safe_exceptions
General Comments 0
You need to be logged in to leave comments. Login now