From 33fd66bbf513df51a9d46a5d17802ac24194962e Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Thu, 18 Jan 2018 11:56:29 -0500 Subject: [PATCH 1/3] Add regex for public bitbucket repositories --- readthedocs/projects/constants.py | 1 + 1 file changed, 1 insertion(+) diff --git a/readthedocs/projects/constants.py b/readthedocs/projects/constants.py index 8837f13b086..2f359868779 100644 --- a/readthedocs/projects/constants.py +++ b/readthedocs/projects/constants.py @@ -297,6 +297,7 @@ re.compile('github.com:(.+)/(.+)\.git$'), ] BITBUCKET_REGEXS = [ + re.compile('bitbucket.org/(.+)/(.+)\.git$'), re.compile('@bitbucket.org/(.+)/(.+)\.git$'), re.compile('bitbucket.org/(.+)/(.+)/'), re.compile('bitbucket.org/(.+)/(.+)'), From 1d6e82da0cc12331b4f20cdacfb01c7406957c48 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Thu, 18 Jan 2018 11:57:09 -0500 Subject: [PATCH 2/3] Simplify regex --- readthedocs/projects/constants.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/readthedocs/projects/constants.py b/readthedocs/projects/constants.py index 2f359868779..576f613c21d 100644 --- a/readthedocs/projects/constants.py +++ b/readthedocs/projects/constants.py @@ -299,8 +299,7 @@ BITBUCKET_REGEXS = [ re.compile('bitbucket.org/(.+)/(.+)\.git$'), re.compile('@bitbucket.org/(.+)/(.+)\.git$'), - re.compile('bitbucket.org/(.+)/(.+)/'), - re.compile('bitbucket.org/(.+)/(.+)'), + re.compile('bitbucket.org/(.+)/(.+)/?'), re.compile('bitbucket.org:(.+)/(.+)\.git$'), ] GITLAB_REGEXS = [ From 8f61f2bc670fc8a1b56eb24795a6f2082afc051b Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Thu, 18 Jan 2018 11:57:34 -0500 Subject: [PATCH 3/3] Update tests for public repositories --- readthedocs/rtd_tests/tests/test_repo_parsing.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readthedocs/rtd_tests/tests/test_repo_parsing.py b/readthedocs/rtd_tests/tests/test_repo_parsing.py index 43231d68036..f946db61e53 100644 --- a/readthedocs/rtd_tests/tests/test_repo_parsing.py +++ b/readthedocs/rtd_tests/tests/test_repo_parsing.py @@ -87,13 +87,13 @@ def test_bitbucket(self): self.assertEqual(self.version.get_bitbucket_url(docroot='/foo/bar/', filename='file'), 'https://bitbucket.org/user/repo.gitbucket.io/src/master/foo/bar/file.rst') self.pip.repo = 'https://bitbucket.org/user/repo.git' - self.assertEqual(self.version.get_bitbucket_url(docroot='/foo/bar/', filename='file'), 'https://bitbucket.org/user/repo.git/src/master/foo/bar/file.rst') + self.assertEqual(self.version.get_bitbucket_url(docroot='/foo/bar/', filename='file'), 'https://bitbucket.org/user/repo/src/master/foo/bar/file.rst') self.pip.repo = 'https://bitbucket.org/user/repo.gitbucket.io.git' - self.assertEqual(self.version.get_bitbucket_url(docroot='/foo/bar/', filename='file'), 'https://bitbucket.org/user/repo.gitbucket.io.git/src/master/foo/bar/file.rst') + self.assertEqual(self.version.get_bitbucket_url(docroot='/foo/bar/', filename='file'), 'https://bitbucket.org/user/repo.gitbucket.io/src/master/foo/bar/file.rst') self.pip.repo = 'https://bitbucket.org/user/repo.git.git' - self.assertEqual(self.version.get_bitbucket_url(docroot='/foo/bar/', filename='file'), 'https://bitbucket.org/user/repo.git.git/src/master/foo/bar/file.rst') + self.assertEqual(self.version.get_bitbucket_url(docroot='/foo/bar/', filename='file'), 'https://bitbucket.org/user/repo.git/src/master/foo/bar/file.rst') def test_bitbucket_https(self): self.pip.repo = 'https://user@bitbucket.org/user/repo.git'