# HG changeset patch # User Marcin Kuzminski # Date 2016-08-12 12:23:39 # Node ID 92a4cc6611da67302c040cc027017852904cd688 # Parent d5f644eef2aadf7959db9796f4e58a15fc3a0794 # Parent 15ba4710ae8dc19960ce9c311bc937ee14691752 release: Merge default into stable for release preparation diff --git a/.bumpversion.cfg b/.bumpversion.cfg --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.2.1 +current_version = 4.3.0 message = release: Bump version {current_version} to {new_version} [bumpversion:file:vcsserver/VERSION] diff --git a/.release.cfg b/.release.cfg --- a/.release.cfg +++ b/.release.cfg @@ -5,12 +5,10 @@ done = false done = true [task:fixes_on_stable] -done = true [task:pip2nix_generated] -done = true [release] -state = prepared -version = 4.2.1 +state = in_progress +version = 4.3.0 diff --git a/CHANGES.rst b/CHANGES.rst new file mode 100644 diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,15 @@ +# top level files +include test.ini +include MANIFEST.in +include README.rst +include CHANGES.rst +include LICENSE.txt + +include vcsserver/VERSION + +# all config files +recursive-include configs * + +# skip any tests files +recursive-exclude tests * + diff --git a/configs/development.ini b/configs/development.ini old mode 100644 new mode 120000 --- a/configs/development.ini +++ b/configs/development.ini @@ -1,79 +1,1 @@ -################################################################################ -# RhodeCode VCSServer - configuration # -# # -################################################################################ - -[DEFAULT] -host = 127.0.0.1 -port = 9900 -locale = en_US.UTF-8 -# number of worker threads, this should be set based on a formula threadpool=N*6 -# where N is number of RhodeCode Enterprise workers, eg. running 2 instances -# 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96 -threadpool_size = 96 -timeout = 0 - -# cache regions, please don't change -beaker.cache.regions = repo_object -beaker.cache.repo_object.type = memorylru -beaker.cache.repo_object.max_items = 100 -# cache auto-expires after N seconds -beaker.cache.repo_object.expire = 300 -beaker.cache.repo_object.enabled = true - - -################################ -### LOGGING CONFIGURATION #### -################################ -[loggers] -keys = root, vcsserver, pyro4, beaker - -[handlers] -keys = console - -[formatters] -keys = generic - -############# -## LOGGERS ## -############# -[logger_root] -level = NOTSET -handlers = console - -[logger_vcsserver] -level = DEBUG -handlers = -qualname = vcsserver -propagate = 1 - -[logger_beaker] -level = DEBUG -handlers = -qualname = beaker -propagate = 1 - -[logger_pyro4] -level = DEBUG -handlers = -qualname = Pyro4 -propagate = 1 - - -############## -## HANDLERS ## -############## - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = DEBUG -formatter = generic - -################ -## FORMATTERS ## -################ - -[formatter_generic] -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %Y-%m-%d %H:%M:%S +development_http.ini \ No newline at end of file diff --git a/configs/development_pyramid.ini b/configs/development_http.ini rename from configs/development_pyramid.ini rename to configs/development_http.ini --- a/configs/development_pyramid.ini +++ b/configs/development_http.ini @@ -1,5 +1,5 @@ ################################################################################ -# RhodeCode VCSServer - configuration # +# RhodeCode VCSServer with HTTP Backend - configuration # # # ################################################################################ @@ -9,6 +9,7 @@ use = egg:rhodecode-vcsserver pyramid.default_locale_name = en pyramid.includes = +# default locale used by VCS systems locale = en_US.UTF-8 # cache regions, please don't change @@ -20,9 +21,11 @@ beaker.cache.repo_object.expire = 300 beaker.cache.repo_object.enabled = true [server:main] -use = egg:waitress#main +## COMMON ## host = 0.0.0.0 -port = %(http_port)s +port = 9900 + +use = egg:waitress#main ################################ diff --git a/configs/development.ini b/configs/development_pyro4.ini copy from configs/development.ini copy to configs/development_pyro4.ini diff --git a/configs/production.ini b/configs/production.ini old mode 100644 new mode 120000 --- a/configs/production.ini +++ b/configs/production.ini @@ -1,79 +1,1 @@ -################################################################################ -# RhodeCode VCSServer - configuration # -# # -################################################################################ - -[DEFAULT] -host = 127.0.0.1 -port = 9900 -locale = en_US.UTF-8 -# number of worker threads, this should be set based on a formula threadpool=N*6 -# where N is number of RhodeCode Enterprise workers, eg. running 2 instances -# 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96 -threadpool_size = 96 -timeout = 0 - -# cache regions, please don't change -beaker.cache.regions = repo_object -beaker.cache.repo_object.type = memorylru -beaker.cache.repo_object.max_items = 100 -# cache auto-expires after N seconds -beaker.cache.repo_object.expire = 300 -beaker.cache.repo_object.enabled = true - - -################################ -### LOGGING CONFIGURATION #### -################################ -[loggers] -keys = root, vcsserver, pyro4, beaker - -[handlers] -keys = console - -[formatters] -keys = generic - -############# -## LOGGERS ## -############# -[logger_root] -level = NOTSET -handlers = console - -[logger_vcsserver] -level = DEBUG -handlers = -qualname = vcsserver -propagate = 1 - -[logger_beaker] -level = DEBUG -handlers = -qualname = beaker -propagate = 1 - -[logger_pyro4] -level = DEBUG -handlers = -qualname = Pyro4 -propagate = 1 - - -############## -## HANDLERS ## -############## - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = DEBUG -formatter = generic - -################ -## FORMATTERS ## -################ - -[formatter_generic] -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %Y-%m-%d %H:%M:%S +production_http.ini \ No newline at end of file diff --git a/configs/production_http.ini b/configs/production_http.ini new file mode 100644 --- /dev/null +++ b/configs/production_http.ini @@ -0,0 +1,111 @@ +################################################################################ +# RhodeCode VCSServer with HTTP Backend - configuration # +# # +################################################################################ + +[app:main] +use = egg:rhodecode-vcsserver + +pyramid.default_locale_name = en +pyramid.includes = + +# default locale used by VCS systems +locale = en_US.UTF-8 + +# cache regions, please don't change +beaker.cache.regions = repo_object +beaker.cache.repo_object.type = memorylru +beaker.cache.repo_object.max_items = 100 +# cache auto-expires after N seconds +beaker.cache.repo_object.expire = 300 +beaker.cache.repo_object.enabled = true + +[server:main] +## COMMON ## +host = 127.0.0.1 +port = 9900 + + +########################## +## GUNICORN WSGI SERVER ## +########################## +## run with gunicorn --log-config --paste +use = egg:gunicorn#main +## Sets the number of process workers. You must set `instance_id = *` +## when this option is set to more than one worker, recommended +## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers +## The `instance_id = *` must be set in the [app:main] section below +workers = 2 +## process name +proc_name = rhodecode_vcsserver +## type of worker class, one of sync, gevent +## recommended for bigger setup is using of of other than sync one +worker_class = sync +## The maximum number of simultaneous clients. Valid only for Gevent +#worker_connections = 10 +## max number of requests that worker will handle before being gracefully +## restarted, could prevent memory leaks +max_requests = 1000 +max_requests_jitter = 30 +## amount of time a worker can spend with handling a request before it +## gets killed and restarted. Set to 6hrs +timeout = 21600 + + + + +################################ +### LOGGING CONFIGURATION #### +################################ +[loggers] +keys = root, vcsserver, pyro4, beaker + +[handlers] +keys = console + +[formatters] +keys = generic + +############# +## LOGGERS ## +############# +[logger_root] +level = NOTSET +handlers = console + +[logger_vcsserver] +level = DEBUG +handlers = +qualname = vcsserver +propagate = 1 + +[logger_beaker] +level = DEBUG +handlers = +qualname = beaker +propagate = 1 + +[logger_pyro4] +level = DEBUG +handlers = +qualname = Pyro4 +propagate = 1 + + +############## +## HANDLERS ## +############## + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = DEBUG +formatter = generic + +################ +## FORMATTERS ## +################ + +[formatter_generic] +format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %Y-%m-%d %H:%M:%S \ No newline at end of file diff --git a/configs/production.ini b/configs/production_pyro4.ini copy from configs/production.ini copy to configs/production_pyro4.ini diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -182,13 +182,13 @@ }; }; mercurial = super.buildPythonPackage { - name = "mercurial-3.8.3"; + name = "mercurial-3.8.4"; buildInputs = with self; []; doCheck = false; propagatedBuildInputs = with self; []; src = fetchurl { - url = "https://pypi.python.org/packages/56/bc/af1561195d43638d44bc3ac286c21f187430966234bee1f235711d80dfb6/mercurial-3.8.3.tar.gz"; - md5 = "97aced7018614eeccc9621a3dea35fda"; + url = "https://pypi.python.org/packages/bc/16/b66eef0b70ee2b4ebb8e76622fe21bbed834606dd8c1bd30d6936ebf6f45/mercurial-3.8.4.tar.gz"; + md5 = "cec2c3db688cb87142809089c6ae13e9"; }; meta = { license = [ pkgs.lib.licenses.gpl1 pkgs.lib.licenses.gpl2Plus ]; @@ -299,7 +299,7 @@ }; }; rhodecode-vcsserver = super.buildPythonPackage { - name = "rhodecode-vcsserver-4.2.1"; + name = "rhodecode-vcsserver-4.3.0"; buildInputs = with self; [mock pytest WebTest]; doCheck = true; propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb]; diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ configobj==5.0.6 dulwich==0.13.0 hgsubversion==1.8.6 infrae.cache==1.0.1 -mercurial==3.8.3 +mercurial==3.8.4 msgpack-python==0.4.6 py==1.4.29 pyramid==1.6.1 diff --git a/vcsserver/VERSION b/vcsserver/VERSION --- a/vcsserver/VERSION +++ b/vcsserver/VERSION @@ -1,1 +1,1 @@ -4.2.1 \ No newline at end of file +4.3.0 \ No newline at end of file