##// END OF EJS Templates
Merge branch default into stable
marcink -
r19:a359c072 merge v4.1.0 stable
parent child
Show More
@@ -1,5 +1,5
1 [bumpversion]
1 [bumpversion]
2 current_version = 4.0.1
2 current_version = 4.1.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]
@@ -2,8 +2,6 syntax: glob
2 *.orig
2 *.orig
3 *.pyc
3 *.pyc
4 *.swp
4 *.swp
5 *.sqlite
6 *.sqlite-journal
7 *.tox
5 *.tox
8 *.egg-info
6 *.egg-info
9 *.egg
7 *.egg
@@ -21,7 +19,6 syntax: regexp
21 ^\.cache.*$
19 ^\.cache.*$
22 ^\.rhodecode$
20 ^\.rhodecode$
23
21
24 ^rcextensions
25 ^_dev
22 ^_dev
26 ^._dev
23 ^._dev
27 ^build/
24 ^build/
@@ -35,16 +32,5 syntax: regexp
35 ^junit\.xml$
32 ^junit\.xml$
36 ^node_modules/
33 ^node_modules/
37 ^pylint.log$
34 ^pylint.log$
38 ^rcextensions/
39 ^rhodecode/public/css/style.css$
40 ^rhodecode/public/js/scripts.js$
41 ^rhodecode\.db$
42 ^rhodecode\.log$
43 ^rhodecode_dev\.log$
44 ^test\.db$
45 ^build$
35 ^build$
46 ^coverage\.xml$
47 ^htmlcov
48 ^junit\.xml$
49 ^pylint.log$
50 ^result$
36 ^result$
@@ -70,20 +70,6 args = (sys.stderr,)
70 level = DEBUG
70 level = DEBUG
71 formatter = generic
71 formatter = generic
72
72
73 [handler_file]
74 class = FileHandler
75 args = ('vcsserver.log', 'a',)
76 level = DEBUG
77 formatter = generic
78
79 [handler_file_rotating]
80 class = logging.handlers.TimedRotatingFileHandler
81 # 'D', 5 - rotate every 5days
82 # you can set 'h', 'midnight'
83 args = ('vcsserver.log', 'D', 5, 10,)
84 level = DEBUG
85 formatter = generic
86
87 ################
73 ################
88 ## FORMATTERS ##
74 ## FORMATTERS ##
89 ################
75 ################
@@ -1,8 +1,16
1 ################################################################################
2 # RhodeCode VCSServer - configuration #
3 # #
4 ################################################################################
5
1 [app:main]
6 [app:main]
2 use = egg:rhodecode-vcsserver
7 use = egg:rhodecode-vcsserver
3 pyramid.reload_templates = true
8
4 pyramid.default_locale_name = en
9 pyramid.default_locale_name = en
5 pyramid.includes =
10 pyramid.includes =
11
12 locale = en_US.UTF-8
13
6 # cache regions, please don't change
14 # cache regions, please don't change
7 beaker.cache.regions = repo_object
15 beaker.cache.regions = repo_object
8 beaker.cache.repo_object.type = memorylru
16 beaker.cache.repo_object.type = memorylru
@@ -10,8 +18,6 beaker.cache.repo_object.max_items = 100
10 # cache auto-expires after N seconds
18 # cache auto-expires after N seconds
11 beaker.cache.repo_object.expire = 300
19 beaker.cache.repo_object.expire = 300
12 beaker.cache.repo_object.enabled = true
20 beaker.cache.repo_object.enabled = true
13 locale = en_US.UTF-8
14
15
21
16 [server:main]
22 [server:main]
17 use = egg:waitress#main
23 use = egg:waitress#main
@@ -23,7 +29,7 port = %(http_port)s
23 ### LOGGING CONFIGURATION ####
29 ### LOGGING CONFIGURATION ####
24 ################################
30 ################################
25 [loggers]
31 [loggers]
26 keys = root, vcsserver, beaker
32 keys = root, vcsserver, pyro4, beaker
27
33
28 [handlers]
34 [handlers]
29 keys = console
35 keys = console
@@ -50,6 +56,12 handlers =
50 qualname = beaker
56 qualname = beaker
51 propagate = 1
57 propagate = 1
52
58
59 [logger_pyro4]
60 level = DEBUG
61 handlers =
62 qualname = Pyro4
63 propagate = 1
64
53
65
54 ##############
66 ##############
55 ## HANDLERS ##
67 ## HANDLERS ##
@@ -70,20 +70,6 args = (sys.stderr,)
70 level = DEBUG
70 level = DEBUG
71 formatter = generic
71 formatter = generic
72
72
73 [handler_file]
74 class = FileHandler
75 args = ('vcsserver.log', 'a',)
76 level = DEBUG
77 formatter = generic
78
79 [handler_file_rotating]
80 class = logging.handlers.TimedRotatingFileHandler
81 # 'D', 5 - rotate every 5days
82 # you can set 'h', 'midnight'
83 args = ('vcsserver.log', 'D', 5, 10,)
84 level = DEBUG
85 formatter = generic
86
87 ################
73 ################
88 ## FORMATTERS ##
74 ## FORMATTERS ##
89 ################
75 ################
@@ -64,10 +64,15 let
64 pkgs;
64 pkgs;
65 };
65 };
66
66
67 version = builtins.readFile ./vcsserver/VERSION;
68
67 pythonLocalOverrides = self: super: {
69 pythonLocalOverrides = self: super: {
68 rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: {
70 rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: {
71 inherit
72 doCheck
73 version;
74 name = "rhodecode-vcsserver-${version}";
69 src = rhodecode-vcsserver-src;
75 src = rhodecode-vcsserver-src;
70 inherit doCheck;
71
76
72 propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
77 propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
73 pkgs.git
78 pkgs.git
@@ -120,13 +120,13
120 };
120 };
121 };
121 };
122 hgsubversion = super.buildPythonPackage {
122 hgsubversion = super.buildPythonPackage {
123 name = "hgsubversion-1.8.5";
123 name = "hgsubversion-1.8.6";
124 buildInputs = with self; [];
124 buildInputs = with self; [];
125 doCheck = false;
125 doCheck = false;
126 propagatedBuildInputs = with self; [mercurial subvertpy];
126 propagatedBuildInputs = with self; [mercurial subvertpy];
127 src = fetchurl {
127 src = fetchurl {
128 url = "https://pypi.python.org/packages/f7/8d/3e5719405d4b0b57db7faaf472fb836ed4c437a82bd124a2a37707c33bff/hgsubversion-1.8.5.tar.gz";
128 url = "https://pypi.python.org/packages/ce/97/032e5093ad250e9908cea04395cbddb6902d587f712a79b53b2d778bdfdd/hgsubversion-1.8.6.tar.gz";
129 md5 = "afc3f096fb4dacf1d9210811f81313e0";
129 md5 = "9310cb266031cf8d0779885782a84a5b";
130 };
130 };
131 };
131 };
132 infrae.cache = super.buildPythonPackage {
132 infrae.cache = super.buildPythonPackage {
@@ -140,13 +140,13
140 };
140 };
141 };
141 };
142 mercurial = super.buildPythonPackage {
142 mercurial = super.buildPythonPackage {
143 name = "mercurial-3.7.3";
143 name = "mercurial-3.8.3";
144 buildInputs = with self; [];
144 buildInputs = with self; [];
145 doCheck = false;
145 doCheck = false;
146 propagatedBuildInputs = with self; [];
146 propagatedBuildInputs = with self; [];
147 src = fetchurl {
147 src = fetchurl {
148 url = "https://pypi.python.org/packages/e8/a0/fe6bf60a314a30299c58a5ed67de9fffeae04731201f10dc2822befb062d/mercurial-3.7.3.tar.gz";
148 url = "https://pypi.python.org/packages/56/bc/af1561195d43638d44bc3ac286c21f187430966234bee1f235711d80dfb6/mercurial-3.8.3.tar.gz";
149 md5 = "f47c9c76b7bf429dafecb71fa81c01b4";
149 md5 = "97aced7018614eeccc9621a3dea35fda";
150 };
150 };
151 };
151 };
152 mock = super.buildPythonPackage {
152 mock = super.buildPythonPackage {
@@ -230,7 +230,7
230 };
230 };
231 };
231 };
232 rhodecode-vcsserver = super.buildPythonPackage {
232 rhodecode-vcsserver = super.buildPythonPackage {
233 name = "rhodecode-vcsserver-4.0.0";
233 name = "rhodecode-vcsserver-4.1.0";
234 buildInputs = with self; [mock pytest WebTest];
234 buildInputs = with self; [mock pytest WebTest];
235 doCheck = true;
235 doCheck = true;
236 propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];
236 propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];
@@ -1,9 +1,9
1 Beaker==1.7.0
1 Beaker==1.7.0
2 configobj==5.0.6
2 configobj==5.0.6
3 dulwich==0.12.0
3 dulwich==0.12.0
4 hgsubversion==1.8.5
4 hgsubversion==1.8.6
5 infrae.cache==1.0.1
5 infrae.cache==1.0.1
6 mercurial==3.7.3
6 mercurial==3.8.3
7 msgpack-python==0.4.6
7 msgpack-python==0.4.6
8 py==1.4.29
8 py==1.4.29
9 pyramid==1.6.1
9 pyramid==1.6.1
@@ -1,1 +1,1
1 4.0.1 No newline at end of file
1 4.1.0 No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now