From 5af6a8fa1c515b1dd223e524f08105a54c418a99 Mon Sep 17 00:00:00 2001 From: Marcin Lulek Date: Mon, 19 Sep 2016 13:48:37 +0200 Subject: [PATCH 01/14] channelstream: try to use proxy url's unless ws urls are not explictly defined --- configs/development.ini | 4 +++- configs/production.ini | 4 +++- rhodecode/channelstream/__init__.py | 15 +++++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/configs/development.ini b/configs/development.ini index 25f4903f..a7e07b1d 100644 --- a/configs/development.ini +++ b/configs/development.ini @@ -420,7 +420,9 @@ channelstream.server = 127.0.0.1:9800 ## location of the channelstream server from outside world ## most likely this would be an http server special backend URL, that handles ## websocket connections see nginx example for config -channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream +# channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream +## proxy path that can be used by http daemons for exposing channelstream +# channelstream.proxy_path = /_channelstream channelstream.secret = secret channelstream.history.location = %(here)s/channelstream_history diff --git a/configs/production.ini b/configs/production.ini index 82a028ff..2e8e007e 100644 --- a/configs/production.ini +++ b/configs/production.ini @@ -394,7 +394,9 @@ channelstream.server = 127.0.0.1:9800 ## location of the channelstream server from outside world ## most likely this would be an http server special backend URL, that handles ## websocket connections see nginx example for config -channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream +# channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream +## proxy path that can be used by http daemons for exposing channelstream +# channelstream.proxy_path = /_channelstream channelstream.secret = secret channelstream.history.location = %(here)s/channelstream_history diff --git a/rhodecode/channelstream/__init__.py b/rhodecode/channelstream/__init__.py index a7abefb0..39b1c69e 100644 --- a/rhodecode/channelstream/__init__.py +++ b/rhodecode/channelstream/__init__.py @@ -27,11 +27,15 @@ from rhodecode.lib.ext_json import json def url_gen(request): + registry = request.registry + longpoll_url = registry.settings.get('channelstream.longpoll_url', '') + ws_url = registry.settings.get('channelstream.ws_url', '') + proxy_url = request.route_url('channelstream_proxy') urls = { - 'connect': request.route_url('channelstream_connect'), - 'subscribe': request.route_url('channelstream_subscribe'), - 'longpoll': request.registry.settings.get('channelstream.longpoll_url', ''), - 'ws': request.registry.settings.get('channelstream.ws_url', '') + 'connect': request.route_path('channelstream_connect'), + 'subscribe': request.route_path('channelstream_subscribe'), + 'longpoll': longpoll_url or proxy_url, + 'ws': ws_url or proxy_url.replace('http', 'ws') } return json.dumps(urls) @@ -78,4 +82,7 @@ def includeme(config): config.add_route( name='channelstream_subscribe', pattern=ADMIN_PREFIX + '/channelstream/subscribe') + config.add_route( + name='channelstream_proxy', + pattern=settings.get('channelstream.proxy_path') or '/_channelstream') config.scan('rhodecode.channelstream') From 789560ba4da0ac4c83773622f3a1d97187a24803 Mon Sep 17 00:00:00 2001 From: Daniel Dourvaris Date: Mon, 19 Sep 2016 17:07:37 +0300 Subject: [PATCH 02/14] events: use branch from previous commit for repo push event commits data so that grouping works, fixes #4233 --- rhodecode/events/repo.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rhodecode/events/repo.py b/rhodecode/events/repo.py index 89b70974..527028c0 100644 --- a/rhodecode/events/repo.py +++ b/rhodecode/events/repo.py @@ -237,6 +237,11 @@ class RepoPushEvent(RepoVCSEvent): commits = _commits_as_dict( commit_ids=self.pushed_commit_ids, repos=[self.repo]) + + last_branch = None + for commit in reversed(commits): + commit['branch'] = commit['branch'] or last_branch + last_branch = commit['branch'] issues = _issues_as_dict(commits) branches = set( From 28c5525ace7c51f340ec299472a2d31281674e97 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Thu, 22 Sep 2016 13:27:40 +0200 Subject: [PATCH 03/14] pr: Use unicode object when generating the pull request title --- rhodecode/model/pull_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index 856a7b40..f20d9989 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -1018,7 +1018,7 @@ class PullRequestModel(BaseModel): } def generate_pullrequest_title(self, source, source_ref, target): - return '{source}#{at_ref} to {target}'.format( + return u'{source}#{at_ref} to {target}'.format( source=source, at_ref=source_ref, target=target, From 24f314563016ab29635045481a450ca85c3d4809 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Mon, 26 Sep 2016 16:26:33 +0200 Subject: [PATCH 04/14] gists: Remove gist_type from update method in model. #4243 We do not allow to change the gist type from public to private or vice versa. Therefore there is no need to provide a ability in the model to do it. --- rhodecode/controllers/admin/gists.py | 1 - rhodecode/model/gist.py | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rhodecode/controllers/admin/gists.py b/rhodecode/controllers/admin/gists.py index c60988d4..8f243b9a 100644 --- a/rhodecode/controllers/admin/gists.py +++ b/rhodecode/controllers/admin/gists.py @@ -299,7 +299,6 @@ class GistsController(BaseController): description=schema_data['description'], owner=c.gist.owner, gist_mapping=schema_data['nodes'], - gist_type=schema_data['gist_type'], lifetime=schema_data['lifetime'], gist_acl_level=schema_data['gist_acl_level'] ) diff --git a/rhodecode/model/gist.py b/rhodecode/model/gist.py index ab9a4d90..3cab40d1 100644 --- a/rhodecode/model/gist.py +++ b/rhodecode/model/gist.py @@ -176,8 +176,8 @@ class GistModel(BaseModel): log.error(traceback.format_exc()) raise - def update(self, gist, description, owner, gist_mapping, gist_type, - lifetime, gist_acl_level): + def update(self, gist, description, owner, gist_mapping, lifetime, + gist_acl_level): gist = self._get_gist(gist) gist_repo = gist.scm_instance() @@ -204,7 +204,6 @@ class GistModel(BaseModel): gist.gist_description = description gist.gist_expires = gist_expires gist.owner = owner - gist.gist_type = gist_type gist.acl_level = gist_acl_level self.sa.add(gist) self.sa.flush() From 2fb07e76fe18df12ca2d0e36f6d8a7b0413d827a Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Mon, 26 Sep 2016 16:26:54 +0200 Subject: [PATCH 05/14] gists: Fix wrong default value in colander schema. #4243 --- rhodecode/model/validation_schema/schemas/gist_schema.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhodecode/model/validation_schema/schemas/gist_schema.py b/rhodecode/model/validation_schema/schemas/gist_schema.py index 3677d419..2b547922 100644 --- a/rhodecode/model/validation_schema/schemas/gist_schema.py +++ b/rhodecode/model/validation_schema/schemas/gist_schema.py @@ -177,7 +177,7 @@ class GistSchema(colander.MappingSchema): gist_type = colander.SchemaNode( colander.String(), - missing=Gist.ACL_LEVEL_PUBLIC, + missing=Gist.GIST_PUBLIC, validator=colander.OneOf([Gist.GIST_PRIVATE, Gist.GIST_PUBLIC])) nodes = Nodes() From d90d10b70ea83764094362d1479fde1a1c34d9d6 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Tue, 27 Sep 2016 09:02:55 +0200 Subject: [PATCH 06/14] svn-support: Disable all mako default filters. #4244 Mako default filter may change the value in a way that breaks the apache configuration. E.g. when applying HTML escaping. --- .../svn_support/templates/mod-dav-svn.conf.mako | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rhodecode/svn_support/templates/mod-dav-svn.conf.mako b/rhodecode/svn_support/templates/mod-dav-svn.conf.mako index dea7b8a6..260c7498 100644 --- a/rhodecode/svn_support/templates/mod-dav-svn.conf.mako +++ b/rhodecode/svn_support/templates/mod-dav-svn.conf.mako @@ -26,21 +26,21 @@ # - + # The mod_dav_svn module takes the username from the apache request object. # Without authorization this will be empty and no username is logged for the # transactions. This will result in "(no author)" for each revision. The # following directives implement a fake authentication that allows every # username/password combination. AuthType Basic - AuthName ${rhodecode_realm} + AuthName ${rhodecode_realm|n} AuthBasicProvider anon Anonymous * Require valid-user DAV svn - SVNParentPath ${parent_path_root} - SVNListParentPath ${'On' if svn_list_parent_path else 'Off'} + SVNParentPath ${parent_path_root|n} + SVNListParentPath ${'On' if svn_list_parent_path else 'Off'|n} Allow from all Order allow,deny @@ -48,16 +48,16 @@ % for location, parent_path in repo_group_paths: - + AuthType Basic - AuthName ${rhodecode_realm} + AuthName ${rhodecode_realm|n} AuthBasicProvider anon Anonymous * Require valid-user DAV svn - SVNParentPath ${parent_path} - SVNListParentPath ${'On' if svn_list_parent_path else 'Off'} + SVNParentPath ${parent_path|n} + SVNListParentPath ${'On' if svn_list_parent_path else 'Off'|n} Allow from all Order allow,deny From 67df3f1bf89012c46cf4029759bfbb2b94b20f0d Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Tue, 27 Sep 2016 09:07:05 +0200 Subject: [PATCH 07/14] svn-support: Add proper escaping to the mod_dav_svn template. #4244 Without quoting names/paths with spaces are not supported. --- .../svn_support/templates/mod-dav-svn.conf.mako | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rhodecode/svn_support/templates/mod-dav-svn.conf.mako b/rhodecode/svn_support/templates/mod-dav-svn.conf.mako index 260c7498..9e43acf5 100644 --- a/rhodecode/svn_support/templates/mod-dav-svn.conf.mako +++ b/rhodecode/svn_support/templates/mod-dav-svn.conf.mako @@ -26,21 +26,21 @@ # - + # The mod_dav_svn module takes the username from the apache request object. # Without authorization this will be empty and no username is logged for the # transactions. This will result in "(no author)" for each revision. The # following directives implement a fake authentication that allows every # username/password combination. AuthType Basic - AuthName ${rhodecode_realm|n} + AuthName "${rhodecode_realm|n}" AuthBasicProvider anon Anonymous * Require valid-user DAV svn - SVNParentPath ${parent_path_root|n} - SVNListParentPath ${'On' if svn_list_parent_path else 'Off'|n} + SVNParentPath "${parent_path_root|n}" + SVNListParentPath ${"On" if svn_list_parent_path else "Off"|n} Allow from all Order allow,deny @@ -48,16 +48,16 @@ % for location, parent_path in repo_group_paths: - + AuthType Basic - AuthName ${rhodecode_realm|n} + AuthName "${rhodecode_realm|n}" AuthBasicProvider anon Anonymous * Require valid-user DAV svn - SVNParentPath ${parent_path|n} - SVNListParentPath ${'On' if svn_list_parent_path else 'Off'|n} + SVNParentPath "${parent_path|n}" + SVNListParentPath ${"On" if svn_list_parent_path else "Off"|n} Allow from all Order allow,deny From 43ff67f44d4bcc91403308d09c13b102ab933b14 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Tue, 27 Sep 2016 10:34:12 +0200 Subject: [PATCH 08/14] svn-support: Add a note about the 'Error converting entry in directory to UTF-8' error. --- .../templates/mod-dav-svn.conf.mako | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/rhodecode/svn_support/templates/mod-dav-svn.conf.mako b/rhodecode/svn_support/templates/mod-dav-svn.conf.mako index 9e43acf5..6a5acf97 100644 --- a/rhodecode/svn_support/templates/mod-dav-svn.conf.mako +++ b/rhodecode/svn_support/templates/mod-dav-svn.conf.mako @@ -7,11 +7,10 @@ # The mod_dav_svn module does not support subversion repositories which are # organized in subfolders. To support the repository groups of RhodeCode it is # required to provide a block for each group pointing to the -# repository group sub folder. -# -# To ease the configuration RhodeCode auto generates this file whenever a -# repository group is created/changed/deleted. Auto generation can be configured -# in the ini file. +# repository group sub folder. To ease the configuration RhodeCode auto +# generates this file whenever a repository group is created/changed/deleted. +# Auto generation can be configured in the ini file. Settings are prefixed with +# ``svn.proxy``. # # To include this configuration into your apache config you can use the # `Include` directive. See the following example snippet of a virtual host how @@ -24,6 +23,18 @@ # CustomLog ${'${APACHE_LOG_DIR}'}/access.log combined # Include /path/to/generated/mod_dav_svn.conf # +# +# Depending on the apache configuration you may encounter the following error if +# you are using speecial characters in your repository or repository group +# names. +# +# ``Error converting entry in directory '/path/to/repo' to UTF-8`` +# +# In this case you have to change the LANG environment variable in the apache +# configuration. This setting is typically located at ``/etc/apache2/envvars``. +# You have to change it to an UTF-8 value like ``export LANG="en_US.UTF-8"``. +# After changing this a stop and start of Apache is required (using restart +# doesn't work). From f25f5a1a6f9196ce948c1e893cbdf32ab5622bcb Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Tue, 27 Sep 2016 11:32:04 +0200 Subject: [PATCH 09/14] tests: Adapt sv_support tests to recent changes. Add quates to assertions and add unicode support. --- .../tests/test_mod_dav_svn_config.py | 61 ++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/rhodecode/svn_support/tests/test_mod_dav_svn_config.py b/rhodecode/svn_support/tests/test_mod_dav_svn_config.py index d1be3b91..2e666115 100644 --- a/rhodecode/svn_support/tests/test_mod_dav_svn_config.py +++ b/rhodecode/svn_support/tests/test_mod_dav_svn_config.py @@ -19,6 +19,7 @@ # and proprietary license terms, please see https://rhodecode.com/licenses/ +import codecs import mock import re import shutil @@ -30,6 +31,7 @@ from rhodecode.svn_support import config_keys, utils class TestModDavSvnConfig(object): + @classmethod def setup_class(cls): # Make mako renderer available in tests. @@ -39,8 +41,9 @@ class TestModDavSvnConfig(object): # Temporary directory holding the generated config files. cls.tempdir = tempfile.mkdtemp(suffix='pytest-mod-dav-svn') - cls.location_root = '/location/root' - cls.parent_path_root = '/parent/path/root' + cls.location_root = u'/location/root/çµäö' + cls.parent_path_root = u'/parent/path/çµäö' + cls._dummy_realm = u'Dummy Realm (äöüçµ)' @classmethod def teardown_class(cls): @@ -54,7 +57,6 @@ class TestModDavSvnConfig(object): return { config_keys.config_file_path: config_file_path, config_keys.location_root: cls.location_root, - config_keys.parent_path_root: cls.parent_path_root, config_keys.list_parent_path: True, } @@ -62,7 +64,7 @@ class TestModDavSvnConfig(object): def get_repo_groups(cls, count=1): repo_groups = [] for num in range(0, count): - full_path = '/path/to/RepoGroup{}'.format(num) + full_path = u'/path/to/RepöGröúp-°µ {}'.format(num) repo_group_mock = mock.MagicMock() repo_group_mock.full_path = full_path repo_group_mock.full_path_splitted = full_path.split('/') @@ -70,27 +72,33 @@ class TestModDavSvnConfig(object): return repo_groups def assert_root_location_directive(self, config): - pattern = ''.format(location=self.location_root) + pattern = u''.format( + location=self.location_root) assert len(re.findall(pattern, config)) == 1 def assert_group_location_directive(self, config, group_path): - pattern = ''.format( + pattern = u''.format( location=self.location_root, group_path=group_path) assert len(re.findall(pattern, config)) == 1 + @mock.patch('rhodecode.svn_support.utils.get_rhodecode_realm') @mock.patch('rhodecode.svn_support.utils.RepoGroup') - def test_generate_mod_dav_svn_config(self, RepoGroupMock): + def test_generate_mod_dav_svn_config(self, RepoGroupMock, GetRealmMock): + # Setup mock objects. + GetRealmMock.return_value = self._dummy_realm num_groups = 3 RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups( count=num_groups) # Execute the method under test. settings = self.get_settings() - utils.generate_mod_dav_svn_config(settings) + utils.generate_mod_dav_svn_config( + settings=settings, parent_path_root=self.parent_path_root) # Read generated file. - with open(settings[config_keys.config_file_path], 'r') as file_: - content = file_.read() + path = settings[config_keys.config_file_path] + with codecs.open(path, 'r', encoding='utf-8') as f: + content = f.read() # Assert that one location directive exists for each repository group. for group in self.get_repo_groups(count=num_groups): @@ -99,31 +107,40 @@ class TestModDavSvnConfig(object): # Assert that the root location directive exists. self.assert_root_location_directive(content) + @mock.patch('rhodecode.svn_support.utils.get_rhodecode_realm') @mock.patch('rhodecode.svn_support.utils.RepoGroup') - def test_list_parent_path_on(self, RepoGroupMock): + def test_list_parent_path_on(self, RepoGroupMock, GetRealmMock): + # Setup mock objects. + GetRealmMock.return_value = self._dummy_realm RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups() # Execute the method under test. settings = self.get_settings() settings[config_keys.list_parent_path] = True - utils.generate_mod_dav_svn_config(settings) + utils.generate_mod_dav_svn_config( + settings=settings, parent_path_root=self.parent_path_root) # Read generated file. - with open(settings[config_keys.config_file_path], 'r') as file_: - content = file_.read() + path = settings[config_keys.config_file_path] + with codecs.open(path, 'r', encoding='utf-8') as f: + content = f.read() # Make assertions. assert not re.search('SVNListParentPath\s+Off', content) assert re.search('SVNListParentPath\s+On', content) + @mock.patch('rhodecode.svn_support.utils.get_rhodecode_realm') @mock.patch('rhodecode.svn_support.utils.RepoGroup') - def test_list_parent_path_off(self, RepoGroupMock): + def test_list_parent_path_off(self, RepoGroupMock, GetRealmMock): + # Setup mock objects. + GetRealmMock.return_value = self._dummy_realm RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups() # Execute the method under test. settings = self.get_settings() settings[config_keys.list_parent_path] = False - utils.generate_mod_dav_svn_config(settings) + utils.generate_mod_dav_svn_config( + settings=settings, parent_path_root=self.parent_path_root) # Read generated file. with open(settings[config_keys.config_file_path], 'r') as file_: @@ -132,15 +149,3 @@ class TestModDavSvnConfig(object): # Make assertions. assert re.search('SVNListParentPath\s+Off', content) assert not re.search('SVNListParentPath\s+On', content) - - @mock.patch('rhodecode.svn_support.utils.log') - def test_write_does_not_raise_on_error(self, LogMock): - """ - Writing the configuration to file should never raise exceptions. - If e.g. path points to a place without write permissions. - """ - utils._write_mod_dav_svn_config( - 'content', '/dev/null/not/existing/path') - - # Assert that we log the exception. - assert LogMock.exception.called From 6d0f6b919651ecd887421d4dd4b733703a740161 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 27 Sep 2016 15:16:29 +0000 Subject: [PATCH 10/14] release: Start preparation for 4.4.1 --- .bumpversion.cfg | 2 +- .release.cfg | 15 +++++---------- rhodecode/VERSION | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index aac41fcb..8e3965a6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.4.0 +current_version = 4.4.1 message = release: Bump version {current_version} to {new_version} [bumpversion:file:rhodecode/VERSION] diff --git a/.release.cfg b/.release.cfg index 0f8adeb7..1f90fc10 100644 --- a/.release.cfg +++ b/.release.cfg @@ -4,26 +4,21 @@ done = false [task:bump_version] done = true +[task:rc_tools_pinned] + [task:fixes_on_stable] -done = true [task:pip2nix_generated] -done = true [task:changelog_updated] -done = true [task:generate_api_docs] -done = true - -[task:updated_translation] -done = true [release] -state = prepared -version = 4.4.0 +state = in_progress +version = 4.4.1 -[task:rc_tools_pinned] +[task:updated_translation] [task:generate_js_routes] diff --git a/rhodecode/VERSION b/rhodecode/VERSION index 64b5ae39..4f3470c1 100644 --- a/rhodecode/VERSION +++ b/rhodecode/VERSION @@ -1 +1 @@ -4.4.0 \ No newline at end of file +4.4.1 \ No newline at end of file From ed932e39bea955e7064a229d02238406fc7bfe6a Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 27 Sep 2016 17:25:15 +0200 Subject: [PATCH 11/14] docs: added release notes for 4.4.1 --- docs/release-notes/release-notes-4.4.1.rst | 40 ++++++++++++++++++++++ docs/release-notes/release-notes.rst | 1 + 2 files changed, 41 insertions(+) create mode 100644 docs/release-notes/release-notes-4.4.1.rst diff --git a/docs/release-notes/release-notes-4.4.1.rst b/docs/release-notes/release-notes-4.4.1.rst new file mode 100644 index 00000000..24c704d8 --- /dev/null +++ b/docs/release-notes/release-notes-4.4.1.rst @@ -0,0 +1,40 @@ +|RCE| 4.4.1 |RNS| +----------------- + +Release Date +^^^^^^^^^^^^ + +- 2016-09-27 + + +General +^^^^^^^ + +- channelstream: auto-generate the url to channelstream server if it's not + explicitly defined in the config. It allows to use a relative server + without knowing its address upfront. + + +New Features +^^^^^^^^^^^^ + + + +Security +^^^^^^^^ + + + +Performance +^^^^^^^^^^^ + + + +Fixes +^^^^^ + +- GIT: properly extract branches on events and submit them to integrations. +- Pullrequests: fix problems with unicode in auto-generated descriptions +- Gist: fixed bug in update functionality of Gists that auto changed them + to private. +- SVN: add proper escaping in the autogenerated svn mod_dav config diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst index 90c28f71..4193314e 100644 --- a/docs/release-notes/release-notes.rst +++ b/docs/release-notes/release-notes.rst @@ -9,6 +9,7 @@ Release Notes .. toctree:: :maxdepth: 1 + release-notes-4.4.1.rst release-notes-4.4.0.rst release-notes-4.3.1.rst release-notes-4.3.0.rst From 1a10b0d87757f9e6d85b940c4179e0f19b17694a Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 27 Sep 2016 15:47:52 +0000 Subject: [PATCH 12/14] release: updated pip2nix output for 4.4.1 --- .release.cfg | 4 ++++ pkgs/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index 1f90fc10..b00c11ae 100644 --- a/.release.cfg +++ b/.release.cfg @@ -5,14 +5,18 @@ done = false done = true [task:rc_tools_pinned] +done = true [task:fixes_on_stable] +done = true [task:pip2nix_generated] [task:changelog_updated] +done = true [task:generate_api_docs] +done = true [release] state = in_progress diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix index c4289eae..a77f91e9 100644 --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1417,7 +1417,7 @@ }; }; rhodecode-enterprise-ce = super.buildPythonPackage { - name = "rhodecode-enterprise-ce-4.4.0"; + name = "rhodecode-enterprise-ce-4.4.1"; buildInputs = with self; [WebTest configobj cssselect flake8 lxml mock pytest pytest-cov pytest-runner]; doCheck = true; propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments Pylons Pyro4 Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic backport-ipaddress celery channelstream colander decorator deform docutils gevent gunicorn infrae.cache ipython iso8601 kombu msgpack-python packaging psycopg2 py-gfm pycrypto pycurl pyparsing pyramid pyramid-debugtoolbar pyramid-mako pyramid-beaker pysqlite python-dateutil python-ldap python-memcached python-pam recaptcha-client repoze.lru requests simplejson waitress zope.cachedescriptors dogpile.cache dogpile.core psutil py-bcrypt]; From 3556e3ba6b5c809d000ebf9e15b22b55ca1dd6ef Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 27 Sep 2016 15:47:53 +0000 Subject: [PATCH 13/14] release: Finish preparation for 4.4.1 --- .release.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index b00c11ae..b2fa59a7 100644 --- a/.release.cfg +++ b/.release.cfg @@ -11,6 +11,7 @@ done = true done = true [task:pip2nix_generated] +done = true [task:changelog_updated] done = true @@ -19,7 +20,7 @@ done = true done = true [release] -state = in_progress +state = prepared version = 4.4.1 [task:updated_translation] From b66d7cc7d49eed5cb0155dc84b7ddcb34bd1bc55 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 27 Sep 2016 15:47:54 +0000 Subject: [PATCH 14/14] Added tag v4.4.1 for changeset 8dd86b410b1a