From 685496e2ff997c7828ce77dcc01ab0511871e587 Mon Sep 17 00:00:00 2001 From: Ian Ward Date: Sat, 7 Jan 2017 12:25:16 -0500 Subject: [PATCH 1/6] [#3391] cause coding standards failure --- ckan/tests/test_coding_standards.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py index d01b61b3059..3566238627f 100644 --- a/ckan/tests/test_coding_standards.py +++ b/ckan/tests/test_coding_standards.py @@ -1,4 +1,3 @@ -# encoding: utf-8 u'''A module for coding standards tests. From b82a9366d6aa3c98472e654d7c9cc63e8d7532e4 Mon Sep 17 00:00:00 2001 From: Ian Ward Date: Sat, 7 Jan 2017 12:47:35 -0500 Subject: [PATCH 2/6] [#3391] filter functions on --segments --- ckan/ckan_nose_plugin.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ckan/ckan_nose_plugin.py b/ckan/ckan_nose_plugin.py index c0f922f479c..24141c19960 100644 --- a/ckan/ckan_nose_plugin.py +++ b/ckan/ckan_nose_plugin.py @@ -95,6 +95,11 @@ def wantClass(self, cls): return wanted + def wantFunction(self, fn): + if self.segments and hashlib.md5( + fn.__name__).hexdigest()[0] not in self.segments: + return False + def finalize(self, report): if self.segments: print 'Segments: %s' % self.segments From 09012b3fb4dcd58f05bb1cd99136b1335404040f Mon Sep 17 00:00:00 2001 From: Ian Ward Date: Sat, 7 Jan 2017 12:50:02 -0500 Subject: [PATCH 3/6] [#3391] simplify test class filtering --- ckan/ckan_nose_plugin.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/ckan/ckan_nose_plugin.py b/ckan/ckan_nose_plugin.py index 24141c19960..0b4816a703e 100644 --- a/ckan/ckan_nose_plugin.py +++ b/ckan/ckan_nose_plugin.py @@ -83,18 +83,10 @@ def options(self, parser, env): help='drop database and reinitialize before tests are run') def wantClass(self, cls): - name = cls.__name__ - - wanted = (not cls.__name__.startswith('_') - and (issubclass(cls, unittest.TestCase) - or re.search('(?:^|[\b_\./-])[Tt]est', name) - )) - - if self.segments and str(hashlib.md5(name).hexdigest())[0] not in self.segments: + if self.segments and str(hashlib.md5( + cls.__name__).hexdigest())[0] not in self.segments: return False - return wanted - def wantFunction(self, fn): if self.segments and hashlib.md5( fn.__name__).hexdigest()[0] not in self.segments: From 7e24a0aaa21ff3d942d40b01586c287c42236d8b Mon Sep 17 00:00:00 2001 From: Ian Ward Date: Sat, 7 Jan 2017 12:58:59 -0500 Subject: [PATCH 4/6] [#3391] revert "cause coding standards failure" This reverts commit 685496e2ff997c7828ce77dcc01ab0511871e587. --- ckan/tests/test_coding_standards.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py index 3566238627f..d01b61b3059 100644 --- a/ckan/tests/test_coding_standards.py +++ b/ckan/tests/test_coding_standards.py @@ -1,3 +1,4 @@ +# encoding: utf-8 u'''A module for coding standards tests. From 40a3bfd4a5aceae7ce8fc74b9f67ae339ce59605 Mon Sep 17 00:00:00 2001 From: Ian Ward Date: Sat, 7 Jan 2017 13:49:35 -0500 Subject: [PATCH 5/6] [#3391] rebalance segments (#2 running +2 minutes over #1) --- .circleci-matrix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml index c23ed996f90..8e548dc6214 100644 --- a/.circleci-matrix.yml +++ b/.circleci-matrix.yml @@ -1,6 +1,6 @@ env: -- SEGMENTS="0123" -- SEGMENTS="4567" +- SEGMENTS="01234" +- SEGMENTS="567" - SEGMENTS="89ab" - SEGMENTS="cdef" From e3ab38123461c3b4251084fd5ef3d13a433810b3 Mon Sep 17 00:00:00 2001 From: amercader Date: Tue, 29 Nov 2016 13:10:42 +0000 Subject: [PATCH 6/6] [#3327] Fix French locale --- ckan/i18n/fr/LC_MESSAGES/ckan.mo | Bin 82621 -> 82620 bytes ckan/i18n/fr/LC_MESSAGES/ckan.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/i18n/fr/LC_MESSAGES/ckan.mo b/ckan/i18n/fr/LC_MESSAGES/ckan.mo index 58c6fb9bb8e339e0a2f3ef3ffde25f0b6425f23a..9da1bb113287002fd7a6fbdd0ad80dc353bf2b75 100644 GIT binary patch delta 171 zcmdnn%DShObwiD1y%_@o!y$V{1{NUw6G%G)>3={v1xPzNFftec>E%E=5J=ww()K`F z$B~gC9!Tc^X0dxv2S|%LF)}a%X(u4<52W3IG|2pEKw1z;&xZ2XIx+Hr dB{o3?wl{NHZRfONyu>=$X@$;q4hP1qOaRHk1F1xPzPFftec=@mda5J=w!()K`F z*O8GS9!Tc`XEA$F2S|%KF)}a%X=fnq52W3JG|2qvKw1z;&w=vSIWh8q eB{o9^b~JNZZRfONyu`|qT3VF4{hmGJJthDERvnrE diff --git a/ckan/i18n/fr/LC_MESSAGES/ckan.po b/ckan/i18n/fr/LC_MESSAGES/ckan.po index c005b7d6bac..7eadd100ec5 100644 --- a/ckan/i18n/fr/LC_MESSAGES/ckan.po +++ b/ckan/i18n/fr/LC_MESSAGES/ckan.po @@ -924,7 +924,7 @@ msgstr[1] "Il y a plus de {years} ans" #: ckan/lib/formatters.py:148 msgid "{month} {day}, {year}, {hour:02}:{min:02} ({timezone})" -msgstr "{month} {day}, {year}, {heure:02}:{min:02} ({timezone})" +msgstr "{month} {day}, {year}, {hour:02}:{min:02} ({timezone})" #: ckan/lib/formatters.py:153 msgid "{month} {day}, {year}"