##// END OF EJS Templates
rhodecode-vcsserver
RSS
Merge branch default into stable
marcink -
r19:a359c072 merge v4.1.0 stable
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6 b''
1 1 [bumpversion]
2 current_version = 4.0.1
2 current_version = 4.1.0
3 3 message = release: Bump version {current_version} to {new_version}
4 4
5 5 [bumpversion:file:vcsserver/VERSION]
6 6
Show file before | Show file after | Hide comments
@@ -1,50 +1,36 b''
1 1 syntax: glob
2 2 *.orig
3 3 *.pyc
4 4 *.swp
5 *.sqlite
6 *.sqlite-journal
7 5 *.tox
8 6 *.egg-info
9 7 *.egg
10 8 *.idea
11 9 .DS_Store*
12 10
13 11
14 12 syntax: regexp
15 13
16 14 #.filename
17 15 ^\.settings$
18 16 ^\.project$
19 17 ^\.pydevproject$
20 18 ^\.coverage$
21 19 ^\.cache.*$
22 20 ^\.rhodecode$
23 21
24 ^rcextensions
25 22 ^_dev
26 23 ^._dev
27 24 ^build/
28 25 ^coverage\.xml$
29 26 ^data$
30 27 ^dev.ini$
31 28 ^acceptance_tests/dev.*\.ini$
32 29 ^dist/
33 30 ^fabfile.py
34 31 ^htmlcov
35 32 ^junit\.xml$
36 33 ^node_modules/
37 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 35 ^build$
46 ^coverage\.xml$
47 ^htmlcov
48 ^junit\.xml$
49 ^pylint.log$
50 36 ^result$
Show file before | Show file after | Hide comments
@@ -1,93 +1,79 b''
1 1 ################################################################################
2 2 # RhodeCode VCSServer - configuration #
3 3 # #
4 4 ################################################################################
5 5
6 6 [DEFAULT]
7 7 host = 127.0.0.1
8 8 port = 9900
9 9 locale = en_US.UTF-8
10 10 # number of worker threads, this should be set based on a formula threadpool=N*6
11 11 # where N is number of RhodeCode Enterprise workers, eg. running 2 instances
12 12 # 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96
13 13 threadpool_size = 96
14 14 timeout = 0
15 15
16 16 # cache regions, please don't change
17 17 beaker.cache.regions = repo_object
18 18 beaker.cache.repo_object.type = memorylru
19 19 beaker.cache.repo_object.max_items = 100
20 20 # cache auto-expires after N seconds
21 21 beaker.cache.repo_object.expire = 300
22 22 beaker.cache.repo_object.enabled = true
23 23
24 24
25 25 ################################
26 26 ### LOGGING CONFIGURATION ####
27 27 ################################
28 28 [loggers]
29 29 keys = root, vcsserver, pyro4, beaker
30 30
31 31 [handlers]
32 32 keys = console
33 33
34 34 [formatters]
35 35 keys = generic
36 36
37 37 #############
38 38 ## LOGGERS ##
39 39 #############
40 40 [logger_root]
41 41 level = NOTSET
42 42 handlers = console
43 43
44 44 [logger_vcsserver]
45 45 level = DEBUG
46 46 handlers =
47 47 qualname = vcsserver
48 48 propagate = 1
49 49
50 50 [logger_beaker]
51 51 level = DEBUG
52 52 handlers =
53 53 qualname = beaker
54 54 propagate = 1
55 55
56 56 [logger_pyro4]
57 57 level = DEBUG
58 58 handlers =
59 59 qualname = Pyro4
60 60 propagate = 1
61 61
62 62
63 63 ##############
64 64 ## HANDLERS ##
65 65 ##############
66 66
67 67 [handler_console]
68 68 class = StreamHandler
69 69 args = (sys.stderr,)
70 70 level = DEBUG
71 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 74 ## FORMATTERS ##
89 75 ################
90 76
91 77 [formatter_generic]
92 78 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
93 79 datefmt = %Y-%m-%d %H:%M:%S
Show file before | Show file after | Hide comments
@@ -1,70 +1,82 b''
1 ################################################################################
2 # RhodeCode VCSServer - configuration #
3 # #
4 ################################################################################
5
1 6 [app:main]
2 7 use = egg:rhodecode-vcsserver
3 pyramid.reload_templates = true
8
4 9 pyramid.default_locale_name = en
5 10 pyramid.includes =
11
12 locale = en_US.UTF-8
13
6 14 # cache regions, please don't change
7 15 beaker.cache.regions = repo_object
8 16 beaker.cache.repo_object.type = memorylru
9 17 beaker.cache.repo_object.max_items = 100
10 18 # cache auto-expires after N seconds
11 19 beaker.cache.repo_object.expire = 300
12 20 beaker.cache.repo_object.enabled = true
13 locale = en_US.UTF-8
14
15 21
16 22 [server:main]
17 23 use = egg:waitress#main
18 24 host = 0.0.0.0
19 25 port = %(http_port)s
20 26
21 27
22 28 ################################
23 29 ### LOGGING CONFIGURATION ####
24 30 ################################
25 31 [loggers]
26 keys = root, vcsserver, beaker
32 keys = root, vcsserver, pyro4, beaker
27 33
28 34 [handlers]
29 35 keys = console
30 36
31 37 [formatters]
32 38 keys = generic
33 39
34 40 #############
35 41 ## LOGGERS ##
36 42 #############
37 43 [logger_root]
38 44 level = NOTSET
39 45 handlers = console
40 46
41 47 [logger_vcsserver]
42 48 level = DEBUG
43 49 handlers =
44 50 qualname = vcsserver
45 51 propagate = 1
46 52
47 53 [logger_beaker]
48 54 level = DEBUG
49 55 handlers =
50 56 qualname = beaker
51 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 67 ## HANDLERS ##
56 68 ##############
57 69
58 70 [handler_console]
59 71 class = StreamHandler
60 72 args = (sys.stderr,)
61 73 level = DEBUG
62 74 formatter = generic
63 75
64 76 ################
65 77 ## FORMATTERS ##
66 78 ################
67 79
68 80 [formatter_generic]
69 81 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
70 82 datefmt = %Y-%m-%d %H:%M:%S
Show file before | Show file after | Hide comments
@@ -1,93 +1,79 b''
1 1 ################################################################################
2 2 # RhodeCode VCSServer - configuration #
3 3 # #
4 4 ################################################################################
5 5
6 6 [DEFAULT]
7 7 host = 127.0.0.1
8 8 port = 9900
9 9 locale = en_US.UTF-8
10 10 # number of worker threads, this should be set based on a formula threadpool=N*6
11 11 # where N is number of RhodeCode Enterprise workers, eg. running 2 instances
12 12 # 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96
13 13 threadpool_size = 96
14 14 timeout = 0
15 15
16 16 # cache regions, please don't change
17 17 beaker.cache.regions = repo_object
18 18 beaker.cache.repo_object.type = memorylru
19 19 beaker.cache.repo_object.max_items = 100
20 20 # cache auto-expires after N seconds
21 21 beaker.cache.repo_object.expire = 300
22 22 beaker.cache.repo_object.enabled = true
23 23
24 24
25 25 ################################
26 26 ### LOGGING CONFIGURATION ####
27 27 ################################
28 28 [loggers]
29 29 keys = root, vcsserver, pyro4, beaker
30 30
31 31 [handlers]
32 32 keys = console
33 33
34 34 [formatters]
35 35 keys = generic
36 36
37 37 #############
38 38 ## LOGGERS ##
39 39 #############
40 40 [logger_root]
41 41 level = NOTSET
42 42 handlers = console
43 43
44 44 [logger_vcsserver]
45 45 level = DEBUG
46 46 handlers =
47 47 qualname = vcsserver
48 48 propagate = 1
49 49
50 50 [logger_beaker]
51 51 level = DEBUG
52 52 handlers =
53 53 qualname = beaker
54 54 propagate = 1
55 55
56 56 [logger_pyro4]
57 57 level = DEBUG
58 58 handlers =
59 59 qualname = Pyro4
60 60 propagate = 1
61 61
62 62
63 63 ##############
64 64 ## HANDLERS ##
65 65 ##############
66 66
67 67 [handler_console]
68 68 class = StreamHandler
69 69 args = (sys.stderr,)
70 70 level = DEBUG
71 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 74 ## FORMATTERS ##
89 75 ################
90 76
91 77 [formatter_generic]
92 78 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
93 79 datefmt = %Y-%m-%d %H:%M:%S
Show file before | Show file after | Hide comments
@@ -1,139 +1,144 b''
1 1 # Nix environment for the community edition
2 2 #
3 3 # This shall be as lean as possible, just producing the rhodecode-vcsserver
4 4 # derivation. For advanced tweaks to pimp up the development environment we use
5 5 # "shell.nix" so that it does not have to clutter this file.
6 6
7 7 { pkgs ? (import <nixpkgs> {})
8 8 , pythonPackages ? "python27Packages"
9 9 , pythonExternalOverrides ? self: super: {}
10 10 , doCheck ? true
11 11 }:
12 12
13 13 let pkgs_ = pkgs; in
14 14
15 15 let
16 16 pkgs = pkgs_.overridePackages (self: super: {
17 17 # Override subversion derivation to
18 18 # - activate python bindings
19 19 # - set version to 1.8
20 20 subversion = super.subversion18.override {
21 21 httpSupport = true;
22 22 pythonBindings = true;
23 23 python = self.python27Packages.python;
24 24 };
25 25 });
26 26
27 27 inherit (pkgs.lib) fix extends;
28 28
29 29 basePythonPackages = with builtins; if isAttrs pythonPackages
30 30 then pythonPackages
31 31 else getAttr pythonPackages pkgs;
32 32
33 33 elem = builtins.elem;
34 34 basename = path: with pkgs.lib; last (splitString "/" path);
35 35 startsWith = prefix: full: let
36 36 actualPrefix = builtins.substring 0 (builtins.stringLength prefix) full;
37 37 in actualPrefix == prefix;
38 38
39 39 src-filter = path: type: with pkgs.lib;
40 40 let
41 41 ext = last (splitString "." path);
42 42 in
43 43 !elem (basename path) [
44 44 ".git" ".hg" "__pycache__" ".eggs" "node_modules"
45 45 "build" "data" "tmp"] &&
46 46 !elem ext ["egg-info" "pyc"] &&
47 47 !startsWith "result" path;
48 48
49 49 rhodecode-vcsserver-src = builtins.filterSource src-filter ./.;
50 50
51 51 pythonGeneratedPackages = self: basePythonPackages.override (a: {
52 52 inherit self;
53 53 })
54 54 // (scopedImport {
55 55 self = self;
56 56 super = basePythonPackages;
57 57 inherit pkgs;
58 58 inherit (pkgs) fetchurl fetchgit;
59 59 } ./pkgs/python-packages.nix);
60 60
61 61 pythonOverrides = import ./pkgs/python-packages-overrides.nix {
62 62 inherit
63 63 basePythonPackages
64 64 pkgs;
65 65 };
66 66
67 version = builtins.readFile ./vcsserver/VERSION;
68
67 69 pythonLocalOverrides = self: super: {
68 70 rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: {
71 inherit
72 doCheck
73 version;
74 name = "rhodecode-vcsserver-${version}";
69 75 src = rhodecode-vcsserver-src;
70 inherit doCheck;
71 76
72 77 propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
73 78 pkgs.git
74 79 pkgs.subversion
75 80 ]);
76 81
77 82 # TODO: johbo: Make a nicer way to expose the parts. Maybe
78 83 # pkgs/default.nix?
79 84 passthru = {
80 85 pythonPackages = self;
81 86 };
82 87
83 88 # Somewhat snappier setup of the development environment
84 89 # TODO: move into shell.nix
85 90 # TODO: think of supporting a stable path again, so that multiple shells
86 91 # can share it.
87 92 shellHook = ''
88 93 # Set locale
89 94 export LC_ALL="en_US.UTF-8"
90 95
91 96 tmp_path=$(mktemp -d)
92 97 export PATH="$tmp_path/bin:$PATH"
93 98 export PYTHONPATH="$tmp_path/${self.python.sitePackages}:$PYTHONPATH"
94 99 mkdir -p $tmp_path/${self.python.sitePackages}
95 100 python setup.py develop --prefix $tmp_path --allow-hosts ""
96 101 '';
97 102
98 103 # Add VCSServer bin directory to path so that tests can find 'vcsserver'.
99 104 preCheck = ''
100 105 export PATH="$out/bin:$PATH"
101 106 '';
102 107
103 108 postInstall = ''
104 109 echo "Writing meta information for rccontrol to nix-support/rccontrol"
105 110 mkdir -p $out/nix-support/rccontrol
106 111 cp -v vcsserver/VERSION $out/nix-support/rccontrol/version
107 112 echo "DONE: Meta information for rccontrol written"
108 113
109 114 ln -s ${self.pyramid}/bin/* $out/bin #*/
110 115 ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
111 116
112 117 # Symlink version control utilities
113 118 #
114 119 # We ensure that always the correct version is available as a symlink.
115 120 # So that users calling them via the profile path will always use the
116 121 # correct version.
117 122 ln -s ${pkgs.git}/bin/git $out/bin
118 123 ln -s ${self.mercurial}/bin/hg $out/bin
119 124 ln -s ${pkgs.subversion}/bin/svn* $out/bin
120 125
121 126 for file in $out/bin/*; do #*/
122 127 wrapProgram $file \
123 128 --prefix PYTHONPATH : $PYTHONPATH \
124 129 --set PYTHONHASHSEED random
125 130 done
126 131 '';
127 132
128 133 });
129 134 };
130 135
131 136 # Apply all overrides and fix the final package set
132 137 myPythonPackages =
133 138 (fix
134 139 (extends pythonExternalOverrides
135 140 (extends pythonLocalOverrides
136 141 (extends pythonOverrides
137 142 pythonGeneratedPackages))));
138 143
139 144 in myPythonPackages.rhodecode-vcsserver
Show file before | Show file after | Hide comments
@@ -1,363 +1,363 b''
1 1 {
2 2 Beaker = super.buildPythonPackage {
3 3 name = "Beaker-1.7.0";
4 4 buildInputs = with self; [];
5 5 doCheck = false;
6 6 propagatedBuildInputs = with self; [];
7 7 src = fetchurl {
8 8 url = "https://pypi.python.org/packages/97/8e/409d2e7c009b8aa803dc9e6f239f1db7c3cdf578249087a404e7c27a505d/Beaker-1.7.0.tar.gz";
9 9 md5 = "386be3f7fe427358881eee4622b428b3";
10 10 };
11 11 };
12 12 Jinja2 = super.buildPythonPackage {
13 13 name = "Jinja2-2.8";
14 14 buildInputs = with self; [];
15 15 doCheck = false;
16 16 propagatedBuildInputs = with self; [MarkupSafe];
17 17 src = fetchurl {
18 18 url = "https://pypi.python.org/packages/f2/2f/0b98b06a345a761bec91a079ccae392d282690c2d8272e708f4d10829e22/Jinja2-2.8.tar.gz";
19 19 md5 = "edb51693fe22c53cee5403775c71a99e";
20 20 };
21 21 };
22 22 Mako = super.buildPythonPackage {
23 23 name = "Mako-1.0.4";
24 24 buildInputs = with self; [];
25 25 doCheck = false;
26 26 propagatedBuildInputs = with self; [MarkupSafe];
27 27 src = fetchurl {
28 28 url = "https://pypi.python.org/packages/7a/ae/925434246ee90b42e8ef57d3b30a0ab7caf9a2de3e449b876c56dcb48155/Mako-1.0.4.tar.gz";
29 29 md5 = "c5fc31a323dd4990683d2f2da02d4e20";
30 30 };
31 31 };
32 32 MarkupSafe = super.buildPythonPackage {
33 33 name = "MarkupSafe-0.23";
34 34 buildInputs = with self; [];
35 35 doCheck = false;
36 36 propagatedBuildInputs = with self; [];
37 37 src = fetchurl {
38 38 url = "https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz";
39 39 md5 = "f5ab3deee4c37cd6a922fb81e730da6e";
40 40 };
41 41 };
42 42 PasteDeploy = super.buildPythonPackage {
43 43 name = "PasteDeploy-1.5.2";
44 44 buildInputs = with self; [];
45 45 doCheck = false;
46 46 propagatedBuildInputs = with self; [];
47 47 src = fetchurl {
48 48 url = "https://pypi.python.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
49 49 md5 = "352b7205c78c8de4987578d19431af3b";
50 50 };
51 51 };
52 52 Pyro4 = super.buildPythonPackage {
53 53 name = "Pyro4-4.41";
54 54 buildInputs = with self; [];
55 55 doCheck = false;
56 56 propagatedBuildInputs = with self; [serpent];
57 57 src = fetchurl {
58 58 url = "https://pypi.python.org/packages/56/2b/89b566b4bf3e7f8ba790db2d1223852f8cb454c52cab7693dd41f608ca2a/Pyro4-4.41.tar.gz";
59 59 md5 = "ed69e9bfafa9c06c049a87cb0c4c2b6c";
60 60 };
61 61 };
62 62 WebOb = super.buildPythonPackage {
63 63 name = "WebOb-1.3.1";
64 64 buildInputs = with self; [];
65 65 doCheck = false;
66 66 propagatedBuildInputs = with self; [];
67 67 src = fetchurl {
68 68 url = "https://pypi.python.org/packages/16/78/adfc0380b8a0d75b2d543fa7085ba98a573b1ae486d9def88d172b81b9fa/WebOb-1.3.1.tar.gz";
69 69 md5 = "20918251c5726956ba8fef22d1556177";
70 70 };
71 71 };
72 72 WebTest = super.buildPythonPackage {
73 73 name = "WebTest-1.4.3";
74 74 buildInputs = with self; [];
75 75 doCheck = false;
76 76 propagatedBuildInputs = with self; [WebOb];
77 77 src = fetchurl {
78 78 url = "https://pypi.python.org/packages/51/3d/84fd0f628df10b30c7db87895f56d0158e5411206b721ca903cb51bfd948/WebTest-1.4.3.zip";
79 79 md5 = "631ce728bed92c681a4020a36adbc353";
80 80 };
81 81 };
82 82 configobj = super.buildPythonPackage {
83 83 name = "configobj-5.0.6";
84 84 buildInputs = with self; [];
85 85 doCheck = false;
86 86 propagatedBuildInputs = with self; [six];
87 87 src = fetchurl {
88 88 url = "https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz";
89 89 md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
90 90 };
91 91 };
92 92 dulwich = super.buildPythonPackage {
93 93 name = "dulwich-0.12.0";
94 94 buildInputs = with self; [];
95 95 doCheck = false;
96 96 propagatedBuildInputs = with self; [];
97 97 src = fetchurl {
98 98 url = "https://pypi.python.org/packages/6f/04/fbe561b6d45c0ec758330d5b7f5ba4b6cb4f1ca1ab49859d2fc16320da75/dulwich-0.12.0.tar.gz";
99 99 md5 = "f3a8a12bd9f9dd8c233e18f3d49436fa";
100 100 };
101 101 };
102 102 greenlet = super.buildPythonPackage {
103 103 name = "greenlet-0.4.7";
104 104 buildInputs = with self; [];
105 105 doCheck = false;
106 106 propagatedBuildInputs = with self; [];
107 107 src = fetchurl {
108 108 url = "https://pypi.python.org/packages/7a/9f/a1a0d9bdf3203ae1502c5a8434fe89d323599d78a106985bc327351a69d4/greenlet-0.4.7.zip";
109 109 md5 = "c2333a8ff30fa75c5d5ec0e67b461086";
110 110 };
111 111 };
112 112 gunicorn = super.buildPythonPackage {
113 113 name = "gunicorn-19.6.0";
114 114 buildInputs = with self; [];
115 115 doCheck = false;
116 116 propagatedBuildInputs = with self; [];
117 117 src = fetchurl {
118 118 url = "https://pypi.python.org/packages/84/ce/7ea5396efad1cef682bbc4068e72a0276341d9d9d0f501da609fab9fcb80/gunicorn-19.6.0.tar.gz";
119 119 md5 = "338e5e8a83ea0f0625f768dba4597530";
120 120 };
121 121 };
122 122 hgsubversion = super.buildPythonPackage {
123 name = "hgsubversion-1.8.5";
123 name = "hgsubversion-1.8.6";
124 124 buildInputs = with self; [];
125 125 doCheck = false;
126 126 propagatedBuildInputs = with self; [mercurial subvertpy];
127 127 src = fetchurl {
128 url = "https://pypi.python.org/packages/f7/8d/3e5719405d4b0b57db7faaf472fb836ed4c437a82bd124a2a37707c33bff/hgsubversion-1.8.5.tar.gz";
129 md5 = "afc3f096fb4dacf1d9210811f81313e0";
128 url = "https://pypi.python.org/packages/ce/97/032e5093ad250e9908cea04395cbddb6902d587f712a79b53b2d778bdfdd/hgsubversion-1.8.6.tar.gz";
129 md5 = "9310cb266031cf8d0779885782a84a5b";
130 130 };
131 131 };
132 132 infrae.cache = super.buildPythonPackage {
133 133 name = "infrae.cache-1.0.1";
134 134 buildInputs = with self; [];
135 135 doCheck = false;
136 136 propagatedBuildInputs = with self; [Beaker repoze.lru];
137 137 src = fetchurl {
138 138 url = "https://pypi.python.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
139 139 md5 = "b09076a766747e6ed2a755cc62088e32";
140 140 };
141 141 };
142 142 mercurial = super.buildPythonPackage {
143 name = "mercurial-3.7.3";
143 name = "mercurial-3.8.3";
144 144 buildInputs = with self; [];
145 145 doCheck = false;
146 146 propagatedBuildInputs = with self; [];
147 147 src = fetchurl {
148 url = "https://pypi.python.org/packages/e8/a0/fe6bf60a314a30299c58a5ed67de9fffeae04731201f10dc2822befb062d/mercurial-3.7.3.tar.gz";
149 md5 = "f47c9c76b7bf429dafecb71fa81c01b4";
148 url = "https://pypi.python.org/packages/56/bc/af1561195d43638d44bc3ac286c21f187430966234bee1f235711d80dfb6/mercurial-3.8.3.tar.gz";
149 md5 = "97aced7018614eeccc9621a3dea35fda";
150 150 };
151 151 };
152 152 mock = super.buildPythonPackage {
153 153 name = "mock-1.0.1";
154 154 buildInputs = with self; [];
155 155 doCheck = false;
156 156 propagatedBuildInputs = with self; [];
157 157 src = fetchurl {
158 158 url = "https://pypi.python.org/packages/15/45/30273ee91feb60dabb8fbb2da7868520525f02cf910279b3047182feed80/mock-1.0.1.zip";
159 159 md5 = "869f08d003c289a97c1a6610faf5e913";
160 160 };
161 161 };
162 162 msgpack-python = super.buildPythonPackage {
163 163 name = "msgpack-python-0.4.6";
164 164 buildInputs = with self; [];
165 165 doCheck = false;
166 166 propagatedBuildInputs = with self; [];
167 167 src = fetchurl {
168 168 url = "https://pypi.python.org/packages/15/ce/ff2840885789ef8035f66cd506ea05bdb228340307d5e71a7b1e3f82224c/msgpack-python-0.4.6.tar.gz";
169 169 md5 = "8b317669314cf1bc881716cccdaccb30";
170 170 };
171 171 };
172 172 py = super.buildPythonPackage {
173 173 name = "py-1.4.29";
174 174 buildInputs = with self; [];
175 175 doCheck = false;
176 176 propagatedBuildInputs = with self; [];
177 177 src = fetchurl {
178 178 url = "https://pypi.python.org/packages/2a/bc/a1a4a332ac10069b8e5e25136a35e08a03f01fd6ab03d819889d79a1fd65/py-1.4.29.tar.gz";
179 179 md5 = "c28e0accba523a29b35a48bb703fb96c";
180 180 };
181 181 };
182 182 pyramid = super.buildPythonPackage {
183 183 name = "pyramid-1.6.1";
184 184 buildInputs = with self; [];
185 185 doCheck = false;
186 186 propagatedBuildInputs = with self; [setuptools WebOb repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy];
187 187 src = fetchurl {
188 188 url = "https://pypi.python.org/packages/30/b3/fcc4a2a4800cbf21989e00454b5828cf1f7fe35c63e0810b350e56d4c475/pyramid-1.6.1.tar.gz";
189 189 md5 = "b18688ff3cc33efdbb098a35b45dd122";
190 190 };
191 191 };
192 192 pyramid-jinja2 = super.buildPythonPackage {
193 193 name = "pyramid-jinja2-2.5";
194 194 buildInputs = with self; [];
195 195 doCheck = false;
196 196 propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
197 197 src = fetchurl {
198 198 url = "https://pypi.python.org/packages/a1/80/595e26ffab7deba7208676b6936b7e5a721875710f982e59899013cae1ed/pyramid_jinja2-2.5.tar.gz";
199 199 md5 = "07cb6547204ac5e6f0b22a954ccee928";
200 200 };
201 201 };
202 202 pyramid-mako = super.buildPythonPackage {
203 203 name = "pyramid-mako-1.0.2";
204 204 buildInputs = with self; [];
205 205 doCheck = false;
206 206 propagatedBuildInputs = with self; [pyramid Mako];
207 207 src = fetchurl {
208 208 url = "https://pypi.python.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
209 209 md5 = "ee25343a97eb76bd90abdc2a774eb48a";
210 210 };
211 211 };
212 212 pytest = super.buildPythonPackage {
213 213 name = "pytest-2.8.5";
214 214 buildInputs = with self; [];
215 215 doCheck = false;
216 216 propagatedBuildInputs = with self; [py];
217 217 src = fetchurl {
218 218 url = "https://pypi.python.org/packages/b1/3d/d7ea9b0c51e0cacded856e49859f0a13452747491e842c236bbab3714afe/pytest-2.8.5.zip";
219 219 md5 = "8493b06f700862f1294298d6c1b715a9";
220 220 };
221 221 };
222 222 repoze.lru = super.buildPythonPackage {
223 223 name = "repoze.lru-0.6";
224 224 buildInputs = with self; [];
225 225 doCheck = false;
226 226 propagatedBuildInputs = with self; [];
227 227 src = fetchurl {
228 228 url = "https://pypi.python.org/packages/6e/1e/aa15cc90217e086dc8769872c8778b409812ff036bf021b15795638939e4/repoze.lru-0.6.tar.gz";
229 229 md5 = "2c3b64b17a8e18b405f55d46173e14dd";
230 230 };
231 231 };
232 232 rhodecode-vcsserver = super.buildPythonPackage {
233 name = "rhodecode-vcsserver-4.0.0";
233 name = "rhodecode-vcsserver-4.1.0";
234 234 buildInputs = with self; [mock pytest WebTest];
235 235 doCheck = true;
236 236 propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];
237 237 src = ./.;
238 238 };
239 239 serpent = super.buildPythonPackage {
240 240 name = "serpent-1.12";
241 241 buildInputs = with self; [];
242 242 doCheck = false;
243 243 propagatedBuildInputs = with self; [];
244 244 src = fetchurl {
245 245 url = "https://pypi.python.org/packages/3b/19/1e0e83b47c09edaef8398655088036e7e67386b5c48770218ebb339fbbd5/serpent-1.12.tar.gz";
246 246 md5 = "05869ac7b062828b34f8f927f0457b65";
247 247 };
248 248 };
249 249 setuptools = super.buildPythonPackage {
250 250 name = "setuptools-20.8.1";
251 251 buildInputs = with self; [];
252 252 doCheck = false;
253 253 propagatedBuildInputs = with self; [];
254 254 src = fetchurl {
255 255 url = "https://pypi.python.org/packages/c4/19/c1bdc88b53da654df43770f941079dbab4e4788c2dcb5658fb86259894c7/setuptools-20.8.1.zip";
256 256 md5 = "fe58a5cac0df20bb83942b252a4b0543";
257 257 };
258 258 };
259 259 simplejson = super.buildPythonPackage {
260 260 name = "simplejson-3.7.2";
261 261 buildInputs = with self; [];
262 262 doCheck = false;
263 263 propagatedBuildInputs = with self; [];
264 264 src = fetchurl {
265 265 url = "https://pypi.python.org/packages/6d/89/7f13f099344eea9d6722779a1f165087cb559598107844b1ac5dbd831fb1/simplejson-3.7.2.tar.gz";
266 266 md5 = "a5fc7d05d4cb38492285553def5d4b46";
267 267 };
268 268 };
269 269 six = super.buildPythonPackage {
270 270 name = "six-1.9.0";
271 271 buildInputs = with self; [];
272 272 doCheck = false;
273 273 propagatedBuildInputs = with self; [];
274 274 src = fetchurl {
275 275 url = "https://pypi.python.org/packages/16/64/1dc5e5976b17466fd7d712e59cbe9fb1e18bec153109e5ba3ed6c9102f1a/six-1.9.0.tar.gz";
276 276 md5 = "476881ef4012262dfc8adc645ee786c4";
277 277 };
278 278 };
279 279 subprocess32 = super.buildPythonPackage {
280 280 name = "subprocess32-3.2.6";
281 281 buildInputs = with self; [];
282 282 doCheck = false;
283 283 propagatedBuildInputs = with self; [];
284 284 src = fetchurl {
285 285 url = "https://pypi.python.org/packages/28/8d/33ccbff51053f59ae6c357310cac0e79246bbed1d345ecc6188b176d72c3/subprocess32-3.2.6.tar.gz";
286 286 md5 = "754c5ab9f533e764f931136974b618f1";
287 287 };
288 288 };
289 289 subvertpy = super.buildPythonPackage {
290 290 name = "subvertpy-0.9.3";
291 291 buildInputs = with self; [];
292 292 doCheck = false;
293 293 propagatedBuildInputs = with self; [];
294 294 src = fetchurl {
295 295 url = "https://github.com/jelmer/subvertpy/archive/subvertpy-0.9.3.tar.gz";
296 296 md5 = "7b745a47128050ea5a73efcd913ec1cf";
297 297 };
298 298 };
299 299 translationstring = super.buildPythonPackage {
300 300 name = "translationstring-1.3";
301 301 buildInputs = with self; [];
302 302 doCheck = false;
303 303 propagatedBuildInputs = with self; [];
304 304 src = fetchurl {
305 305 url = "https://pypi.python.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
306 306 md5 = "a4b62e0f3c189c783a1685b3027f7c90";
307 307 };
308 308 };
309 309 venusian = super.buildPythonPackage {
310 310 name = "venusian-1.0";
311 311 buildInputs = with self; [];
312 312 doCheck = false;
313 313 propagatedBuildInputs = with self; [];
314 314 src = fetchurl {
315 315 url = "https://pypi.python.org/packages/86/20/1948e0dfc4930ddde3da8c33612f6a5717c0b4bc28f591a5c5cf014dd390/venusian-1.0.tar.gz";
316 316 md5 = "dccf2eafb7113759d60c86faf5538756";
317 317 };
318 318 };
319 319 waitress = super.buildPythonPackage {
320 320 name = "waitress-0.8.9";
321 321 buildInputs = with self; [];
322 322 doCheck = false;
323 323 propagatedBuildInputs = with self; [setuptools];
324 324 src = fetchurl {
325 325 url = "https://pypi.python.org/packages/ee/65/fc9dee74a909a1187ca51e4f15ad9c4d35476e4ab5813f73421505c48053/waitress-0.8.9.tar.gz";
326 326 md5 = "da3f2e62b3676be5dd630703a68e2a04";
327 327 };
328 328 };
329 329 wheel = super.buildPythonPackage {
330 330 name = "wheel-0.29.0";
331 331 buildInputs = with self; [];
332 332 doCheck = false;
333 333 propagatedBuildInputs = with self; [];
334 334 src = fetchurl {
335 335 url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-0.29.0.tar.gz";
336 336 md5 = "555a67e4507cedee23a0deb9651e452f";
337 337 };
338 338 };
339 339 zope.deprecation = super.buildPythonPackage {
340 340 name = "zope.deprecation-4.1.1";
341 341 buildInputs = with self; [];
342 342 doCheck = false;
343 343 propagatedBuildInputs = with self; [setuptools];
344 344 src = fetchurl {
345 345 url = "https://pypi.python.org/packages/c5/c9/e760f131fcde817da6c186a3f4952b8f206b7eeb269bb6f0836c715c5f20/zope.deprecation-4.1.1.tar.gz";
346 346 md5 = "ce261b9384066f7e13b63525778430cb";
347 347 };
348 348 };
349 349 zope.interface = super.buildPythonPackage {
350 350 name = "zope.interface-4.1.3";
351 351 buildInputs = with self; [];
352 352 doCheck = false;
353 353 propagatedBuildInputs = with self; [setuptools];
354 354 src = fetchurl {
355 355 url = "https://pypi.python.org/packages/9d/81/2509ca3c6f59080123c1a8a97125eb48414022618cec0e64eb1313727bfe/zope.interface-4.1.3.tar.gz";
356 356 md5 = "9ae3d24c0c7415deb249dd1a132f0f79";
357 357 };
358 358 };
359 359
360 360 ### Test requirements
361 361
362 362
363 363 }
Show file before | Show file after | Hide comments
@@ -1,34 +1,34 b''
1 1 Beaker==1.7.0
2 2 configobj==5.0.6
3 3 dulwich==0.12.0
4 hgsubversion==1.8.5
4 hgsubversion==1.8.6
5 5 infrae.cache==1.0.1
6 mercurial==3.7.3
6 mercurial==3.8.3
7 7 msgpack-python==0.4.6
8 8 py==1.4.29
9 9 pyramid==1.6.1
10 10 pyramid-jinja2==2.5
11 11 pyramid-mako==1.0.2
12 12 Pyro4==4.41
13 13 pytest==2.8.5
14 14 repoze.lru==0.6
15 15 serpent==1.12
16 16 setuptools==20.8.1
17 17 simplejson==3.7.2
18 18 subprocess32==3.2.6
19 19 # TODO: johbo: This version is not in source on PyPI currently,
20 20 # change back once this or a future version is available
21 21 https://github.com/jelmer/subvertpy/archive/subvertpy-0.9.3.tar.gz#md5=7b745a47128050ea5a73efcd913ec1cf
22 22 six==1.9.0
23 23 translationstring==1.3
24 24 waitress==0.8.9
25 25 WebOb==1.3.1
26 26 wheel==0.29.0
27 27 zope.deprecation==4.1.1
28 28 zope.interface==4.1.3
29 29 greenlet==0.4.7
30 30 gunicorn==19.6.0
31 31
32 32 # Test related requirements
33 33 mock==1.0.1
34 34 WebTest==1.4.3
Show file before | Show file after | Hide comments
@@ -1,1 +1,1 b''
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