hash
stringlengths
40
40
diff
stringlengths
131
26.7k
message
stringlengths
7
694
project
stringlengths
5
67
split
stringclasses
1 value
diff_languages
stringlengths
2
24
c5a4fe49b6e20007119725a94e70ccbc556f8634
diff --git a/yfi/yql.py b/yfi/yql.py index <HASH>..<HASH> 100644 --- a/yfi/yql.py +++ b/yfi/yql.py @@ -88,7 +88,7 @@ class Yql: though""" return self.compiled_str - def get(self): + def run(self): """Execute the query inside of self.compiled_str. This method returns a JSON object for easy manipulation unless another format is specified""" self.compile()
Changed exec to run to eliminate shadowing
nickelkr_yfi
train
py
dd13cbf43a5e1f2b12ed32d0b3a5f80d3f62f007
diff --git a/tests/const.py b/tests/const.py index <HASH>..<HASH> 100644 --- a/tests/const.py +++ b/tests/const.py @@ -7,7 +7,7 @@ # Requirements: # - Must contain /bin/bash (TestMain::test_*shell_override*) # -DOCKER_IMAGE = 'debian:8.2' +DOCKER_IMAGE = 'debian:10' # Alternate Docker image # This image is used for alternate tests (e.g. pulling) and should be small.
test: Update DOCKER_IMAGE to debian:<I> Rationale: - debian:<I> is old - debian:<I> uses a v1 schema manifest - debian:<I> is cached in Ubuntu:<I> GitHub actions image: <URL>
JonathonReinhart_scuba
train
py
1f38e00329fed0dc0af8a9215d766413aa214467
diff --git a/lib/wiselinks/headers.rb b/lib/wiselinks/headers.rb index <HASH>..<HASH> 100644 --- a/lib/wiselinks/headers.rb +++ b/lib/wiselinks/headers.rb @@ -12,7 +12,10 @@ module Wiselinks end def render(options = {}, *args, &block) - if self.request.wiselinks? + if self.request.wiselinks? + response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate' + response.headers['Pragma'] = 'no-cache' + if self.request.wiselinks_partial? Wiselinks.log("processing partial request") options[:partial] ||= action_name
Added headers to prevent caching in Chrome
igor-alexandrov_wiselinks
train
rb
af67b7adf828dd813764b2f4f17620ed91f4b902
diff --git a/src/toil/jobStores/aws/jobStore.py b/src/toil/jobStores/aws/jobStore.py index <HASH>..<HASH> 100644 --- a/src/toil/jobStores/aws/jobStore.py +++ b/src/toil/jobStores/aws/jobStore.py @@ -778,7 +778,10 @@ class AWSJobStore(AbstractJobStore): retry timeout expires. """ log.debug("Binding to job store domain '%s'.", domain_name) - for attempt in retry_sdb(predicate=lambda e: no_such_sdb_domain(e) or sdb_unavailable(e)): + retryargs = dict(predicate=lambda e: no_such_sdb_domain(e) or sdb_unavailable(e)) + if not block: + retryargs['timeout'] = 15 + for attempt in retry_sdb(**retryargs): with attempt: try: return self.db.get_domain(domain_name)
Lower timeout for domain binding in Toil Clean (resolves #<I>)
DataBiosphere_toil
train
py
26df847410ff7a3c1a865d0aea2eb606572c0d78
diff --git a/contrib/externs/angular-1.5.js b/contrib/externs/angular-1.5.js index <HASH>..<HASH> 100644 --- a/contrib/externs/angular-1.5.js +++ b/contrib/externs/angular-1.5.js @@ -452,7 +452,7 @@ angular.LinkingFunctions.post = function(scope, iElement, iAttrs, controller) { * function(!angular.JQLite=,!angular.Attributes=)| * undefined), * terminal: (boolean|undefined), - * transclude: (boolean|string|undefined) + * transclude: (boolean|string|!Object.<string, string>|undefined) * }} */ angular.Directive;
Add !Object<string,string> as a possible type for the transclude field of angular.Directive ------------- Created by MOE: <URL>
google_closure-compiler
train
js
572549e07bc362761501ea4563f853724ae39565
diff --git a/lib/jekyll/admin/static_server.rb b/lib/jekyll/admin/static_server.rb index <HASH>..<HASH> 100644 --- a/lib/jekyll/admin/static_server.rb +++ b/lib/jekyll/admin/static_server.rb @@ -3,8 +3,8 @@ module Jekyll class StaticServer < Sinatra::Base set :public_dir, File.expand_path("./public/dist", File.dirname(__FILE__)) - # Allow `/admin` and `/admin/` to serve `/public/dist/index.html` - get "/" do + # Allow `/admin` and `/admin/`, and `/admin/*` to serve `/public/dist/index.html` + get "/*" do send_file index_path end diff --git a/spec/static_server_spec.rb b/spec/static_server_spec.rb index <HASH>..<HASH> 100644 --- a/spec/static_server_spec.rb +++ b/spec/static_server_spec.rb @@ -10,4 +10,10 @@ describe Jekyll::Admin::StaticServer do expect(last_response).to be_ok expect(last_response.body).to match(/<body>/) end + + it "returns the index for non-existent paths" do + get '/collections' + expect(last_response).to be_ok + expect(last_response.body).to match(/<body>/) + end end
always return the index for any non-asset path
jekyll_jekyll-admin
train
rb,rb
6cc18d1dc6db451644cbfa2bd4bcd3415402a03d
diff --git a/NavigationGlimpse/navigation.glimpse.js b/NavigationGlimpse/navigation.glimpse.js index <HASH>..<HASH> 100644 --- a/NavigationGlimpse/navigation.glimpse.js +++ b/NavigationGlimpse/navigation.glimpse.js @@ -160,15 +160,15 @@ context.fillText(state.navigationLinks.length + linkText, state.x + 5, state.y + 12); } context.textAlign = 'right'; + var text = null; if (state.current) - context.fillText('current', state.x + state.w - 5, state.y + 12); - if (state.previous) { - var previousText = state.back ? 'previous & back' : 'previous'; - context.fillText(previousText, state.x + state.w - 5, state.y + 12); - } else { - if (state.back) - context.fillText('back ' + state.back, state.x + state.w - 5, state.y + 12); - } + text = !state.previous ? 'current' : 'previous & current'; + if (state.back) + text = !state.previous ? 'back ' + state.back : 'previous & back'; + if (!text && state.previous) + text = 'previous'; + if (text) + context.fillText(text, state.x + state.w - 5, state.y + 12); } }, processSelectedState = function (elements, state) {
Not only can it be previous & back but it can be previous & current (after a refresh).
grahammendick_navigation
train
js
45b931f6147198f721b956a783287628191ffe49
diff --git a/tests/test_bitstruct.py b/tests/test_bitstruct.py index <HASH>..<HASH> 100644 --- a/tests/test_bitstruct.py +++ b/tests/test_bitstruct.py @@ -713,6 +713,13 @@ class BitStructTest(unittest.TestCase): self.assertEqual(str(cm.exception), "'fam' not found in data dictionary") + with self.assertRaises(Error) as cm: + data = bytearray(3) + pack_into_dict(fmt, names, data, 0, unpacked) + + self.assertEqual(str(cm.exception), + "'fam' not found in data dictionary") + def test_compile_pack_unpack_formats(self): fmts = [ ('u1s2p3', None, (1, -1)),
Test of pack_into_dict with missing value.
eerimoq_bitstruct
train
py
9870fa88312a563b9f9307800b9b0dc9153c8573
diff --git a/cors_test.go b/cors_test.go index <HASH>..<HASH> 100644 --- a/cors_test.go +++ b/cors_test.go @@ -68,7 +68,7 @@ func Test_OtherHeaders(t *testing.T) { AllowCredentials: true, AllowMethods: []string{"PATCH", "GET"}, AllowHeaders: []string{"Origin", "X-whatever"}, - ExposeHeaders: []string{"Content-Length"}, + ExposeHeaders: []string{"Content-Length", "Hello"}, MaxAge: 5 * time.Minute, })) @@ -93,8 +93,8 @@ func Test_OtherHeaders(t *testing.T) { t.Errorf("Allow-Headers is expected to be Origin,X-whatever; found %v", headersVal) } - if exposedHeadersVal != "Content-Length" { - t.Errorf("Expose-Headers are expected to be Content-Length, found %v", exposedHeadersVal) + if exposedHeadersVal != "Content-Length,Hello" { + t.Errorf("Expose-Headers are expected to be Content-Length,Hello. Found %v", exposedHeadersVal) } if maxAgeVal != "300" {
-n [Migrated] Testing multiple expose headers.
martini-contrib_cors
train
go
f36e84f093e7bf3cc7bab48a1e07a1a77b6b87c8
diff --git a/tools/run_tests/xds_k8s_test_driver/tests/baseline_test.py b/tools/run_tests/xds_k8s_test_driver/tests/baseline_test.py index <HASH>..<HASH> 100644 --- a/tools/run_tests/xds_k8s_test_driver/tests/baseline_test.py +++ b/tools/run_tests/xds_k8s_test_driver/tests/baseline_test.py @@ -44,16 +44,14 @@ class BaselineTest(xds_k8s_testcase.RegularXdsKubernetesTestCase): with self.subTest('4_create_forwarding_rule'): self.td.create_forwarding_rule(self.server_xds_port) - test_servers: _XdsTestServer with self.subTest('5_start_test_server'): - test_servers = self.startTestServers() + test_server: _XdsTestServer = self.startTestServers()[0] with self.subTest('6_add_server_backends_to_backend_service'): self.setupServerBackends() - test_client: _XdsTestClient with self.subTest('7_start_test_client'): - test_client = self.startTestClient(test_servers[0]) + test_client: _XdsTestClient = self.startTestClient(test_server) with self.subTest('8_test_client_xds_config_exists'): self.assertXdsConfigExists(test_client)
xds-k8s: Fix incorrect type hint in the baseline test (#<I>)
grpc_grpc
train
py
76cfe1700248cd3c7086333b67050f418a897a03
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index <HASH>..<HASH> 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -36,7 +36,7 @@ , transEndEventNames = { 'WebkitTransition' : 'webkitTransitionEnd' , 'MozTransition' : 'transitionend' - , 'OTransition' : 'otransitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' , 'msTransition' : 'MSTransitionEnd' , 'transition' : 'transitionend' }
Fix transition end name for opera <I> Fix transition end name for Opera <I> and Opera <I>. Should fix issues: #<I>, #<I>, #<I>, #<I>
twbs_bootstrap
train
js
0fa16bf12d9489752975aa1646012682eac286ea
diff --git a/remoteservice/wit.go b/remoteservice/wit.go index <HASH>..<HASH> 100644 --- a/remoteservice/wit.go +++ b/remoteservice/wit.go @@ -160,8 +160,7 @@ func (r *RemoteWITServiceCaller) GetWITUser(ctx context.Context, req *goa.Reques } identity = &account.Identity{ - ProfileURL: witServiceUser.Data.Attributes.URL, - UserID: account.NullUUID{UUID: user.ID, Valid: true}, + UserID: account.NullUUID{UUID: user.ID, Valid: true}, } if witServiceUser.Data.Attributes.IdentityID != nil {
Don't fetch profileURL from WIT (#<I>)
fabric8-services_fabric8-auth
train
go
601e2f757acbd9d609807707c23371512dc834e6
diff --git a/pysd/py_backend/vensim/vensim2py.py b/pysd/py_backend/vensim/vensim2py.py index <HASH>..<HASH> 100644 --- a/pysd/py_backend/vensim/vensim2py.py +++ b/pysd/py_backend/vensim/vensim2py.py @@ -276,7 +276,7 @@ def get_equation_components(equation_str, root_path=None): name = basic_id / escape_group literal_subscript = subscript _ ("," _ subscript _)* - imported_subscript = func _ "(" _ (string _ ","? _)* ")" + imported_subscript = imp_subs_func _ "(" _ (string _ ","? _)* ")" numeric_range = _ (range / value) _ ("," _ (range / value) _)* value = _ sequence_id _ range = "(" _ sequence_id _ "-" _ sequence_id _ ")" @@ -594,10 +594,7 @@ functions = { "original_name": "INVERT MATRIX"}, "get time value": {"name": "not_implemented_function", "module": "functions", - "original_name": "GET TIME VALUE"}, - "sample if true": {"name": "not_implemented_function", - "module": "functions", - "original_name": "SAMPLE IF TRUE"} + "original_name": "GET TIME VALUE"} } # list of fuctions that accept a dimension to apply over
The conflict merged and tests bugs fixed
JamesPHoughton_pysd
train
py
fad372d4bae8224c245a5984c86dac34caafaa47
diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php index <HASH>..<HASH> 100644 --- a/code/Control/UserDefinedFormController.php +++ b/code/Control/UserDefinedFormController.php @@ -323,7 +323,7 @@ JS // Merge fields are used for CMS authors to reference specific form fields in email content $mergeFields = $this->getMergeFieldsMap($emailData['Fields']); - if ($attachments) { + if ($attachments && (bool) $recipient->HideFormData === false) { foreach ($attachments as $file) { /** @var File $file */ if ((int) $file->ID === 0) {
Only add attachments when HideFormData-setting is not set for this recipient
silverstripe_silverstripe-userforms
train
php
bfa212f1596dd2321f86f38b0ce70569a8b33684
diff --git a/packages/neos-ui/src/Containers/ContentCanvas/index.js b/packages/neos-ui/src/Containers/ContentCanvas/index.js index <HASH>..<HASH> 100644 --- a/packages/neos-ui/src/Containers/ContentCanvas/index.js +++ b/packages/neos-ui/src/Containers/ContentCanvas/index.js @@ -106,10 +106,10 @@ export default class ContentCanvas extends PureComponent { canvasContentOnlyStyle.overflow = 'auto'; } - if (backgroundColor && !currentEditPreviewModeConfiguration.backgroundColor) { - canvasContentStyle.background = backgroundColor; - } else if (currentEditPreviewModeConfiguration.backgroundColor) { + if (currentEditPreviewModeConfiguration.backgroundColor) { canvasContentStyle.background = currentEditPreviewModeConfiguration.backgroundColor; + } else if (backgroundColor) { + canvasContentStyle.background = backgroundColor; } // ToDo: Is the `[data-__neos__hook]` attr used?
TASK: Reduce logical complexity by changing the order of the if statements
neos_neos-ui
train
js
74534781b96bd4969e5ca6b97f56b6eef3175734
diff --git a/api-spec-testing/rspec_matchers.rb b/api-spec-testing/rspec_matchers.rb index <HASH>..<HASH> 100644 --- a/api-spec-testing/rspec_matchers.rb +++ b/api-spec-testing/rspec_matchers.rb @@ -229,6 +229,11 @@ RSpec::Matchers.define :match_response do |pairs, test| # match: {task: '/.+:\d+/'} if expected[0] == "/" && expected[-1] == "/" /#{expected.tr("/", "")}/ =~ actual_value + elsif !!(expected.match?(/[0-9]{1}\.[0-9]+E[0-9]+/)) + # When the value in the yaml test is a big number, the format is + # different from what Ruby uses, so we transform X.XXXXEXX to X.XXXXXe+XX + # to be able to compare the values + actual_value.to_s == expected.gsub('E', 'e+') elsif expected == '' actual_value == response else
[API] Updates rspec matchers in YAML test runners to be able to compare big numbers
elastic_elasticsearch-ruby
train
rb
c0662159b7243547016f870bdeaaa24d223d6656
diff --git a/treetime/treetime.py b/treetime/treetime.py index <HASH>..<HASH> 100644 --- a/treetime/treetime.py +++ b/treetime/treetime.py @@ -27,8 +27,8 @@ class TreeTime(ClockTree): # initially, infer ancestral sequences and infer gtr model if desired if use_input_branch_length: - self.infer_ancestral_sequences(infer_gtr=infer_gtr, - prune_short=True, **seq_kwargs) + self.infer_ancestral_sequences(infer_gtr=infer_gtr, **seq_kwargs) + self.prune_short_branches() else: self.optimize_sequences_and_branch_length(infer_gtr=infer_gtr, max_iter=2, prune_short=True, **seq_kwargs) @@ -46,7 +46,7 @@ class TreeTime(ClockTree): self.reroot(root=root) if use_input_branch_length: - self.infer_ancestral_sequences(prune_short=False, **seq_kwargs) + self.infer_ancestral_sequences(**seq_kwargs) else: self.optimize_sequences_and_branch_length(max_iter=2,**seq_kwargs)
prune short branches even when not optizing branch length
neherlab_treetime
train
py
27d6d7d708eb688a1a154fa129b6fe57e5d86ea3
diff --git a/afkak/test/test_brokerclient.py b/afkak/test/test_brokerclient.py index <HASH>..<HASH> 100644 --- a/afkak/test/test_brokerclient.py +++ b/afkak/test/test_brokerclient.py @@ -365,6 +365,12 @@ class KafkaBrokerClientTestCase(unittest.TestCase): c.connector.factory = c # MemoryReactor doesn't make this connection. def test_delay_reset(self): + """test_delay_reset + Test that reconnect delay is handled correctly: + 1) That initializer values are respected + 2) That delay maximum is respected + 3) That delay is reset to initial delay on successful connection + """ init_delay = last_delay = 0.025 max_delay = 14 reactor = MemoryReactorClock()
Add docstring comment to new test as requested by review.
ciena_afkak
train
py
a4d7908d84ad2df643b1e87d1f6dfcb75c07f687
diff --git a/lib/geocoder/lookups/yandex.rb b/lib/geocoder/lookups/yandex.rb index <HASH>..<HASH> 100644 --- a/lib/geocoder/lookups/yandex.rb +++ b/lib/geocoder/lookups/yandex.rb @@ -18,6 +18,7 @@ module Geocoder::Lookup end def query_url(query, reverse = false) + query = query.split(",").reverse.join(",") if reverse params = { :geocode => query, :format => "json", diff --git a/lib/geocoder/results/yandex.rb b/lib/geocoder/results/yandex.rb index <HASH>..<HASH> 100644 --- a/lib/geocoder/results/yandex.rb +++ b/lib/geocoder/results/yandex.rb @@ -4,7 +4,7 @@ module Geocoder::Result class Yandex < Base def coordinates - @data['GeoObject']['Point']['pos'].split(' ').map(&:to_f) + @data['GeoObject']['Point']['pos'].split(' ').reverse.map(&:to_f) end def address(format = :full)
Reverse coordinate order for Yandex. On input and output (expects/returns lon,lat instead of lat,lon).
alexreisner_geocoder
train
rb,rb
ed796af6b7ff97f0f38e90f0fbb203f8b68286c9
diff --git a/lib/providers/index.js b/lib/providers/index.js index <HASH>..<HASH> 100644 --- a/lib/providers/index.js +++ b/lib/providers/index.js @@ -119,6 +119,38 @@ module.exports = { * OAuth 2.0 Providers */ + + '37signals': { + id: '37signals', + name: '37signals', + protocol: 'OAuth 2.0', + url: '', + redirect_uri: config.issuer + '/connect/37signals/callback', + endpoints: { + authorize: { + url: 'https://launchpad.37signals.com/authorization/new', + method: 'POST' + }, + token: { + url: 'https://launchpad.37signals.com/authorization/token', + method: 'POST', + auth: 'client_secret_basic' + }, + user: { + url: 'https://launchpad.37signals.com/authorization.json', + method: 'GET', + auth: { + header: 'Authorization', + scheme: 'Bearer' + } + } + }, + mapping: { + + } + }, + + angellist: { id: 'angellist', name: 'angellist',
Draft <I>signals OAuth <I> provider integration
anvilresearch_connect
train
js
4c95e165c6b5664d4617a3cf716aa556b4e8d8e5
diff --git a/webmentiontools/send.py b/webmentiontools/send.py index <HASH>..<HASH> 100644 --- a/webmentiontools/send.py +++ b/webmentiontools/send.py @@ -1,6 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +import itertools import urlparse import re import requests @@ -50,11 +51,10 @@ class WebmentionSend(): html = r.text soup = BeautifulSoup(html) tag = None - for name in 'link', 'a': - for rel in 'webmention', 'http://webmention.org/': - tag = soup.find(name, attrs={'rel': rel}) - if tag: - break + for name, rel in itertools.product(('link', 'a'), ('webmention', 'http://webmention.org/')): + tag = soup.find(name, attrs={'rel': rel}) + if tag: + break if tag and tag.get('href'): # add the base scheme and host to relative endpoints
fix bug introduced by f<I>a<I>f3a<I>cba<I>af<I>d0cd<I> break only breaks out of one loop :P
Ryuno-Ki_webmention-tools
train
py
e8cf2baa63bda8305020ea41407b0c1b122398d2
diff --git a/src/specs/index.js b/src/specs/index.js index <HASH>..<HASH> 100644 --- a/src/specs/index.js +++ b/src/specs/index.js @@ -6,7 +6,7 @@ describe('ui-harness', function() { require('./it-server.spec'); require('./PropTypes.spec'); require('./page.spec'); - require('./typescript.spec.tsx') + require('./typescript.spec') }); // External libs.
Remove .tsx extension from specs/index.js
philcockfield_ui-harness
train
js
1cce706e7e9b8dc4c4ad693296577620f5be25e9
diff --git a/lib/active_scaffold/actions/batch_destroy.rb b/lib/active_scaffold/actions/batch_destroy.rb index <HASH>..<HASH> 100644 --- a/lib/active_scaffold/actions/batch_destroy.rb +++ b/lib/active_scaffold/actions/batch_destroy.rb @@ -19,7 +19,8 @@ module ActiveScaffold::Actions end when :delete_all then do_search if respond_to? :do_search - active_scaffold_config.model.delete_all(all_conditions) + # dummy condition cause we have to call delete_all on relation not on association + beginning_of_chain.where('1=1').delete_all(all_conditions) else Rails.logger.error("Unknown process_mode: #{active_scaffold_config.batch_destroy.process_mode} for action batch_destroy") end
Bugfix: using delete_all process mode in nested_scope destroy all model records instead of just the one for the nesting (issue 1 by jsurrett)
vhochstein_active_scaffold_batch
train
rb
56457161595a47626b5744f1ae9380680a02c690
diff --git a/lib/ruote/worker.rb b/lib/ruote/worker.rb index <HASH>..<HASH> 100644 --- a/lib/ruote/worker.rb +++ b/lib/ruote/worker.rb @@ -102,6 +102,8 @@ module Ruote @state = 'running' @run_thread = Thread.new { run } + + @run_thread['worker'] = self @run_thread['worker_name'] = @name end
place link to worker in its @run_thread['worker']
jmettraux_ruote
train
rb
232b917be0d37d9ec73b763d6839665808b8a596
diff --git a/src/ClientEngine.js b/src/ClientEngine.js index <HASH>..<HASH> 100644 --- a/src/ClientEngine.js +++ b/src/ClientEngine.js @@ -50,7 +50,6 @@ export default class ClientEngine { healthCheckRTTSample: 10, stepPeriod: 1000 / GAME_UPS, scheduler: 'fixed', - clientIDSpace: 1000000, //todo add docs }, inputOptions); /**
remove clientIDSpace from clientEngine.. this needs a more robust solution
lance-gg_lance
train
js
653fcabba96546395e396adfdf64359bd6255929
diff --git a/azurerm/internal/services/costmanagement/cost_management_export_resource_group_resource_test.go b/azurerm/internal/services/costmanagement/cost_management_export_resource_group_resource_test.go index <HASH>..<HASH> 100644 --- a/azurerm/internal/services/costmanagement/cost_management_export_resource_group_resource_test.go +++ b/azurerm/internal/services/costmanagement/cost_management_export_resource_group_resource_test.go @@ -1,9 +1,8 @@ package costmanagement_test import ( - `context` + "context" "fmt" - "net/http" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource"
make fmt and fix tests
terraform-providers_terraform-provider-azurerm
train
go
30d23159d26274ae706769ff2b7fbf7ebe364fce
diff --git a/src/main/java/com/googlecode/lanterna/gui2/LayoutManager.java b/src/main/java/com/googlecode/lanterna/gui2/LayoutManager.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/googlecode/lanterna/gui2/LayoutManager.java +++ b/src/main/java/com/googlecode/lanterna/gui2/LayoutManager.java @@ -39,5 +39,6 @@ public interface LayoutManager { TerminalPosition getTopLeftCorner(); TerminalSize getSize(); Component getComponent(); + boolean isVisible(); } }
Changing the interface of LayoutManager
mabe02_lanterna
train
java
10419b8e3d0fac660c6de4d4f5427cde489d1d10
diff --git a/vendor/plugins/refinery_settings/app/models/refinery_setting.rb b/vendor/plugins/refinery_settings/app/models/refinery_setting.rb index <HASH>..<HASH> 100644 --- a/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +++ b/vendor/plugins/refinery_settings/app/models/refinery_setting.rb @@ -59,7 +59,7 @@ class RefinerySetting < ActiveRecord::Base if self.column_names.include?('scoping') setting = find_or_create_by_name_and_scoping(:name => name.to_s, :value => the_value, :scoping => scoping, :restricted => restricted) else - setting = find_or_create_by_name(:name => name.to_s, :value => the_value, :required => restricted) + setting = find_or_create_by_name(:name => name.to_s, :value => the_value, :restricted => restricted) end # cache whatever we found including its scope in the name, even if it's nil.
At this point, things are getting out of hand.
refinery_refinerycms
train
rb
622022374c9dd2b1ba2f4a70bffbbd561495bf49
diff --git a/lib/Studio.js b/lib/Studio.js index <HASH>..<HASH> 100644 --- a/lib/Studio.js +++ b/lib/Studio.js @@ -306,8 +306,12 @@ module.exports = function(controller) { if(options.execute){ var script = options.execute.script; var thread = options.execute.thread; - controller.studio.run(bot, script, convo.source_message.user, convo.source_message.channel, convo.original_message).then(function(new_convo){ + controller.studio.get(bot, script, convo.source_message.user, convo.source_message.channel, convo.source_message).then(function(new_convo){ convo.stop('transitioning to ', script); + // new_convo.transcript = convo.transcript; + new_convo.responses = convo.responses; + new_convo.vars = convo.vars; + new_convo.activate(); new_convo.gotoThread(thread); }) }
new convo getting vars and responses from old convo
howdyai_botkit
train
js
4058bcaa5d1334b02abe3d9cc28e705cc5473d87
diff --git a/src/pymlab/sensors/atmega.py b/src/pymlab/sensors/atmega.py index <HASH>..<HASH> 100755 --- a/src/pymlab/sensors/atmega.py +++ b/src/pymlab/sensors/atmega.py @@ -1,6 +1,6 @@ #!/usr/bin/python -import smbus +#import smbus import time from pymlab.sensors import Device diff --git a/src/pymlab/sensors/i2chub.py b/src/pymlab/sensors/i2chub.py index <HASH>..<HASH> 100755 --- a/src/pymlab/sensors/i2chub.py +++ b/src/pymlab/sensors/i2chub.py @@ -3,7 +3,7 @@ import logging -import smbus +#import smbus from pymlab.sensors import Device, SimpleBus diff --git a/src/pymlab/sensors/sht25.py b/src/pymlab/sensors/sht25.py index <HASH>..<HASH> 100755 --- a/src/pymlab/sensors/sht25.py +++ b/src/pymlab/sensors/sht25.py @@ -1,6 +1,6 @@ #!/usr/bin/python -import smbus +#import smbus import time from pymlab.sensors import Device
Remove unused smbus imports from some modules.
MLAB-project_pymlab
train
py,py,py
213e072cb379e28f8eaea9eab67208e855cc0103
diff --git a/DependencyInjection/ClientFactory.php b/DependencyInjection/ClientFactory.php index <HASH>..<HASH> 100644 --- a/DependencyInjection/ClientFactory.php +++ b/DependencyInjection/ClientFactory.php @@ -395,7 +395,15 @@ class ClientFactory return ['id' => $user->getUserIdentifier()]; } - return ['id' => $user->getUsername()]; + // Symfony 5.4 and below use 'getUsername' ('getUserIdentifier' + // wasn't added to the interface until Symfony 6.0 for BC) + if (method_exists(UserInterface::class, 'getUsername')) { + return ['id' => $user->getUsername()]; + } + + // if neither method exists then we don't know how to deal with + // this version of Symfony's UserInterface, so can't get an ID + return; } return ['id' => (string) $user];
Guard against future changes to UserInterface
bugsnag_bugsnag-symfony
train
php
029c24d3b6fb2d9c805b20876ab051a73a07ffdb
diff --git a/org.carewebframework.testharness.webapp/src/main/java/org/carewebframework/testharness/security/impl/MockAuthenticationProvider.java b/org.carewebframework.testharness.webapp/src/main/java/org/carewebframework/testharness/security/impl/MockAuthenticationProvider.java index <HASH>..<HASH> 100644 --- a/org.carewebframework.testharness.webapp/src/main/java/org/carewebframework/testharness/security/impl/MockAuthenticationProvider.java +++ b/org.carewebframework.testharness.webapp/src/main/java/org/carewebframework/testharness/security/impl/MockAuthenticationProvider.java @@ -17,6 +17,7 @@ import org.carewebframework.api.domain.EntityIdentifier; import org.carewebframework.api.domain.IInstitution; import org.carewebframework.api.domain.IUser; import org.carewebframework.api.property.PropertyUtil; +import org.carewebframework.common.StrUtil; import org.carewebframework.security.spring.AbstractAuthenticationProvider; import org.carewebframework.security.spring.CWFAuthenticationDetails; @@ -147,7 +148,7 @@ public class MockAuthenticationProvider extends AbstractAuthenticationProvider { @Override protected List<String> getAuthorities(IUser user) { - return user == null ? null : PropertyUtil.getValues("mock.authorities", null); + return user == null ? null : StrUtil.toList(PropertyUtil.getValue("mock.authorities", null), ","); } }
Allow comma delimiter for mock authorities.
carewebframework_carewebframework-core
train
java
997908d6596c58bbbdb76a40b7241a95e06df286
diff --git a/src/main/org/openscience/cdk/io/iterator/IteratingMDLReader.java b/src/main/org/openscience/cdk/io/iterator/IteratingMDLReader.java index <HASH>..<HASH> 100644 --- a/src/main/org/openscience/cdk/io/iterator/IteratingMDLReader.java +++ b/src/main/org/openscience/cdk/io/iterator/IteratingMDLReader.java @@ -156,6 +156,8 @@ public class IteratingMDLReader extends DefaultIteratingChemObjectReader impleme logger.debug("MDL file part read: ", buffer); ISimpleChemObjectReader reader = factory.createReader(currentFormat); reader.setReader(new StringReader(buffer.toString())); + reader.setErrorHandler(this.errorHandler); + reader.setReaderMode(this.mode); if (currentFormat instanceof MDLV2000Format) { reader.addChemObjectIOListener(this); ((MDLV2000Reader)reader).customizeJob();
Fixed propagating of the error handler and reading mode.
cdk_cdk
train
java
b0d20ca56194332f7e6e1759d9cc1d8d6d850ddc
diff --git a/src/apexpy/apex.py b/src/apexpy/apex.py index <HASH>..<HASH> 100644 --- a/src/apexpy/apex.py +++ b/src/apexpy/apex.py @@ -57,6 +57,8 @@ class Apex(object): Notes ----- The calculations use IGRF-12 with coefficients from 1900 to 2020 [1]_. + + The geodetic reference ellipsoid is WGS84. References ----------
Update apex.py adding a note to the `Apex` class to address #<I>
aburrell_apexpy
train
py
cfb5009b055b8761c923b435cf5029ff873534d3
diff --git a/test/main.js b/test/main.js index <HASH>..<HASH> 100644 --- a/test/main.js +++ b/test/main.js @@ -50,6 +50,7 @@ describe('gulp-inject', function () { should.exist(newFile); should.exist(newFile.contents); + newFile.base.should.equal(path.join(__dirname, 'fixtures')); String(newFile.contents).should.equal(String(expectedFile('defaults.html').contents)); done();
Adding test to verify Issue #3 is fixed
klei_gulp-inject
train
js
6cac6e82dd845506240556651f2b42f938acbd00
diff --git a/atomic_reactor/utils/koji.py b/atomic_reactor/utils/koji.py index <HASH>..<HASH> 100644 --- a/atomic_reactor/utils/koji.py +++ b/atomic_reactor/utils/koji.py @@ -212,18 +212,18 @@ def stream_task_output(session, task_id, file_name, def tag_koji_build(session, build_id, target, poll_interval=5): - logger.debug('Finding build tag for target %s', target) + logger.debug('Finding destination tag for target %s', target) target_info = session.getBuildTarget(target) - build_tag = target_info['dest_tag_name'] - logger.info('Tagging build with %s', build_tag) - task_id = session.tagBuild(build_tag, build_id) + dest_tag = target_info['dest_tag_name'] + logger.info('Tagging build with %s', dest_tag) + task_id = session.tagBuild(dest_tag, build_id) task = TaskWatcher(session, task_id, poll_interval=poll_interval) task.wait() if task.failed(): raise RuntimeError('Task %s failed to tag koji build' % task_id) - return build_tag + return dest_tag def get_koji_task_owner(session, task_id, default=None):
Fix debug message We're fetching the destination tag here. The build tag is something different.
projectatomic_atomic-reactor
train
py
d9695630f8916e9bda999dc47ad74c58a90b002b
diff --git a/concrete/src/Tree/Node/Type/FileFolder.php b/concrete/src/Tree/Node/Type/FileFolder.php index <HASH>..<HASH> 100644 --- a/concrete/src/Tree/Node/Type/FileFolder.php +++ b/concrete/src/Tree/Node/Type/FileFolder.php @@ -71,7 +71,7 @@ class FileFolder extends Category } } if (is_array($sort)) { - $list->sortBy($sort[0], $sort[1]); + $list->sanitizedSortBy($sort[0], $sort[1]); } } if (!is_array($sort)) {
Sanitized sort by <URL>
concrete5_concrete5
train
php
c6c45bf6cb0f6f3daea78dfe7cc84b338e4a6d33
diff --git a/src/foremast/configs/outputs.py b/src/foremast/configs/outputs.py index <HASH>..<HASH> 100644 --- a/src/foremast/configs/outputs.py +++ b/src/foremast/configs/outputs.py @@ -88,7 +88,9 @@ def write_variables(app_configs=None, out_file='', git_short=''): rendered_configs = json.loads( get_template('configs/configs.json.j2', env=env, app=generated.app_name(), profile=instance_profile)) json_configs[env] = dict(DeepChainMap(configs, rendered_configs)) - for region in json_configs[env]['regions']: + region_list = configs['regions'] + json_configs[env]['regions'] = region_list # removes regions defined in templates but not configs. + for region in region_list: region_config = json_configs[env][region] json_configs[env][region] = dict(DeepChainMap(region_config, rendered_configs)) else:
overrides regions in templates with regions in configs
foremast_foremast
train
py
170443bcac6409a513cc578424981114e340c5c0
diff --git a/src/js/components/scroll.js b/src/js/components/scroll.js index <HASH>..<HASH> 100644 --- a/src/js/components/scroll.js +++ b/src/js/components/scroll.js @@ -13,7 +13,7 @@ function smoothScroll(el, to, duration) { }, 10); } -$('a[href*="#"]').on('click', (e) => { +$(window).on('click', 'a[href*="#"]', e => { let scrollDuration = 300; let targetName = $(e.currentTarget).attr('href').split('#'); let targetSelector = 'a[name="' + targetName[1] + '"]';
triggering smooth scrolling for all links
Scout24_showcar-ui
train
js
8a3daa639acdce5dfaaca37ea1776c0fc027ae45
diff --git a/classes/Util.php b/classes/Util.php index <HASH>..<HASH> 100644 --- a/classes/Util.php +++ b/classes/Util.php @@ -332,12 +332,12 @@ class QM_Util { public static function sort( array &$array, $field ) { self::$sort_field = $field; - usort( $array, array( self, '_sort' ) ); + usort( $array, array( __CLASS__, '_sort' ) ); } public static function rsort( array &$array, $field ) { self::$sort_field = $field; - usort( $array, array( self, '_rsort' ) ); + usort( $array, array( __CLASS__, '_rsort' ) ); } private static function _rsort( $a, $b ) {
Correct the class name for static callback.
johnbillion_query-monitor
train
php
78109b3b6f49a027df440da058cc152e1134835c
diff --git a/aa_composer.js b/aa_composer.js index <HASH>..<HASH> 100644 --- a/aa_composer.js +++ b/aa_composer.js @@ -1052,7 +1052,8 @@ function handleTrigger(conn, batch, trigger, params, stateVars, arrDefinition, a return sortOutputsAndReturn(); if (!asset) return cb('not enough funds for ' + target_amount + ' bytes'); - if (send_all_output && payload.outputs.length === 1) // send-all is the only output - don't issue for it + var bSelfIssueForSendAll = (constants.bTestnet && mci < 2080483); + if (!bSelfIssueForSendAll && send_all_output && payload.outputs.length === 1) // send-all is the only output - don't issue for it return sortOutputsAndReturn(); issueAsset(function (err) { if (err) {
self-issue on testnet for old MCIs
byteball_ocore
train
js
11727d2445573eab9fa86824ffcde9a3f5441b46
diff --git a/lib/rb/lib/thrift/transport.rb b/lib/rb/lib/thrift/transport.rb index <HASH>..<HASH> 100644 --- a/lib/rb/lib/thrift/transport.rb +++ b/lib/rb/lib/thrift/transport.rb @@ -35,7 +35,9 @@ module Thrift def close; end - def read(sz); end + def read(sz) + raise NotImplementedError + end def read_all(size) buf = ''
THRIFT-<I>. rb: Abstract Transport in Ruby #read method should throw NotImplementedException The name says it all. git-svn-id: <URL>
limingxinleo_thrift
train
rb
0503ab5197f190a4b534342017933364196d711a
diff --git a/bcbio/chipseq/__init__.py b/bcbio/chipseq/__init__.py index <HASH>..<HASH> 100644 --- a/bcbio/chipseq/__init__.py +++ b/bcbio/chipseq/__init__.py @@ -95,6 +95,11 @@ def _bam_coverage(name, bam_input, data): except config_utils.CmdNotFound: logger.info("No bamCoverage found, skipping bamCoverage.") return None + resources = config_utils.get_resources("bamCoverage", data["config"]) + if resources: + options = resources.get("options") + if options: + cmd += " %s" % " ".join([str(x) for x in options]) bw_output = os.path.join(os.path.dirname(bam_input), "%s.bw" % name) if utils.file_exists(bw_output): return bw_output
ChIP-seq: allow specification of options for bamCoverage Enables specification of custom normalization through `resources`. Fixes bcbio/bcbio-nextgen#<I>
bcbio_bcbio-nextgen
train
py
8eb9a0242c49a9c2a6f0e46e3e579783d207ae22
diff --git a/mtools/util/logfile.py b/mtools/util/logfile.py index <HASH>..<HASH> 100644 --- a/mtools/util/logfile.py +++ b/mtools/util/logfile.py @@ -85,14 +85,14 @@ class LogFile(InputSource): def __iter__(self): """ iteration over LogFile object will return a LogEvent object for each line. """ - # always start from the beginning logfile - if not self.from_stdin: - self.filehandle.seek(0) - for line in self.filehandle: le = LogEvent(line) yield le + # future iterations start from the beginning + if not self.from_stdin: + self.filehandle.seek(0) + def __len__(self): """ return the number of lines in a log file. """
fixed bug where mlogfilter fast_forward wasn't working anymore.
rueckstiess_mtools
train
py
d145e2d125dfc5e0bd77788ebae468204c48176e
diff --git a/tests/Unit/Application/Model/DiscountlistTest.php b/tests/Unit/Application/Model/DiscountlistTest.php index <HASH>..<HASH> 100644 --- a/tests/Unit/Application/Model/DiscountlistTest.php +++ b/tests/Unit/Application/Model/DiscountlistTest.php @@ -219,6 +219,7 @@ class DiscountlistTest extends \OxidTestCase 0, 1) )"; + $sQ .= " order by $sTable.oxsort "; $this->assertEquals($this->cleanSQL($sQ), $this->cleanSQL($oList->UNITgetFilterSelect(null))); } @@ -258,6 +259,7 @@ class DiscountlistTest extends \OxidTestCase EXISTS(select oxobject2discount.oxid from oxobject2discount where oxobject2discount.OXDISCOUNTID=$sTable.OXID and oxobject2discount.oxtype='oxgroups' and oxobject2discount.OXOBJECTID in ($sGroupIds) ), 1) )"; + $sQ .= " order by $sTable.oxsort "; $this->assertEquals($this->cleanSQL($sQ), $this->cleanSQL($oList->UNITgetFilterSelect($oUser))); }
ESDEV-<I> Update DiscountlistTest
OXID-eSales_oxideshop_ce
train
php
fa6ecc8fdd910d1f081e5c255d7413f565c7f854
diff --git a/test/basic-example.js b/test/basic-example.js index <HASH>..<HASH> 100644 --- a/test/basic-example.js +++ b/test/basic-example.js @@ -1,21 +1,41 @@ var SoftAPSetup = require('../index'); var sap = new SoftAPSetup(); -console.log("Requesting public key..."); -sap.publicKey(scan); +console.log("Obtaining device information..."); +sap.deviceInfo(claim); + +function claim(err, dat) { + + console.log(dat); + console.log("-------"); + console.log("Obtained device information. Setting claim code..."); + sap.setClaimCode("wat", key); +} + +function key(err, dat) { + + if (err) { throw err; } + console.log(dat); + console.log("-------"); + console.log("Requesting public key..."); + sap.publicKey(scan); +}; function scan(err, dat) { if(err) { throw err; } + console.log(dat); + console.log("-------"); console.log("Received public key. Scanning for APs..."); sap.scan(configure); -} +}; function configure(err, dat) { if(err) { throw err; } - console.log("Scanned APs. Configuring device..."); console.log(dat); + console.log("-------"); + console.log("Scanned APs. Configuring device..."); sap.configure({ ssid: 'test'
Added more steps to basic-example test
particle-iot_softap-setup-js
train
js
f511979ff877b0c47ec30a5479d91327b88fdde0
diff --git a/EntitySilo.php b/EntitySilo.php index <HASH>..<HASH> 100644 --- a/EntitySilo.php +++ b/EntitySilo.php @@ -76,7 +76,7 @@ class EntitySilo implements \Countable, \Iterator, \ArrayAccess { if ($this->contains($entity)) { $orig = $this->entities[$entity]; - $orig['data'] = array_merge($orig['data'], $data); + $orig['data'] = array_merge_recursive($orig['data'], $data); $this->entities[$entity] = $orig; $this->data[$orig['class']][$orig['id']] = array_merge(
merge recursively entity infos (to be sure nothing is lost)
Innmind_neo4j-onm
train
php
65808e217fbd9861ebd5894e5f701630acc04cd7
diff --git a/lib/podio/models/integration.rb b/lib/podio/models/integration.rb index <HASH>..<HASH> 100644 --- a/lib/podio/models/integration.rb +++ b/lib/podio/models/integration.rb @@ -78,7 +78,7 @@ class Podio::Integration < ActivePodio::Base # @see https://developers.podio.com/doc/integrations/get-available-fields-86890 def find_available_fields_for(app_id) - list Podio.connection.get("/integration/#{app_id}/field/").body + Podio.connection.get("/integration/#{app_id}/field/").body end # @see https://developers.podio.com/doc/integrations/delete-integration-86876
find_available_fields_for never returned a list of integrations, so stop wrapping the returned collection into Integration instances
podio_podio-rb
train
rb
e50da40cf99bf77d5a2512160d6ff9ac475dd7bb
diff --git a/spyderlib/widgets/editor.py b/spyderlib/widgets/editor.py index <HASH>..<HASH> 100644 --- a/spyderlib/widgets/editor.py +++ b/spyderlib/widgets/editor.py @@ -1791,7 +1791,7 @@ class EditorStack(QWidget): _("Loading %s...") % filename) text, enc = encoding.read(filename) finfo = self.create_new_editor(filename, enc, text, set_current) - index = self.get_stack_index() + index = self.data.index(finfo) self._refresh_outlineexplorer(index, update=True) self.emit(SIGNAL('ending_long_process(QString)'), "") if self.isVisible() and self.checkeolchars_enabled \
Editor: if user accept to fix "mixed end-of-line characters", when opening file, the current editor was set as "modified" (the tab title had a '*' at the end) instead of the newly created editor
spyder-ide_spyder
train
py
7b519ee6f9d62d428ede4a1a9becb872a1e6b8a9
diff --git a/tests/test_signature_parser.py b/tests/test_signature_parser.py index <HASH>..<HASH> 100644 --- a/tests/test_signature_parser.py +++ b/tests/test_signature_parser.py @@ -292,3 +292,10 @@ class ParseTestCase(unittest.TestCase): with self.assertRaises(IntoDPError): xform([{True: True}]) + + def testBadArrayValue(self): + """ + Verify that passing a dict for an array will raise an exception. + """ + with self.assertRaises(IntoDPError): + xformer('a(qq)')([dict()])
Add a test to force exception raising if Python type for dbus array is dict.
stratis-storage_into-dbus-python
train
py
2b89acfc7a65d1a05a97a68e8da3bf954a44065a
diff --git a/azure-keyvault/azure/keyvault/custom/key_vault_authentication.py b/azure-keyvault/azure/keyvault/custom/key_vault_authentication.py index <HASH>..<HASH> 100644 --- a/azure-keyvault/azure/keyvault/custom/key_vault_authentication.py +++ b/azure-keyvault/azure/keyvault/custom/key_vault_authentication.py @@ -31,7 +31,7 @@ class KeyVaultAuthBase(AuthBase): # send the request to retrieve the challenge, then request the token and update # the request # TODO: wire up commons flag for things like Fiddler, logging, etc. - response = requests.Session().send(request, verify=os.environ.get('REQUESTS_CA_BUNDLE') or os.environ.get('CURL_CA_BUNDLE')) + response = requests.Session().send(request) if response.status_code == 401: auth_header = response.headers['WWW-Authenticate'] if HttpBearerChallenge.is_bearer_challenge(auth_header):
reverting changes to KeyVaultAuthBase
Azure_azure-sdk-for-python
train
py
2bc237e9c7401337e17edb201ff115aef2d13119
diff --git a/lib/s3/service.rb b/lib/s3/service.rb index <HASH>..<HASH> 100644 --- a/lib/s3/service.rb +++ b/lib/s3/service.rb @@ -2,7 +2,7 @@ module S3 class Service extend Roxy::Moxie - attr_reader :access_key_id, :secret_access_key + attr_reader :access_key_id, :secret_access_key, :use_ssl def initialize(options) @access_key_id = options[:access_key_id] or raise ArgumentError.new("no access key id given")
added use_ssl reader to bucket
megamsys_radosgw-s3
train
rb
3233cff00ab4a531df6e075f4859ae6fbbec960e
diff --git a/duradmin/src/main/webapp/jquery/dc/widget/ui.restore.js b/duradmin/src/main/webapp/jquery/dc/widget/ui.restore.js index <HASH>..<HASH> 100644 --- a/duradmin/src/main/webapp/jquery/dc/widget/ui.restore.js +++ b/duradmin/src/main/webapp/jquery/dc/widget/ui.restore.js @@ -55,8 +55,8 @@ $.widget("ui.restore", var data = []; data.push(["Status", restore.status]); data.push(["Status Message", restore.statusText]); - data.push(["Start Date", (restore.startDate ? new Date(restore.startDate):"")]); - data.push(["End Date", (restore.endDate ? new Date(restore.endDate):"")]); + data.push(["Start Date", (restore.startDate ? new Date(restore.startDate).toString():"")]); + data.push(["End Date", (restore.endDate ? new Date(restore.endDate).toString():"")]); data.push(["Snaphshot ID", restore.snapshotId]); var table = dc.createTable(data);
Fixes missing restore start and end dates.
duracloud_duracloud
train
js
f045f1ce8e9909152b5d99f424d6b2d985321872
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ with open(here / 'README.md', encoding='utf-8') as f: setup( name='pythonanywhere', - version='0.0.9', + version='0.0.10', description='PythonAnywhere helper tools for users', long_description=long_description, url='https://github.com/pythonanywhere/helper_scripts/',
bumped version for ssl test mode env var. by: Glenn, Harry
pythonanywhere_helper_scripts
train
py
18dd62ca3b74c14d3c9b3aafe8ce9571da3bbc64
diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go index <HASH>..<HASH> 100644 --- a/test/extended/prometheus/prometheus.go +++ b/test/extended/prometheus/prometheus.go @@ -232,8 +232,7 @@ var _ = g.Describe("[sig-instrumentation] Prometheus", func() { targets.Expect(labels{"job": "kube-state-metrics"}, "up", "^https://.*/metrics$"), // Cluster version operator - // TODO: require HTTPS once https://github.com/openshift/cluster-version-operator/pull/385 lands - targets.Expect(labels{"job": "cluster-version-operator"}, "up", "^https?://.*/metrics$"), + targets.Expect(labels{"job": "cluster-version-operator"}, "up", "^https://.*/metrics$"), ) }
test/extended/prometheus: Require HTTPS for the CVO Now that the CVO pull request has landed, require HTTPS going forward.
openshift_origin
train
go
0ddcd9c3757709f0434026438fe0ced53a2a1613
diff --git a/lib/delegate.js b/lib/delegate.js index <HASH>..<HASH> 100644 --- a/lib/delegate.js +++ b/lib/delegate.js @@ -387,8 +387,8 @@ Delegate.prototype.fire = function(event, target, listener) { Delegate.prototype.matches = (function(el) { if (!el) return; var p = el.prototype; - return (p.matchesSelector || p.webkitMatchesSelector || p.mozMatchesSelector || p.msMatchesSelector || p.oMatchesSelector); -}(HTMLElement)); + return (p.matches || p.matchesSelector || p.webkitMatchesSelector || p.mozMatchesSelector || p.msMatchesSelector || p.oMatchesSelector); +}(Element)); /** * Check whether an element
Changed from using HTMLElement to Element for matches Because a) ie8 doesn't support HTMLElement b) matches is defined on Element.prototype not on HTMLElelment.prototype Also added p.matches as the preferred native method to use
Financial-Times_ftdomdelegate
train
js
9054984cb5b49e87acd0ce21918e081b2890c4e5
diff --git a/src/phpFastCache/Cache/ExtendedCacheItemPoolInterface.php b/src/phpFastCache/Cache/ExtendedCacheItemPoolInterface.php index <HASH>..<HASH> 100644 --- a/src/phpFastCache/Cache/ExtendedCacheItemPoolInterface.php +++ b/src/phpFastCache/Cache/ExtendedCacheItemPoolInterface.php @@ -121,7 +121,7 @@ interface ExtendedCacheItemPoolInterface extends CacheItemPoolInterface * If any of the keys in $keys are not a legal value a \Psr\Cache\InvalidArgumentException * MUST be thrown. * - * @return array|\Traversable + * @return ExtendedCacheItemInterface[] * A traversable collection of Cache Items keyed by the cache keys of * each item. A Cache item will be returned for each key, even if that * key is not found. However, if no keys are specified then an empty @@ -139,7 +139,7 @@ interface ExtendedCacheItemPoolInterface extends CacheItemPoolInterface * If any of the keys in $keys are not a legal value a \Psr\Cache\InvalidArgumentException * MUST be thrown. * - * @return array|\Traversable + * @return ExtendedCacheItemInterface[] * A traversable collection of Cache Items keyed by the cache keys of * each item. A Cache item will be returned for each key, even if that * key is not found. However, if no keys are specified then an empty
Fixed wrong class name in ExtendedCacheItemPoolInterface
PHPSocialNetwork_phpfastcache
train
php
be57034ba468c0964af97a3f16185e6873ebac20
diff --git a/classes/Peyote/Condition.php b/classes/Peyote/Condition.php index <HASH>..<HASH> 100644 --- a/classes/Peyote/Condition.php +++ b/classes/Peyote/Condition.php @@ -79,6 +79,10 @@ abstract class Condition extends \Peyote\Base { $sql[] = "{$column} {$op} {$this->quote($value[0])} AND {$this->quote($value[1])}"; } + else if ($op === "AGAINST") + { + $sql[] = "MATCH({$column}) AGAINST({$this->quote($value)})"; + } else { $sql[] = "{$column} {$op}";
Adding Match … Against to the condition builder.
daveWid_Peyote
train
php
e6b48e3dd82eaecd2bab15b1096a811caedefa7e
diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js index <HASH>..<HASH> 100644 --- a/lib/OpenLayers/Layer/Markers.js +++ b/lib/OpenLayers/Layer/Markers.js @@ -22,7 +22,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, { isBaseLayer: false, /** - * Property: markers + * APIProperty: markers * {Array(<OpenLayers.Marker>)} internal marker list */ markers: null,
Seems odd to not expose the 'markers' property on this layer. I have buyin from cr5. If anyone has vehement opinions on this, yell and i'll roll back git-svn-id: <URL>
openlayers_openlayers
train
js
4e7a8b00fc98e02019a87e1b78afb1f5d72fc5d7
diff --git a/select2.js b/select2.js index <HASH>..<HASH> 100644 --- a/select2.js +++ b/select2.js @@ -1219,7 +1219,7 @@ the specific language governing permissions and limitations under the Apache Lic mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask"); mask.hide(); mask.appendTo(this.body()); - mask.on("mousedown touchstart", function (e) { + mask.on("mousedown touchstart click", function (e) { var dropdown = $("#select2-drop"), self; if (dropdown.length > 0) { self=dropdown.data("select2");
a tweak to prevent clicks propagating through the mask on IE9. #<I>
select2_select2
train
js
490564f263ad048410c94141a70352cb9555b55d
diff --git a/lib/discordrb/bot.rb b/lib/discordrb/bot.rb index <HASH>..<HASH> 100644 --- a/lib/discordrb/bot.rb +++ b/lib/discordrb/bot.rb @@ -1000,6 +1000,12 @@ module Discordrb if opcode == Opcodes::HELLO LOGGER.debug 'Hello!' + # Activate the heartbeats + @heartbeat_interval = data['heartbeat_interval'].to_f / 1000.0 + @heartbeat_active = true + debug("Desired heartbeat_interval: #{@heartbeat_interval}") + send_heartbeat + return end @@ -1032,12 +1038,6 @@ module Discordrb # Set the session ID in case we get disconnected and have to resume @session_id = data['session_id'] - # Activate the heartbeats - @heartbeat_interval = data['heartbeat_interval'].to_f / 1000.0 - @heartbeat_active = true - debug("Desired heartbeat_interval: #{@heartbeat_interval}") - send_heartbeat - @profile = Profile.new(data['user'], self, @email, @password) # Initialize servers
Move heartbeat handling from READY to HELLO
meew0_discordrb
train
rb
7eebc027e6d1d053c42572ff3f41d54ecfe5b8d9
diff --git a/gutenberg/download.py b/gutenberg/download.py index <HASH>..<HASH> 100644 --- a/gutenberg/download.py +++ b/gutenberg/download.py @@ -2,11 +2,11 @@ from __future__ import absolute_import -import bs4 -import collections import gutenberg.common.functutil as functutil import gutenberg.common.osutil as osutil import gutenberg.common.stringutil as stringutil +import bs4 +import collections import logging import os import random
No-op: sort imports
c-w_gutenberg
train
py
08a2478549f492979bf9fdb2f5f07cc3c7fd1ad9
diff --git a/textract/parsers/tesseract.py b/textract/parsers/tesseract.py index <HASH>..<HASH> 100644 --- a/textract/parsers/tesseract.py +++ b/textract/parsers/tesseract.py @@ -1,25 +1,12 @@ -""" -Process an image file using tesseract. -""" - -import tempfile -import os - from ..shell import run -def temp_filename(): - """ - Return a unique tempfile name. - """ - handle, filename = tempfile.mkstemp() - os.close(handle) - return filename def extract(filename, **kwargs): """Extract text from various image file formats using tesseract-ocr""" # Tesseract can't output to console directly so you must first create # a dummy file to write to, read, and then delete - cmd = 'tesseract %(filename)s {0} && cat {0}.txt && rm -f {0} {0}.txt' - temp_name = temp_filename() - stdout, _ = run(cmd.format(temp_name) % locals()) + stdout, stderr = run( + 'tesseract %(filename)s tmpout && cat tmpout.txt && rm -f tmpout.txt' + % locals() + ) return stdout
Reverted tesseract.py from upstream in response to @christomitov's update re: ticket #<I> in the conversation for #<I>.
deanmalmgren_textract
train
py
0803e002e961c9a4bebe85f965f8025f0b9e3975
diff --git a/tests/integration/Inventory/InventoryUpdateRequestTest.php b/tests/integration/Inventory/InventoryUpdateRequestTest.php index <HASH>..<HASH> 100644 --- a/tests/integration/Inventory/InventoryUpdateRequestTest.php +++ b/tests/integration/Inventory/InventoryUpdateRequestTest.php @@ -206,7 +206,7 @@ class InventoryUpdateRequestTest extends ApiTestCase } while ($result->count() == 0 && $retries <= 20); if ($result->count() == 0) { - $this->markTestSkipped('Product availability not updated in time'); + $this->markTestSkipped('Product not updated in time'); } $retries = 0; @@ -222,6 +222,10 @@ class InventoryUpdateRequestTest extends ApiTestCase $result = $request->mapResponse($response); } while ($result->count() == 0 && $retries <= 9); + if ($result->count() == 0) { + $this->markTestSkipped('Product channel availability not updated in time'); + } + $this->assertSame( $product->getId(), $result->current()->getId()
test(Inventory): fix inventory query for channel test
commercetools_commercetools-php-sdk
train
php
4bffde649fed40a6844f0293926a4e51d6fa772a
diff --git a/lib/cursor.js b/lib/cursor.js index <HASH>..<HASH> 100644 --- a/lib/cursor.js +++ b/lib/cursor.js @@ -1069,7 +1069,10 @@ Cursor.prototype.close = function(options, callback) { this.emit('close'); // Callback if provided - if (typeof callback === 'function') return handleCallback(callback, null, this); + if (typeof callback === 'function') { + return handleCallback(callback, null, this); + } + // Return a Promise return new this.s.promiseLibrary(function(resolve) { resolve(); @@ -1080,7 +1083,7 @@ Cursor.prototype.close = function(options, callback) { return this.s.session.endSession(() => completeClose()); } - completeClose(); + return completeClose(); }; define.classMethod('close', { callback: true, promise: true });
refactor(cursor): return result of `completeClose` for promises NODE-<I>
mongodb_node-mongodb-native
train
js
2a8e7598dd6f2f060b06865146161c4bca09e457
diff --git a/docs/index.rst b/docs/index.rst index <HASH>..<HASH> 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -105,6 +105,13 @@ Thanks guys! Changelog ========= +v1.8.8 +------ +*Release date: 2020-09-28* + + - Updated supported DRF versions + + v1.8.7 ------ *Release date: 2020-08-01* diff --git a/drf_haystack/__init__.py b/drf_haystack/__init__.py index <HASH>..<HASH> 100644 --- a/drf_haystack/__init__.py +++ b/drf_haystack/__init__.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals __title__ = "drf-haystack" -__version__ = "1.8.7" +__version__ = "1.8.8" __author__ = "Rolf Haavard Blindheim" __license__ = "MIT License" diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup( include_package_data=True, install_requires=[ "Django>=2.2,<3.1", - "djangorestframework>=3.7,<3.12", + "djangorestframework>=3.7,<3.13", "django-haystack>=2.8,<3.1", "python-dateutil" ],
Support DRF < <I>.x (#<I>) Thanks again ;)
inonit_drf-haystack
train
rst,py,py
f2e25d797e7ba7b2c76941e137b3d77a3e1a6e4b
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java index <HASH>..<HASH> 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java @@ -760,6 +760,12 @@ public abstract class UnalignedCheckpointTestBase extends TestLogger { SharedPoolNettyShuffleServiceFactory.class.getName()); conf.set(NettyShuffleEnvironmentOptions.NETWORK_BUFFERS_PER_CHANNEL, buffersPerChannel); conf.set(NettyShuffleEnvironmentOptions.NETWORK_REQUEST_BACKOFF_MAX, 60000); + // half memory consumption of network buffers (default is 64mb), as some tests spawn a + // large number of task managers (25) + // 12mb was sufficient to run the tests, so 32mb should put us above the recommended + // amount of buffers + conf.set(TaskManagerOptions.NETWORK_MEMORY_MIN, MemorySize.ofMebiBytes(32)); + conf.set(TaskManagerOptions.NETWORK_MEMORY_MAX, MemorySize.ofMebiBytes(32)); conf.set(AkkaOptions.ASK_TIMEOUT_DURATION, Duration.ofMinutes(1)); return conf; }
[FLINK-<I>][tests] Reduce network memory in UnalignedCheckpointTestBase
apache_flink
train
java
9c96b4636848a80ca81831b3672b06e3451486aa
diff --git a/src/Illuminate/Collections/EnumeratesValues.php b/src/Illuminate/Collections/EnumeratesValues.php index <HASH>..<HASH> 100644 --- a/src/Illuminate/Collections/EnumeratesValues.php +++ b/src/Illuminate/Collections/EnumeratesValues.php @@ -6,9 +6,6 @@ use CachingIterator; use Exception; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Contracts\Support\Jsonable; -use Illuminate\Collections\Arr; -use Illuminate\Collections\Enumerable; -use Illuminate\Collections\HigherOrderCollectionProxy; use JsonSerializable; use Symfony\Component\VarDumper\VarDumper; use Traversable; diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php index <HASH>..<HASH> 100644 --- a/src/Illuminate/Support/Collection.php +++ b/src/Illuminate/Support/Collection.php @@ -13,7 +13,7 @@ class Collection extends BaseCollection */ public function collect() { - return new Collection($this->all()); + return new self($this->all()); } /**
Apply fixes from StyleCI (#<I>)
laravel_framework
train
php,php
fabcae88f0f352ec09273c611a443f11e385a99a
diff --git a/core/src/main/java/com/orientechnologies/common/concur/lock/OSimpleLockManagerImpl.java b/core/src/main/java/com/orientechnologies/common/concur/lock/OSimpleLockManagerImpl.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/com/orientechnologies/common/concur/lock/OSimpleLockManagerImpl.java +++ b/core/src/main/java/com/orientechnologies/common/concur/lock/OSimpleLockManagerImpl.java @@ -1,5 +1,7 @@ package com.orientechnologies.common.concur.lock; +import com.orientechnologies.common.exception.OException; + import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -36,7 +38,7 @@ public class OSimpleLockManagerImpl<T> implements OSimpleLockManager<T> { c = lock.newCondition(); map.put(key, c); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); + throw OException.wrapException(new OInterruptedException("Interrupted Lock"), e); } } finally { lock.unlock();
made sure that interrupt exception interrupt operation from locks
orientechnologies_orientdb
train
java
0c03597fd7d13cb5a360bfb93e4329aec17d1cd7
diff --git a/lib/govuk_navigation_helpers/content_item.rb b/lib/govuk_navigation_helpers/content_item.rb index <HASH>..<HASH> 100644 --- a/lib/govuk_navigation_helpers/content_item.rb +++ b/lib/govuk_navigation_helpers/content_item.rb @@ -7,7 +7,7 @@ module GovukNavigationHelpers attr_reader :content_store_response def initialize(content_store_response) - @content_store_response = content_store_response + @content_store_response = content_store_response.to_h end def parent
Convert content item to hash The ContentItem class assumes a number of hash methods that may not necessarily be available on a content item. By explicitly converting this object to a hash, we can avoid bad method calls
alphagov_govuk_navigation_helpers
train
rb
16ebbae1abeaa5c4c97603bd6f981f30d22d04d3
diff --git a/geist/core.py b/geist/core.py index <HASH>..<HASH> 100644 --- a/geist/core.py +++ b/geist/core.py @@ -166,7 +166,7 @@ class GUI(object): inc_x = x_distance / num_increments inc_y = y_distance / num_increments for i in range(start_increment, num_increments): - actions.add_move((from_x + (inc_x*i), from_y + (inc_y*i))) + actions.add_move((int(from_x + (inc_x*i)), int(from_y + (inc_y*i)))) if merged_opts.mouse_move_wait != 0: actions.add_wait(merged_opts.mouse_move_wait) actions.add_move(to_point) diff --git a/geist/finders.py b/geist/finders.py index <HASH>..<HASH> 100644 --- a/geist/finders.py +++ b/geist/finders.py @@ -1,3 +1,4 @@ +from __future__ import division import numpy as np
Fixed error with mouse move not using integer points
ten10solutions_Geist
train
py,py
d5404068cda11c60d4a6b7cdd4de4c811b5e99c3
diff --git a/lib/database_rewinder/multiple_statements_executor.rb b/lib/database_rewinder/multiple_statements_executor.rb index <HASH>..<HASH> 100644 --- a/lib/database_rewinder/multiple_statements_executor.rb +++ b/lib/database_rewinder/multiple_statements_executor.rb @@ -37,7 +37,7 @@ module DatabaseRewinder when 'ActiveRecord::ConnectionAdapters::SQLite3Adapter' log(sql) { @connection.execute_batch sql } else - execute sql + raise 'Multiple deletion is not supported with the current database adapter.' end end end
`else` here should not be reachable
amatsuda_database_rewinder
train
rb
3be8b5b8c3f62a3ae9ce19e8cb7df961ede43c34
diff --git a/lib/db/access.php b/lib/db/access.php index <HASH>..<HASH> 100644 --- a/lib/db/access.php +++ b/lib/db/access.php @@ -1553,8 +1553,6 @@ $capabilities = array( ) ), 'moodle/rating:rate' => array( - - 'riskbitmask' => RISK_DATALOSS, 'captype' => 'write', 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array(
rating MDL-<I> modified moodle/rating:rate risks
moodle_moodle
train
php
509c886e1e86289708bd0f6d74621f6b486443ea
diff --git a/workshift/urls.py b/workshift/urls.py index <HASH>..<HASH> 100644 --- a/workshift/urls.py +++ b/workshift/urls.py @@ -3,5 +3,12 @@ from django.conf.urls import url from workshift import views urlpatterns = [ - url(r"^workshift/$", views.workshift_view, name="workshift_view"), + url(r"^workshift/$", views.main_view, name="main"), + url(r"^workshift/preferences/(P<semester>\w+)/$", views.preferences_view, name="preferences"), + url(r"^workshift/manage/$", views.manage_view, name="manage"), + url(r"^workshift/manage/start_semester/$", views.start_semester_view, name="start_semester"), + url(r"^workshift/manage/assign_shifts/$", views.assign_shifts_view, name="assign_shifts"), + url(r"^workshift/manage/add_shift/$", views.add_shift_view, name="add_shift"), + url(r"^workshift/shifts/(P<shift_title>\w+)/$", views.shift_view, name="view_shift"), + url(r"^workshift/shifts/(P<shift_title>\w+)/edit$", views.edit_shift_view, name="edit_shift"), ]
Added more urls to urlpatterns
knagra_farnsworth
train
py
96202dddfe19175cfb5c8200cf929a10769fb3fb
diff --git a/src/lib/adt/index.js b/src/lib/adt/index.js index <HASH>..<HASH> 100644 --- a/src/lib/adt/index.js +++ b/src/lib/adt/index.js @@ -128,7 +128,8 @@ const MCNK = Chunk({ sizeMCSH: r.uint32le, areaID: r.uint32le, wmoCount: r.uint32le, - holes: r.uint32le, + holes: r.uint16le, + unknown: r.uint16le, textureMaps: new r.Reserved(r.uint16le, 8),
ADT chunk holes are <I>-bit
wowserhq_blizzardry
train
js
ff268249a81671aaf4c22b43f2d9f80d30382c53
diff --git a/backend/impl/src/test/java/org/geomajas/internal/security/SecurityManagerLoopTest.java b/backend/impl/src/test/java/org/geomajas/internal/security/SecurityManagerLoopTest.java index <HASH>..<HASH> 100644 --- a/backend/impl/src/test/java/org/geomajas/internal/security/SecurityManagerLoopTest.java +++ b/backend/impl/src/test/java/org/geomajas/internal/security/SecurityManagerLoopTest.java @@ -45,21 +45,18 @@ public class SecurityManagerLoopTest { } @Test - @DirtiesContext public void testLooping() { Assert.assertTrue(securityManager.createSecurityContext("TEST")); Assert.assertEquals(2, securityContext.getSecurityServiceResults().size()); } @Test - @DirtiesContext public void testNotAuthenticated() { Assert.assertFalse(securityManager.createSecurityContext("false")); Assert.assertEquals(0, securityContext.getSecurityServiceResults().size()); } @Test - @DirtiesContext public void testSecondOnly() { Assert.assertTrue(securityManager.createSecurityContext("SECOND")); Assert.assertEquals(1, securityContext.getSecurityServiceResults().size());
@DirtiesContext should not be needed, need to figure out cause if needed (-->jira)
geomajas_geomajas-project-client-gwt2
train
java
daad07abbf434a9b2100ab3702de448e8c9411b1
diff --git a/src/providers/sh/commands/deploy.js b/src/providers/sh/commands/deploy.js index <HASH>..<HASH> 100644 --- a/src/providers/sh/commands/deploy.js +++ b/src/providers/sh/commands/deploy.js @@ -97,10 +97,6 @@ const help = () => { login Login into your account or creates a new one logout Logout from your account - ${chalk.dim('Providers')} - - sh, aws, gcp [cmd] Deploy using a different provider - ${chalk.dim('Options:')} -h, --help Output usage information
Temporarily hide providers from usage information (#<I>)
zeit_now-cli
train
js
d49a3e87e889be4d900fa765065dbcbdec2a25ed
diff --git a/js/tests/roundtrip-test.js b/js/tests/roundtrip-test.js index <HASH>..<HASH> 100755 --- a/js/tests/roundtrip-test.js +++ b/js/tests/roundtrip-test.js @@ -422,6 +422,7 @@ var fetch = function ( page, cb, options ) { if ( options.apiURL ) { parsoidConfig.setInterwiki( 'customwiki', options.apiURL ); } + parsoidConfig.editMode = Util.booleanOption( options.editMode ); MWParserEnvironment.getParserEnv( parsoidConfig, null, prefix, page, envCb ); }; @@ -471,6 +472,11 @@ if ( !module.parent ) { 'boolean': true, 'default': false }, + 'editMode': { + description: 'Test in edit-mode (changes some parse & serialization strategies)', + 'default': false, // suppress noise by default + 'boolean': true + }, 'debug': { description: 'Debug mode', 'boolean': true,
Add --editMode option to roundtrip-test.js. Usually you don't want the noise, but turning on --editMode can help unearth crashers in html2wt. Change-Id: I<I>c0fc0dc4e<I>f<I>c8b<I>b<I>df<I>da4a3dc
wikimedia_parsoid
train
js
44086901dbbd8cee2fd399060df4743993736db2
diff --git a/spec/lib/mobi/metadata_spec.rb b/spec/lib/mobi/metadata_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lib/mobi/metadata_spec.rb +++ b/spec/lib/mobi/metadata_spec.rb @@ -1,5 +1,8 @@ require 'spec_helper' +require 'mobi/metadata' +require 'mobi/stream_slicer' + describe Mobi::Metadata do context 'initialization' do diff --git a/spec/lib/mobi/stream_slicer_spec.rb b/spec/lib/mobi/stream_slicer_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lib/mobi/stream_slicer_spec.rb +++ b/spec/lib/mobi/stream_slicer_spec.rb @@ -1,5 +1,7 @@ require 'spec_helper' +require 'mobi/stream_slicer' + describe Mobi::StreamSlicer do let(:file){ File.open('spec/fixtures/test.mobi') } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index <HASH>..<HASH> 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,9 +1,4 @@ -require 'rubygems' -require 'bundler/setup' - -require 'mobi' -require 'rr' - RSpec.configure do |config| config.mock_with :rr -end \ No newline at end of file +end +
Manually require files in the specs.
jkongie_mobi
train
rb,rb,rb
5252c707d950bccca07bc7320f70503b675361a7
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java index <HASH>..<HASH> 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java @@ -184,13 +184,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> { /** * Wrap a GQuery around an existing element. */ - public static GQuery $(Function f) { - return new GQuery(f.getElement()); - } - - /** - * Wrap a GQuery around an existing element. - */ public static GQuery $(Element element) { return new GQuery(element); }
This change should not be committed in r<I>
ArcBees_gwtquery
train
java
46892f9a3a812e16c4fa42c9193c30605f0c6e99
diff --git a/aeron-system-tests/src/test/java/io/aeron/PublishFromArbitraryPositionTest.java b/aeron-system-tests/src/test/java/io/aeron/PublishFromArbitraryPositionTest.java index <HASH>..<HASH> 100644 --- a/aeron-system-tests/src/test/java/io/aeron/PublishFromArbitraryPositionTest.java +++ b/aeron-system-tests/src/test/java/io/aeron/PublishFromArbitraryPositionTest.java @@ -76,6 +76,7 @@ public class PublishFromArbitraryPositionTest final int expectedNumberOfFragments = 10 + rnd.nextInt(10000); final MediaDriver.Context driverCtx = new MediaDriver.Context() + .dirDeleteOnStart(true) .errorHandler(Throwable::printStackTrace) .termBufferSparseFile(true);
[Java] Delete archive dir on start of system test.
real-logic_aeron
train
java
f979dfd16c8454ad8a7036098e73b5c2295bc12a
diff --git a/src/Page/PageBuilder.php b/src/Page/PageBuilder.php index <HASH>..<HASH> 100644 --- a/src/Page/PageBuilder.php +++ b/src/Page/PageBuilder.php @@ -21,6 +21,7 @@ final class PageBuilder private $datasource; private $debug = false; private $defaultDisplay = 'table'; + private $disabledSorts = []; private $dispatcher; private $displayFilters = true; private $displayPager = true; @@ -367,6 +368,20 @@ final class PageBuilder } /** + * Disable a sort. + * + * Sorts are enabled by default but you can disable some. + * + * @return $this + */ + public function disableSort($sort) + { + $this->disabledSorts[] = $sort; + + return $this; + } + + /** * Get item per page * * @param int $limit @@ -501,7 +516,14 @@ final class PageBuilder $sort->prepare($route, $query); if ($sortFields = $datasource->getSortFields($datasourceQuery)) { + foreach ($sortFields as $field => $label) { + if (in_array($field, $this->disabledSorts)) { + unset($sortFields[$field]); + } + } + $sort->setFields($sortFields); + // Do not set the sort order links if there is no field to sort on if ($sortDefault = $datasource->getDefaultSort()) { // @todo PHP 5.6 $sort->setDefault(...$sortDefault);
Allow to disable some sorts through the page builder
makinacorpus_drupal-calista
train
php
7fc6ed1c7a3d2d8971216ed02c566ad1df73f6ad
diff --git a/src/cobra/flux_analysis/parsimonious.py b/src/cobra/flux_analysis/parsimonious.py index <HASH>..<HASH> 100644 --- a/src/cobra/flux_analysis/parsimonious.py +++ b/src/cobra/flux_analysis/parsimonious.py @@ -1,7 +1,7 @@ """Provide parsimonious FBA implementation.""" from itertools import chain -from typing import TYPE_CHECKING, Callable, Dict, List, Union +from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Union from warnings import warn from optlang.symbolics import Zero @@ -45,7 +45,7 @@ def pfba( model: "Model", fraction_of_optimum: float = 1.0, objective: Union[Dict, "Objective", None] = None, - reactions: List["Reaction"] = None, + reactions: Optional[List["Reaction"]] = None, ) -> "Solution": """Perform basic pFBA (parsimonious Enzyme Usage Flux Balance Analysis). @@ -70,7 +70,7 @@ def pfba( reactions : list of cobra.Reaction, optional List of cobra.Reaction. Implies `return_frame` to be true. Only return fluxes for the given reactions. Faster than fetching all - fluxes if only a few are needed. + fluxes if only a few are needed (default None). Returns -------
fix: use proper typing annotation in parsimonious.py
opencobra_cobrapy
train
py
8fc1bbbe9cb4450b8eaf044d7605bbe2f11490b0
diff --git a/cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientV2.java b/cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientV2.java index <HASH>..<HASH> 100644 --- a/cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientV2.java +++ b/cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientV2.java @@ -1127,9 +1127,8 @@ public class CloudControllerClientV2 extends AbstractCloudControllerClient { private List<String> findApplicationUris(UUID appGuid) { Map<String, Object> urlVars = new HashMap<String, Object>(); - String urlPath = "/v2/apps/{app}/routes?inline-relations-depth={depth}"; + String urlPath = "/v2/apps/{app}/routes?inline-relations-depth=1"; urlVars.put("app", appGuid); - urlVars.put("depth", 2); List<Map<String, Object>> resourceList = getAllResources(urlPath, urlVars); List<String> uris = new ArrayList<String>(); for (Map<String, Object> resource : resourceList) {
Reduce inline-relations-depth to 1 for apps/{app}/routes [#<I>]
cloudfoundry_cf-java-client
train
java
edbfe1efe9ec9b8a9a113fa9de13a85458fe2efc
diff --git a/src/router/registry.go b/src/router/registry.go index <HASH>..<HASH> 100644 --- a/src/router/registry.go +++ b/src/router/registry.go @@ -301,6 +301,7 @@ func (r *Registry) Unregister(m *registryMessage) { func (r *Registry) pruneStaleDroplets() { if r.isStateStale() { + r.resetTracker() return } @@ -318,6 +319,12 @@ func (r *Registry) pruneStaleDroplets() { } } +func (r *Registry) resetTracker() { + for r.staleTracker.Len() > 0 { + r.staleTracker.Delete(r.staleTracker.Front().(*Backend)) + } +} + func (r *Registry) PruneStaleDroplets() { r.Lock() defer r.Unlock()
reset stale tracker state when it becomes stale [#<I>]
cloudfoundry_gorouter
train
go
88ccc61e6e0996bf94480d264b42d41106198fab
diff --git a/TokenCollection.php b/TokenCollection.php index <HASH>..<HASH> 100644 --- a/TokenCollection.php +++ b/TokenCollection.php @@ -20,7 +20,7 @@ class TokenCollection extends ArrayList { * * @return Token */ - public function get(int $index): Token { + public function get(int $index): ?Token { return parent::get($index); } }
Fix TokenCollection Adjust `TokenCollection::get()` method to return null, for consistency with `ArrayList::get`.
phootwork_tokenizer
train
php
b41711276e76c10556966ac11ef5bc10ce08e668
diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go index <HASH>..<HASH> 100644 --- a/clientv3/concurrency/mutex.go +++ b/clientv3/concurrency/mutex.go @@ -82,12 +82,11 @@ func (m *Mutex) Lock(ctx context.Context) error { client := m.s.Client() // wait for deletion revisions prior to myKey // TODO: early termination if the session key is deleted before other session keys with smaller revisions. - hdr, werr := waitDeletes(ctx, client, m.pfx, m.myRev-1) + _, werr := waitDeletes(ctx, client, m.pfx, m.myRev-1) // release lock key if wait failed if werr != nil { m.Unlock(client.Ctx()) - } else { - m.hdr = hdr + return werr } // make sure the session is not expired, and the owner key still exists.
clientv3/concurrency: do not swallow error (#<I>)
etcd-io_etcd
train
go
a8fc372007ed9bae15ae5eb1fa74446821b8af67
diff --git a/lib/nodes.js b/lib/nodes.js index <HASH>..<HASH> 100644 --- a/lib/nodes.js +++ b/lib/nodes.js @@ -392,6 +392,11 @@ ClassList.prototype.get = function (name) { this.collections[name] : []; }; +ClassList.prototype.count = function (name) { + return Object.prototype.hasOwnProperty.call(this.collections, name) ? + this.collections[name].length : 0; +}; + ClassList.prototype.set = function (name, node) { if (Object.prototype.hasOwnProperty.call(this.collections, name)) { this.collections[name].push(node);
[feature] add classlist count method
AndreasMadsen_article
train
js
8beeeb19441c8c6b0a415ebd26884454a1413b86
diff --git a/macaroons/constraints_test.go b/macaroons/constraints_test.go index <HASH>..<HASH> 100644 --- a/macaroons/constraints_test.go +++ b/macaroons/constraints_test.go @@ -99,7 +99,7 @@ func TestIpLockConstraint(t *testing.T) { // TestIPLockBadIP tests that an IP constraint cannot be added if the // provided string is not a valid IP address. func TestIPLockBadIP(t *testing.T) { - constraintFunc := macaroons.IPLockConstraint("127.0.0/800"); + constraintFunc := macaroons.IPLockConstraint("127.0.0/800") testMacaroon := createDummyMacaroon(t) err := constraintFunc(testMacaroon) if err == nil {
macaroons/constraints_test: remove extraneous semicolon
lightningnetwork_lnd
train
go
7a3c3e028d11e7caa025ccfc72ce298d807dc793
diff --git a/stemcell/stemcell.go b/stemcell/stemcell.go index <HASH>..<HASH> 100644 --- a/stemcell/stemcell.go +++ b/stemcell/stemcell.go @@ -3,7 +3,7 @@ package stemcell import ( "fmt" - boshcmd "github.com/cloudfoundry/bosh-utils/fileutil" + boshfu "github.com/cloudfoundry/bosh-utils/fileutil" biproperty "github.com/cloudfoundry/bosh-utils/property" boshsys "github.com/cloudfoundry/bosh-utils/system" @@ -29,7 +29,7 @@ type ExtractedStemcell interface { type extractedStemcell struct { manifest Manifest extractedPath string - compressor boshcmd.Compressor + compressor boshfu.Compressor fs boshsys.FileSystem } @@ -46,7 +46,7 @@ type Manifest struct { func NewExtractedStemcell( manifest Manifest, extractedPath string, - compressor boshcmd.Compressor, + compressor boshfu.Compressor, fs boshsys.FileSystem, ) ExtractedStemcell { return &extractedStemcell{ @@ -102,7 +102,7 @@ func (s *extractedStemcell) Pack(destinationPath string) error { return err } - return s.fs.Rename(intermediateStemcellPath, destinationPath) + return boshfu.NewFileMover(s.fs).Move(intermediateStemcellPath, destinationPath) } func (s *extractedStemcell) EmptyImage() error {
Fix bug in repack-stemcell repack-stemcell failed when the specified target was on a different device than the bosh cache. Fixed by using a different utility function to move temporary tar ball to destination tar ball. [#<I>](<URL>)
cloudfoundry_bosh-cli
train
go
89bb3d88bff910cab42a5e53ec9e9fada73a1828
diff --git a/lib/specter.rb b/lib/specter.rb index <HASH>..<HASH> 100644 --- a/lib/specter.rb +++ b/lib/specter.rb @@ -1,3 +1,7 @@ +require 'forwardable' +require 'logger' +require 'socket' + require 'specter/version' require 'specter/cli' require 'specter/server' diff --git a/lib/specter/env.rb b/lib/specter/env.rb index <HASH>..<HASH> 100644 --- a/lib/specter/env.rb +++ b/lib/specter/env.rb @@ -1,5 +1,3 @@ -require 'forwardable' - module Specter class Env < Hash extend Forwardable diff --git a/lib/specter/server.rb b/lib/specter/server.rb index <HASH>..<HASH> 100644 --- a/lib/specter/server.rb +++ b/lib/specter/server.rb @@ -1,9 +1,6 @@ -require 'socket' -require 'logger' - +require 'specter/env' require 'specter/middleware' require 'specter/request' -require 'specter/env' module Specter class Server
Move stdlib requirements to lib/specter.rb
gevans_specter
train
rb,rb,rb
03e83618b0963d7480553973e2a0c30e7a272517
diff --git a/src/Connection/Connector.php b/src/Connection/Connector.php index <HASH>..<HASH> 100644 --- a/src/Connection/Connector.php +++ b/src/Connection/Connector.php @@ -76,9 +76,16 @@ class Connector implements ConnectorInterface if (isset($session)) { $this->session = $session; } else { - // Assign file storage to the session by default. - $this->session = new Session(); - $this->session->setStorage(new File()); + if ($this->config['api_token'] && $this->config['api_token_type'] === 'access') { + // If an access token is set directly, default to a session + // with no storage. + $this->session = new Session(); + } else { + // Otherwise, assign file storage to the session by default. + // This reduces unnecessary access token refreshes. + $this->session = new Session(); + $this->session->setStorage(new File()); + } } }
Connector: default to no session storage when an access token is configured
platformsh_platformsh-client-php
train
php
dad01b58577c4ab7e8104f16e7af7d859750f7f2
diff --git a/hypermap/aggregator/models.py b/hypermap/aggregator/models.py index <HASH>..<HASH> 100644 --- a/hypermap/aggregator/models.py +++ b/hypermap/aggregator/models.py @@ -1294,9 +1294,11 @@ def endpointlist_post_save(instance, *args, **kwargs): def endpoint_post_save(instance, *args, **kwargs): + signals.post_save.disconnect(endpoint_post_save, sender=Endpoint) if Endpoint.objects.filter(url=instance.url).count() == 0: endpoint = Endpoint(url=instance.url) endpoint.save() + signals.post_save.connect(endpoint_post_save, sender=Endpoint) if not settings.SKIP_CELERY_TASK: update_endpoint.delay(instance) else:
Prevent recursion with same endpoint url (#<I>) * Prevent recursion with same endpoint url Found an issue. When a new endpoint list is added, an infinite loop with the first endpoint url from the file is generated. <URL>
cga-harvard_Hypermap-Registry
train
py
d18e05c7e4011fa95faa307d40993a26900f4758
diff --git a/lib/vanity/adapters/mongodb_adapter.rb b/lib/vanity/adapters/mongodb_adapter.rb index <HASH>..<HASH> 100644 --- a/lib/vanity/adapters/mongodb_adapter.rb +++ b/lib/vanity/adapters/mongodb_adapter.rb @@ -19,8 +19,8 @@ module Vanity def initialize(options) if options[:hosts] - args = *options[:hosts].map{|host| [host, options[:port]] } - @mongo = Mongo::ReplSetConnection.new(args, {:connect => false}) + args = (options[:hosts].map{|host| [host, options[:port]] } << {:connect => false}) + @mongo = Mongo::ReplSetConnection.new(*args) else @mongo = Mongo::Connection.new(options[:host], options[:port], :connect => false) end
Fixed a bug after really using the fork in a proper environment.
assaf_vanity
train
rb
71a83b7f9d73a90664b343c99001516f5411a0bb
diff --git a/tsdb/engine/bz1/bz1.go b/tsdb/engine/bz1/bz1.go index <HASH>..<HASH> 100644 --- a/tsdb/engine/bz1/bz1.go +++ b/tsdb/engine/bz1/bz1.go @@ -598,7 +598,6 @@ func (tx *Tx) Cursor(key string) tsdb.Cursor { c := &Cursor{ cursor: b.Cursor(), - buf: make([]byte, DefaultBlockSize), } return tsdb.MultiCursor(walCursor, c)
Remove unused buffer allocation The buffer allocation in bz1 was unused and I'm fairly certain that it was harmful to performance if used. For queries that run through a bz1 block, needing to hold on to a <I>kb block is expensive. Better to churn on the allocator and have the blocks be released when they are unused than to have <I>kb hanging around for each series regardless of size.
influxdata_influxdb
train
go
614c9b4ad9adb754d816d5fb8a134ac5cb6e430a
diff --git a/openquake/commonlib/source.py b/openquake/commonlib/source.py index <HASH>..<HASH> 100644 --- a/openquake/commonlib/source.py +++ b/openquake/commonlib/source.py @@ -365,7 +365,7 @@ class CompositionInfo(object): """ sm = self.source_models[sm_id] return self.__class__( - self.gsim_lt, self.seed, self.num_samples, [sm], self.tot_weight) + self.gsim_lt, self.seed, sm.samples, [sm], self.tot_weight) def __getnewargs__(self): # with this CompositionInfo instances will be unpickled correctly
Small fix in case of sampling Former-commit-id: caedbc<I>e<I>e9fb<I>fca<I>d<I>cc<I>b4
gem_oq-engine
train
py
82e0f78012cfdbd7c4b48d7a91ecafb428c6cbb5
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ tests_require = [ 'pytest-cache>=1.0', 'pytest-cov>=1.8.0', 'pytest-pep8>=1.0.6', - 'pytest>=2.8.0,<3.0.0' + 'pytest>=3.8' ] extras_require = {
installation: upgrade `pytest`
reanahub_reana-commons
train
py
218154f20da546d2802bfd59222c4e3792f3ac4b
diff --git a/website/data/version.js b/website/data/version.js index <HASH>..<HASH> 100644 --- a/website/data/version.js +++ b/website/data/version.js @@ -1,3 +1,3 @@ -export const VERSION = '1.4.1' +export const VERSION = '1.4.2' export const CHANGELOG_URL = - 'https://github.com/hashicorp/vault/blob/master/CHANGELOG.md#141-april-30th-2020' + 'https://github.com/hashicorp/vault/blob/master/CHANGELOG.md#142-may-21st-2020'
update website for <I> (#<I>)
hashicorp_vault
train
js
d4b4b57b73b2a21227c326b486b5182efaff1a97
diff --git a/internetarchive/cli/ia_copy.py b/internetarchive/cli/ia_copy.py index <HASH>..<HASH> 100644 --- a/internetarchive/cli/ia_copy.py +++ b/internetarchive/cli/ia_copy.py @@ -34,6 +34,7 @@ import sys from docopt import docopt, printable_usage from schema import Schema, Use, Or, And, SchemaError +from six.moves.urllib import parse import internetarchive as ia from internetarchive.cli.argparser import get_args_dict @@ -91,7 +92,7 @@ def main(argv, session, cmd='copy'): print('{0}\n{1}'.format(str(exc), usage), file=sys.stderr) sys.exit(1) - args['--header']['x-amz-copy-source'] = '/{}'.format(src_path) + args['--header']['x-amz-copy-source'] = '/{}'.format(parse.quote(src_path)) args['--header']['x-amz-metadata-directive'] = 'COPY' args['--header'] # Add keep-old-version by default.
urlencode/quote path in s3 copy-source header
jjjake_internetarchive
train
py
11461f808160e09bb992f9c602c342718892bb6a
diff --git a/docs/conf.py b/docs/conf.py index <HASH>..<HASH> 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -46,10 +46,10 @@ copyright = u'2009, the django-authority team' # built documents. # # The short X.Y version. -version = '0.6' +version = '0.7' # The full version, including alpha/beta/rc tags. -release = '0.6dev' +release = '0.7dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def read(fname): setup( name='django-authority', - version='0.6', + version='0.7', description=( "A Django app that provides generic per-object-permissions " "for Django's auth app."
Bumped to version <I>
jazzband_django-authority
train
py,py