##// END OF EJS Templates
release: Merge default into stable for release preparation
marcink -
r37:897dca31 merge stable
parent child Browse files
Show More
@@ -1,5 +1,5 b''
1 1 [bumpversion]
2 current_version = 4.1.2
2 current_version = 4.2.0
3 3 message = release: Bump version {current_version} to {new_version}
4 4
5 5 [bumpversion:file:vcsserver/VERSION]
@@ -5,12 +5,10 b' done = false'
5 5 done = true
6 6
7 7 [task:fixes_on_stable]
8 done = true
9 8
10 9 [task:pip2nix_generated]
11 done = true
12 10
13 11 [release]
14 state = prepared
15 version = 4.1.2
12 state = in_progress
13 version = 4.2.0
16 14
@@ -72,6 +72,7 b' let'
72 72 doCheck
73 73 version;
74 74 name = "rhodecode-vcsserver-${version}";
75 releaseName = "RhodeCodeVCSServer-${version}";
75 76 src = rhodecode-vcsserver-src;
76 77
77 78 propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
@@ -90,13 +90,13 b''
90 90 };
91 91 };
92 92 dulwich = super.buildPythonPackage {
93 name = "dulwich-0.12.0";
93 name = "dulwich-0.13.0";
94 94 buildInputs = with self; [];
95 95 doCheck = false;
96 96 propagatedBuildInputs = with self; [];
97 97 src = fetchurl {
98 url = "https://pypi.python.org/packages/6f/04/fbe561b6d45c0ec758330d5b7f5ba4b6cb4f1ca1ab49859d2fc16320da75/dulwich-0.12.0.tar.gz";
99 md5 = "f3a8a12bd9f9dd8c233e18f3d49436fa";
98 url = "https://pypi.python.org/packages/84/95/732d280eee829dacc954e8109f97b47abcadcca472c2ab013e1635eb4792/dulwich-0.13.0.tar.gz";
99 md5 = "6dede0626657c2bd08f48ca1221eea91";
100 100 };
101 101 };
102 102 greenlet = super.buildPythonPackage {
@@ -1,10 +1,12 b''
1 1 { pkgs ? import <nixpkgs> {}
2 , doCheck ? true
2 3 }:
3 4
4 5 let
5 6
6 7 vcsserver = import ./default.nix {
7 8 inherit
9 doCheck
8 10 pkgs;
9 11 };
10 12
@@ -1,6 +1,6 b''
1 1 Beaker==1.7.0
2 2 configobj==5.0.6
3 dulwich==0.12.0
3 dulwich==0.13.0
4 4 hgsubversion==1.8.6
5 5 infrae.cache==1.0.1
6 6 mercurial==3.8.3
@@ -1,8 +1,13 b''
1 { pkgs ? (import <nixpkgs> {})
1 { pkgs ? import <nixpkgs> {}
2 , doCheck ? false
2 3 }:
3 4
4 5 let
5 vcsserver = import ./default.nix {inherit pkgs;};
6 vcsserver = import ./default.nix {
7 inherit
8 doCheck
9 pkgs;
10 };
6 11
7 12 in vcsserver.override (attrs: {
8 13
@@ -1,1 +1,1 b''
1 4.1.2 No newline at end of file
1 4.2.0 No newline at end of file
@@ -57,6 +57,14 b' def make_ui_from_config(repo_config):'
57 57 # signal in a non-main thread, thus generating a ValueError.
58 58 baseui.setconfig('worker', 'numcpus', 1)
59 59
60 # If there is no config for the largefiles extension, we explicitly disable
61 # it here. This overrides settings from repositories hgrc file. Recent
62 # mercurial versions enable largefiles in hgrc on clone from largefile
63 # repo.
64 if not baseui.hasconfig('extensions', 'largefiles'):
65 log.debug('Explicitly disable largefiles extension for repo.')
66 baseui.setconfig('extensions', 'largefiles', '!')
67
60 68 return baseui
61 69
62 70
@@ -28,7 +28,7 b' from beaker.util import parse_cache_conf'
28 28 from pyramid.config import Configurator
29 29 from pyramid.wsgi import wsgiapp
30 30
31 from vcsserver import remote_wsgi, scm_app, settings
31 from vcsserver import remote_wsgi, scm_app, settings, hgpatches
32 32 from vcsserver.echo_stub import remote_wsgi as remote_wsgi_stub
33 33 from vcsserver.echo_stub.echo_app import EchoApp
34 34 from vcsserver.server import VcsServer
@@ -331,5 +331,7 b' class ResponseFilter(object):'
331 331
332 332
333 333 def main(global_config, **settings):
334 if MercurialFactory:
335 hgpatches.patch_largefiles_capabilities()
334 336 app = HTTPApplication(settings=settings)
335 337 return app.wsgi_app()
General Comments 0
You need to be logged in to leave comments. Login now