diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/htmlToXlsx.js b/lib/htmlToXlsx.js
index <HASH>..<HASH> 100644
--- a/lib/htmlToXlsx.js
+++ b/lib/htmlToXlsx.js
@@ -111,7 +111,6 @@ module.exports = function (reporter, definition) {
if (reporter.compilation) {
reporter.compilation.resourceInTemp('htmlToXlsxConversionScript.js', path.join(path.dirname(require.resolve('html-to-xlsx')), 'lib', 'scripts', 'conversionScript.js'))
- reporter.compilation.resourceDirectoryInTemp('xlsxTemplate', path.join(path.dirname(require.resolve('msexcel-builder-extended')), 'tmpl'))
}
definition.options.tmpDir = reporter.options.tempAutoCleanupDirectory
@@ -122,7 +121,6 @@ module.exports = function (reporter, definition) {
if (reporter.execution) {
options.conversionScriptPath = reporter.execution.resourceTempPath('htmlToXlsxConversionScript.js')
- options.xlsxTemplatePath = reporter.execution.resourceTempPath('xlsxTemplate')
}
if (reporter.compilation) {
|
don’t require msexcel-builder-extended (it is not used)
|
diff --git a/go/mysql/collations/integration/main_test.go b/go/mysql/collations/integration/main_test.go
index <HASH>..<HASH> 100644
--- a/go/mysql/collations/integration/main_test.go
+++ b/go/mysql/collations/integration/main_test.go
@@ -38,6 +38,8 @@ var (
var waitmysql = flag.Bool("waitmysql", false, "")
func mysqlconn(t *testing.T) *mysql.Conn {
+ t.Skipf("temporarily disabled because of MySQL upgrade")
+
conn, err := mysql.Connect(context.Background(), &connParams)
if err != nil {
t.Fatal(err)
|
ci: temporarily disable integration tests
|
diff --git a/bin/php-cs-fixer-config.php b/bin/php-cs-fixer-config.php
index <HASH>..<HASH> 100644
--- a/bin/php-cs-fixer-config.php
+++ b/bin/php-cs-fixer-config.php
@@ -51,7 +51,6 @@ return
'php_closing_tag',
'single_line_after_imports',
'trailing_spaces',
- 'function_call_space',
'operators_spaces',
|
Duplicate, already in here.
|
diff --git a/pysat/_meta.py b/pysat/_meta.py
index <HASH>..<HASH> 100644
--- a/pysat/_meta.py
+++ b/pysat/_meta.py
@@ -456,7 +456,6 @@ class Meta(object):
lower_keys = [k.lower() for k in value.keys()]
# dictionary of labels (keys) and values (default value for attribute)
default_dict = self.default_labels_and_values(name)
- # for attr, defaults in default_dict: #zip(attrs, default_attrs):
for attr in default_dict: #zip(attrs, default_attrs):
# the metadata default values for attr are in defaults
defaults = default_dict[attr]
@@ -550,6 +549,10 @@ class Meta(object):
elif isinstance(value, Meta):
# dealing with higher order data set
+
+ # if name is already used in meta object, use that one
+ # with preserved case
+ # otherwise, use name as provided
if name in self:
new_item_name = self.var_case_name(name)
else:
@@ -571,6 +574,11 @@ class Meta(object):
value.data.index = new_names
# assign Meta object now that things are consistent with Meta
# object settings
+ # but first, make sure there are lower dimension metadata
+ # parameters, passing in an empty dict fills in defaults
+ # if there is no existing metadata info
+ self[new_item_name] = {}
+ # now add to higher order data
self.ho_data[new_item_name] = value
def __getitem__(self, key):
|
Modified meta assignment so lower dimensional parameters always present
|
diff --git a/packages/openneuro-client/src/client.js b/packages/openneuro-client/src/client.js
index <HASH>..<HASH> 100644
--- a/packages/openneuro-client/src/client.js
+++ b/packages/openneuro-client/src/client.js
@@ -69,6 +69,7 @@ const middlewareAuthLink = (uri, getAuthorization, fetch) => {
uri,
fetch,
serverFormData: FormData,
+ credentials: 'same-origin',
})
return authLink(getAuthorization).concat(httpUploadLink)
}
|
Client: Include cookies on same-origin requests.
|
diff --git a/src/Illuminate/Auth/EloquentUserProvider.php b/src/Illuminate/Auth/EloquentUserProvider.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Auth/EloquentUserProvider.php
+++ b/src/Illuminate/Auth/EloquentUserProvider.php
@@ -68,7 +68,7 @@ class EloquentUserProvider implements UserProviderInterface {
*/
public function updateRememberToken(UserInterface $user, $token)
{
- $user->setAttribute($user->getRememberTokenName(), $token);
+ $user->setRememberToken($token);
$user->save();
}
|
Update EloquentUserProvider to use UserInterface#setRememberToken rather than Model#setAttribute directly. Closes #<I>.
|
diff --git a/tests/SpotifyWebAPITest.php b/tests/SpotifyWebAPITest.php
index <HASH>..<HASH> 100644
--- a/tests/SpotifyWebAPITest.php
+++ b/tests/SpotifyWebAPITest.php
@@ -213,7 +213,7 @@ class SpotifyWebAPITest extends PHPUnit_Framework_TestCase
),
array(
'id' => '3mqRLlD9j92BBv1ueFhJ1l',
- 'positions' => array(1),
+ 'positions' => array(1, 2),
),
array(
'id' => '4iV5W9uYEdYUVa79Axb7Rh',
@@ -228,7 +228,7 @@ class SpotifyWebAPITest extends PHPUnit_Framework_TestCase
'uri' => 'spotify:track:1id6H6vcwSB9GGv9NXh5cl',
),
array(
- 'positions' => array(1),
+ 'positions' => array(1, 2),
'uri' => 'spotify:track:3mqRLlD9j92BBv1ueFhJ1l',
),
array(
|
Test multiple positions in SpotifyWebAPI::deleteUserPlaylistTracks()
|
diff --git a/source/rafcon/gui/models/container_state.py b/source/rafcon/gui/models/container_state.py
index <HASH>..<HASH> 100644
--- a/source/rafcon/gui/models/container_state.py
+++ b/source/rafcon/gui/models/container_state.py
@@ -265,8 +265,7 @@ class ContainerStateModel(StateModel):
return
if isinstance(info.result, Exception):
- exc_info = sys.exc_info()
- raise exc_info[0], exc_info[1], exc_info[2]
+ pass
elif "add" in info.method_name:
self.add_missing_model(model_list, data_list, model_name, model_class, model_key)
elif "remove" in info.method_name:
|
fix(container state model): remove re-raise and accept expected exceptions as result
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,11 @@ setup(
# project is installed. For an analysis of "install_requires" vs pip's
# requirements files see:
# https://packaging.python.org/en/latest/technical.html#install-requires-vs-requirements-files
- install_requires=[],
+ install_requires=[
+ 'paramiko',
+ 'defusedxml',
+ 'lxml',
+ ],
# You can just specify the packages manually here if your project is
# simple. Or you can use find_packages().
|
Add paramiko, defuesedxml and lxml as install requirements.
|
diff --git a/Form/Type/BadgeRuleType.php b/Form/Type/BadgeRuleType.php
index <HASH>..<HASH> 100644
--- a/Form/Type/BadgeRuleType.php
+++ b/Form/Type/BadgeRuleType.php
@@ -68,8 +68,9 @@ class BadgeRuleType extends AbstractType
'twolevelselect',
array(
'translation_domain' => 'log',
- 'attr' => array('class' => 'input-sm'),
- 'choices' => $actionChoices
+ 'attr' => array('class' => 'input-sm'),
+ 'choices' => $actionChoices,
+ 'choices_as_values' => true
)
)
->add('isUserReceiver', 'checkbox')
|
[BadgeBundle] Compat with sf <I>
|
diff --git a/ngDraggable.js b/ngDraggable.js
index <HASH>..<HASH> 100644
--- a/ngDraggable.js
+++ b/ngDraggable.js
@@ -176,6 +176,7 @@ angular.module("ngDraggable", [])
evt.preventDefault();
$rootScope.$broadcast('draggable:end', {x:_mx, y:_my, tx:_tx, ty:_ty, event:evt, element:element, data:_data, callback:onDragComplete, uid: _myid});
element.removeClass('dragging');
+ element.closest('.drag-enter').removeClass('drag-enter');
reset();
$document.off(_moveEvents, onmove);
$document.off(_releaseEvents, onrelease);
|
fix issue #<I>
drag-enter class isn't removed from the dragged element after the drag ends.
|
diff --git a/src/Behat/Behat/Formatter/PrettyFormatter.php b/src/Behat/Behat/Formatter/PrettyFormatter.php
index <HASH>..<HASH> 100644
--- a/src/Behat/Behat/Formatter/PrettyFormatter.php
+++ b/src/Behat/Behat/Formatter/PrettyFormatter.php
@@ -703,7 +703,7 @@ class PrettyFormatter extends ProgressFormatter
(!$exception instanceof UndefinedException || null === $snippet)) {
$this->printStepException($exception, $color);
}
- if (null !== $snippet) {
+ if (null !== $snippet && $this->getParameter('snippets')) {
$this->printStepSnippet($snippet);
}
}
|
print step snippets in HTML formatter only if they are enabled (closes #<I>)
|
diff --git a/pytestsalt/utils.py b/pytestsalt/utils.py
index <HASH>..<HASH> 100644
--- a/pytestsalt/utils.py
+++ b/pytestsalt/utils.py
@@ -15,7 +15,13 @@
from __future__ import absolute_import
import socket
+# Import 3rd party libs
+import pytest
+pytest_plugins = ['helpers_namespace']
+
+
[email protected]
def get_unused_localhost_port():
'''
Return a random unused port on localhost
|
Register `get_unused_localhost_port` as a pytest helper.
|
diff --git a/internal/service/codestarconnections/tags_gen.go b/internal/service/codestarconnections/tags_gen.go
index <HASH>..<HASH> 100644
--- a/internal/service/codestarconnections/tags_gen.go
+++ b/internal/service/codestarconnections/tags_gen.go
@@ -7,7 +7,6 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/codestarconnections"
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
- "github.com/hashicorp/terraform-provider-aws/internal/tfresource"
)
// ListTags lists codestarconnections service tags.
|
codestarconnections: Fix more import problems
|
diff --git a/lib/peddler/operation.rb b/lib/peddler/operation.rb
index <HASH>..<HASH> 100644
--- a/lib/peddler/operation.rb
+++ b/lib/peddler/operation.rb
@@ -28,10 +28,8 @@ module Peddler
self
end
- def store(key, val, parent: '')
- key = camelize(key) if key.is_a?(Symbol)
- key = "#{parent}.#{key}" unless parent.empty?
-
+ def store(key, val, parent: nil)
+ key = [parent, camelize(key)].compact.join('.')
val = val.iso8601 if val.respond_to?(:iso8601)
val = val.to_h if val.is_a?(Struct)
@@ -51,10 +49,11 @@ module Peddler
private
- def camelize(sym)
- return sym.to_s if sym =~ CAPITAL_LETTERS
+ def camelize(key)
+ return key unless key.is_a?(Symbol)
+ return key.to_s if key =~ CAPITAL_LETTERS
- sym
+ key
.to_s
.split('_')
.map { |token| capitalize(token) }
|
Refactor Peddler::Operation#store
|
diff --git a/scripts/benchmark.js b/scripts/benchmark.js
index <HASH>..<HASH> 100755
--- a/scripts/benchmark.js
+++ b/scripts/benchmark.js
@@ -1,4 +1,5 @@
#!/usr/bin/env node
+Error.stackTraceLimit = Infinity;
const uglify = require('uglify-js');
const Table = require('cli-table');
@@ -10,7 +11,9 @@ const zlib = require('zlib');
const fs = require('fs');
const path = require('path');
-babel.register();
+
+require('babel-jest/node_modules/babel-core').register();
+
const filename = process.argv[2];
if (!filename) {
console.error('Error: No filename specified');
@@ -74,12 +77,6 @@ function test(name, callback) {
test('babel', function (code, callback) {
return babel.transform(code, {
- experimental: true,
- whitelist: [],
- optional: [
- 'minification.memberExpressionLiterals',
- 'minification.propertyLiterals',
- ],
plugins: [
// 'constant-folding',
require('../src/mangle-names-plugin'),
|
update to run in babel 6
|
diff --git a/library/Garp/Model/Db/Faker.php b/library/Garp/Model/Db/Faker.php
index <HASH>..<HASH> 100644
--- a/library/Garp/Model/Db/Faker.php
+++ b/library/Garp/Model/Db/Faker.php
@@ -129,10 +129,10 @@ class Garp_Model_Db_Faker {
if ($name === 'name') {
return $this->_faker->sentence;
}
- if ($name === 'first_name') {
+ if (f\either(f\contains('first_name'), f\contains('voornaam'))($name)) {
return $this->_faker->firstName;
}
- if ($name === 'last_name') {
+ if (f\either(f\contains('last_name'), f\contains('achternaam'))($name)) {
return $this->_faker->lastName;
}
return $this->_faker->text(
@@ -145,3 +145,4 @@ class Garp_Model_Db_Faker {
}
+
|
Improve detection of name fields
- Check for substrings rather than full matches, to pick up columns
where first/last names are prefixed or suffixed.
- Also, pick up on Dutch column names.
|
diff --git a/h2o-core/src/test/java/water/fvec/WordCountBigTest.java b/h2o-core/src/test/java/water/fvec/WordCountBigTest.java
index <HASH>..<HASH> 100644
--- a/h2o-core/src/test/java/water/fvec/WordCountBigTest.java
+++ b/h2o-core/src/test/java/water/fvec/WordCountBigTest.java
@@ -14,4 +14,8 @@ public class WordCountBigTest extends WordCountTest {
if( file==null ) throw new FileNotFoundException(best);
doWordCount(file);
}
+
+ @Test public void testWordCount() throws IOException {
+ // Do nothing; in particular, don't run inherited testWordCount again.
+ }
}
|
Don't run inherited testWordCount.
|
diff --git a/lib/class.OS_Windows.php b/lib/class.OS_Windows.php
index <HASH>..<HASH> 100644
--- a/lib/class.OS_Windows.php
+++ b/lib/class.OS_Windows.php
@@ -170,14 +170,14 @@ class OS_Windows {
$cpus = array();
$alt = false;
- $object = $this->wmi->ExecQuery("SELECT Name, Manufacturer, CurrentClockSpeed, NumberOfLogicalProcessors FROM Win32_Processor";
+ $object = $this->wmi->ExecQuery("SELECT Name, Manufacturer, CurrentClockSpeed, NumberOfLogicalProcessors FROM Win32_Processor");
if (!is_object($object)) {
- $object = $this->wmi->ExecQuery("SELECT Name, Manufacturer, CurrentClockSpeed FROM Win32_Processor";
+ $object = $this->wmi->ExecQuery("SELECT Name, Manufacturer, CurrentClockSpeed FROM Win32_Processor");
$alt = true;
}
- foreach($objectas $cpu) {
+ foreach($object as $cpu) {
$curr = array(
'Model' => $cpu->Name,
'Vendor' => $cpu->Manufacturer,
|
Fixed listing CPUs (again)
|
diff --git a/test/integration/generated_regress_test.rb b/test/integration/generated_regress_test.rb
index <HASH>..<HASH> 100644
--- a/test/integration/generated_regress_test.rb
+++ b/test/integration/generated_regress_test.rb
@@ -821,6 +821,7 @@ describe Regress, "The generated Regress module" do
it "has a correct #test_date_in_gvalue function" do
r = Regress.test_date_in_gvalue
date = r.ruby_value
+ skip unless date.respond_to? :get_year
assert_equal [1984, :december, 5],
[date.get_year, date.get_month, date.get_day]
end
|
Skip test involving GDate if introspection data is incomplete.
|
diff --git a/test/server.test.js b/test/server.test.js
index <HASH>..<HASH> 100644
--- a/test/server.test.js
+++ b/test/server.test.js
@@ -1927,3 +1927,18 @@ test('GH-877 content-type should be case insensitive', function (t) {
});
client.end();
});
+
+test('GH-882: route name is same as specified', function (t) {
+ SERVER.get({
+ name: 'my-r$-%-x',
+ path: '/m1'
+ }, function (req, res, next) {
+ res.send({name: req.route.name});
+ });
+
+ CLIENT.get('/m1', function (err, _, res) {
+ t.ifError(err);
+ t.equal(res.body, '{"name":"my-r$-%-x"}');
+ t.end();
+ });
+});
|
adding test to ensure route name is same as specified
|
diff --git a/trakt/interfaces/sync/__init__.py b/trakt/interfaces/sync/__init__.py
index <HASH>..<HASH> 100644
--- a/trakt/interfaces/sync/__init__.py
+++ b/trakt/interfaces/sync/__init__.py
@@ -20,9 +20,10 @@ __all__ = [
class SyncInterface(Interface):
path = 'sync'
- def last_activities(self):
+ def last_activities(self, **kwargs):
return self.get_data(
- self.http.get('lastactivities')
+ self.http.get('last_activities'),
+ **kwargs
)
def playback(self):
|
Fixed [/sync] last_activities() method and pass **kwargs to get_data()
|
diff --git a/tests/MainClassTest.php b/tests/MainClassTest.php
index <HASH>..<HASH> 100644
--- a/tests/MainClassTest.php
+++ b/tests/MainClassTest.php
@@ -175,7 +175,7 @@ class MainClassTest extends \PHPUnit\Framework\TestCase
$supportsLang = $deepLy->supportsLangCode($langCode);
- $this->assertEquals('true', $supportsLang);
+ $this->assertEquals(true, $supportsLang);
}
public function testGetLangName()
|
Bugfix (wrong type of var)
|
diff --git a/lib/fabrication/generator/base.rb b/lib/fabrication/generator/base.rb
index <HASH>..<HASH> 100644
--- a/lib/fabrication/generator/base.rb
+++ b/lib/fabrication/generator/base.rb
@@ -56,7 +56,7 @@ class Fabrication::Generator::Base
assign(method_name, options, &block)
end
else
- assign(method_name, args.first)
+ assign(method_name, {}, args.first)
end
end
@@ -68,13 +68,13 @@ class Fabrication::Generator::Base
instance.save! if options[:save] && instance.respond_to?(:save!)
end
- def assign(method_name, param)
- if param.is_a?(Hash) && param.has_key?(:count)
- value = (1..param[:count]).map do |i|
- block_given? ? yield(instance, i) : param
+ def assign(method_name, options, raw_value=nil)
+ if options.has_key?(:count)
+ value = (1..options[:count]).map do |i|
+ block_given? ? yield(instance, i) : raw_value
end
else
- value = block_given? ? yield(instance) : param
+ value = block_given? ? yield(instance) : raw_value
end
instance.send("#{method_name}=", value)
end
|
Reduce guesswork in Base#assign
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -28,7 +28,16 @@ module.exports = {
output: {
file: 'spin.js',
format: 'es'
- }
+ },
+ onwarn: function(warning) {
+ // Suppress known error message caused by TypeScript compiled code with Rollup
+ // https://github.com/rollup/rollup/wiki/Troubleshooting#this-is-undefined
+ if (warning.code === 'THIS_IS_UNDEFINED') {
+ return;
+ }
+ // eslint-disable-next-line no-console
+ console.log("Rollup warning: ", warning.message);
+ },
}
});
|
Suppress rollup warning (#<I>)
|
diff --git a/ratcave/shader.py b/ratcave/shader.py
index <HASH>..<HASH> 100644
--- a/ratcave/shader.py
+++ b/ratcave/shader.py
@@ -139,6 +139,4 @@ class Shader(ugl.BindingContextMixin, ugl.BindNoTargetMixin):
# obtain the uniform location
if not loc:
loc = self.get_uniform_location(name)
- gl.glUniformMatrix4fv(loc, 1, False, (c_float * 16)(*mat.ravel('F'))) # uplaod the 4x4 floating point matrix
- # cmat = mat.T.ctypes.data_as(POINTER(c_float * 16)).contents
- # gl.glUniformMatrix4fv(loc, 1, False, cmat) # uplaod the 4x4 floating point matrix
+ gl.glUniformMatrix4fv(loc, 1, True, (c_float * 16)(*mat.ravel())) # uplaod the 4x4 floating point matrix
|
Performed transpose directly in OpenGL function.
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -5,8 +5,8 @@ from pallets_sphinx_themes import ProjectLink
project = 'Flask-JSONRPC'
copyright = '2021, Nycholas de Oliveira e Oliveira' # pylint: disable=W0622
author = 'Nycholas de Oliveira e Oliveira'
-release = '2.1.0.beta'
-version = '2.1.0.beta'
+release = '2.1.0'
+version = '2.1.0'
# -- General configuration ---------------------------------------------------
diff --git a/src/flask_jsonrpc/__init__.py b/src/flask_jsonrpc/__init__.py
index <HASH>..<HASH> 100644
--- a/src/flask_jsonrpc/__init__.py
+++ b/src/flask_jsonrpc/__init__.py
@@ -28,4 +28,4 @@ from .app import JSONRPC
from .views import JSONRPCView
from .blueprints import JSONRPCBlueprint
-__version__ = '2.1.0.beta'
+__version__ = '2.1.0'
|
Version <I>
* Restructures the project (#<I>)
* Add dependabot.yml
* Add support to async and await
* Add badge docs
* Add FUNDING.yml
* Unindent & highlight code sections (#<I>)
|
diff --git a/bcbio/ngsalign/tophat.py b/bcbio/ngsalign/tophat.py
index <HASH>..<HASH> 100644
--- a/bcbio/ngsalign/tophat.py
+++ b/bcbio/ngsalign/tophat.py
@@ -42,7 +42,8 @@ def align(fastq_file, pair_file, ref_file, out_base, align_dir, config):
with file_transaction([os.path.join(out_dir, f) for f in _out_fnames]):
child = subprocess.check_call(cl)
out_file_final = os.path.join(out_dir, "%s.sam" % out_base)
- os.symlink(out_file, out_file_final)
+ if not os.path.exists(out_file_final):
+ os.symlink(out_file, out_file_final)
return out_file_final
def _estimate_paired_innerdist(fastq_file, pair_file, ref_file, out_base,
|
Avoid symlinking tophat output file if previously exists
|
diff --git a/cypress/component/basic/network/users-spec.js b/cypress/component/basic/network/users-spec.js
index <HASH>..<HASH> 100644
--- a/cypress/component/basic/network/users-spec.js
+++ b/cypress/component/basic/network/users-spec.js
@@ -10,7 +10,7 @@ context('Users', () => {
it('fetches 3 users from remote API', () => {
mount(<Users />)
// fetching users can take a while
- cy.get('li', { timeout: 20000 }).should('have.length', 3)
+ cy.get('li', { timeout: 60000 }).should('have.length', 3)
})
})
|
increase wait for command for bahmutov/cypress-react-unit-test#<I>
|
diff --git a/haphilipsjs/__init__.py b/haphilipsjs/__init__.py
index <HASH>..<HASH> 100644
--- a/haphilipsjs/__init__.py
+++ b/haphilipsjs/__init__.py
@@ -1,6 +1,7 @@
import requests
import logging
+
LOG = logging.getLogger(__name__)
BASE_URL = 'http://{0}:1925/{1}/{2}'
TIMEOUT = 5.0
@@ -25,11 +26,13 @@ class PhilipsTV(object):
self.source_id = None
self.channels = None
self.channel_id = None
+ self.session = requests.Session()
+ self.session.mount("http://", requests.sessions.HTTPAdapter(pool_connections=1, pool_maxsize=1))
def _getReq(self, path):
try:
- with requests.get(BASE_URL.format(self._host, self.api_version, path), timeout=TIMEOUT) as resp:
+ with self.session.get(BASE_URL.format(self._host, self.api_version, path), timeout=TIMEOUT) as resp:
if resp.status_code != 200:
return None
return resp.json()
@@ -38,7 +41,7 @@ class PhilipsTV(object):
def _postReq(self, path, data):
try:
- with requests.post(BASE_URL.format(self._host, self.api_version, path), json=data, timeout=TIMEOUT) as resp:
+ with self.session.post(BASE_URL.format(self._host, self.api_version, path), json=data, timeout=TIMEOUT) as resp:
if resp.status_code == 200:
return True
else:
|
Reuse a session with a single cached connection
|
diff --git a/src/resizilla.src.js b/src/resizilla.src.js
index <HASH>..<HASH> 100644
--- a/src/resizilla.src.js
+++ b/src/resizilla.src.js
@@ -38,12 +38,12 @@ function handlerCallback(handler, delay, incept) {
/**
- * [resizilla description]
+ * resizilla function
* @public
- * @param {[type]} optionsHandler [description]
- * @param {[type]} delay [description]
- * @param {[type]} incept [description]
- * @return {[type]} [description]
+ * @param {Function | Object} optionsHandler The handler or options as an
+ * object literal.
+ * @param {Number} delay Delay in MS
+ * @param {Boolean} incept Incept from start of delay or till the end.
*/
function resizilla(optionsHandler, delay, incept) {
var options = {};
@@ -103,6 +103,10 @@ function resizilla(optionsHandler, delay, incept) {
}
+/**
+ * Remove all or one of the event listeners
+ * @param {String} type.
+ */
resizilla.destroy = function(type) {
if(!type || type === 'all'){
window.removeEventListener('resize', this.options.handler, this.options.useCapture);
|
Added comments to remaning outer functions and destroy method
|
diff --git a/core/Version.php b/core/Version.php
index <HASH>..<HASH> 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -20,7 +20,7 @@ final class Version
* The current Matomo version.
* @var string
*/
- const VERSION = '4.0.4';
+ const VERSION = '4.0.4-b1';
const MAJOR_VERSION = 4;
public function isStableVersion($version)
|
Set version to <I>-b1 (#<I>)
|
diff --git a/src/angular-intro.js b/src/angular-intro.js
index <HASH>..<HASH> 100644
--- a/src/angular-intro.js
+++ b/src/angular-intro.js
@@ -38,7 +38,7 @@
ngIntroHintsMethod: "=?",
ngIntroOnhintsadded: "=",
- ngIntroOnhintsclicked: "=?",
+ ngIntroOnhintclick: "=?",
ngIntroOnhintclose: "=?",
ngIntroShowHint: "=?",
ngIntroShowHints: "=?",
|
fixed scope property name ngIntroOnhintclick
replaced scope property "ngIntroOnhintsclicked" with ngIntroOnhintclick
|
diff --git a/test/slop_test.rb b/test/slop_test.rb
index <HASH>..<HASH> 100644
--- a/test/slop_test.rb
+++ b/test/slop_test.rb
@@ -90,4 +90,13 @@ class SlopTest < TestCase
refute slop[:debug]
refute slop.debug?
end
+
+ test 'raises if an option expects an argument and none is given' do
+ slop = Slop.new
+ slop.opt :name, true
+ slop.opt :age, :optional => true
+
+ assert_raises(Slop::MissingArgumentError, /name/) { slop.parse %w/--name/ }
+ assert slop.parse %w/--name 'foo'/
+ end
end
|
added tests for raising if no option is given when one is expected
|
diff --git a/qiskit/pulse/instructions/call.py b/qiskit/pulse/instructions/call.py
index <HASH>..<HASH> 100644
--- a/qiskit/pulse/instructions/call.py
+++ b/qiskit/pulse/instructions/call.py
@@ -222,3 +222,6 @@ class Call(instruction.Instruction):
return False
return True
+
+ def __repr__(self) -> str:
+ return f"{self.__class__.__name__}({self.assigned_subroutine()}, name='{self.name}')"
|
fix call instruction representation (reflect assigned parameters) (#<I>)
|
diff --git a/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionEntryDisplayContext.java b/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionEntryDisplayContext.java
index <HASH>..<HASH> 100644
--- a/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionEntryDisplayContext.java
+++ b/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionEntryDisplayContext.java
@@ -386,7 +386,7 @@ public class CommerceSubscriptionEntryDisplayContext {
BaseModelSearchResult<CommerceSubscriptionEntry>
commerceSubscriptionBaseModelSearchResult =
_commerceSubscriptionEntryService.
- getCommerceSubscriptionEntries(
+ searchCommerceSubscriptionEntries(
_cpRequestHelper.getCompanyId(),
_cpRequestHelper.getScopeGroupId(),
maxSubscriptionCycles, active, getKeywords(),
|
COMMERCE-<I> Renamed method
|
diff --git a/findbugs/test/OpenStream.java b/findbugs/test/OpenStream.java
index <HASH>..<HASH> 100644
--- a/findbugs/test/OpenStream.java
+++ b/findbugs/test/OpenStream.java
@@ -2,10 +2,23 @@ import java.io.*;
public class OpenStream {
public static void main(String[] argv) throws Exception {
- FileInputStream in = new FileInputStream(argv[0]);
+ FileInputStream in = null;
- if (Boolean.getBoolean("foobar")) {
- in.close();
+ try {
+ in = new FileInputStream(argv[0]);
+ } finally {
+ // Not guaranteed to be closed here!
+ if (Boolean.getBoolean("inscrutable"))
+ in.close();
+ }
+
+ FileInputStream in2 = null;
+ try {
+ in2 = new FileInputStream(argv[1]);
+ } finally {
+ // This one will be closed
+ if (in2 != null)
+ in2.close();
}
// oops! exiting the method without closing the stream
|
Two streams, one closed and the other not
git-svn-id: <URL>
|
diff --git a/commands/build.js b/commands/build.js
index <HASH>..<HASH> 100644
--- a/commands/build.js
+++ b/commands/build.js
@@ -2,12 +2,13 @@ var logger = require('./../lib/logger');
var shell = require('shelljs');
var path = require('path');
-shell.config.verbose = true;
//Tasks required by this command
var html = require('./../tasks/html');
exports.execute = function() {
+ shell.config.verbose = global.config.project.debug;
+
var dest_path = path.join(global.config.project_root, global.config.project.dest);
// Clean destination Folder
diff --git a/tasks/scripts.js b/tasks/scripts.js
index <HASH>..<HASH> 100644
--- a/tasks/scripts.js
+++ b/tasks/scripts.js
@@ -1,9 +0,0 @@
-var config = require('./config.json');
-var gulp = require('gulp');
-
-/**
- * Connect Scripts
- */
-gulp.task('scripts', function () {
- return;
-});
\ No newline at end of file
|
Removing un-implemented script
|
diff --git a/nolds/measures.py b/nolds/measures.py
index <HASH>..<HASH> 100644
--- a/nolds/measures.py
+++ b/nolds/measures.py
@@ -1067,7 +1067,8 @@ def hurst_rs(data, nvals=None, fit="RANSAC", debug_plot=False,
Kwargs:
nvals (iterable of int):
sizes of subseries to use
- (default: `logarithmic_n(max(4, int(0.01* total_N)), 0.1*len(data), 1.1)`)
+ (default: 3 to 16 logarithmically spaced values, using only values
+ greater than 50 if possible)
fit (str):
the fitting method to use for the line fit, either 'poly' for normal
least squares polynomial fitting or 'RANSAC' for RANSAC-fitting which
@@ -1102,6 +1103,8 @@ def hurst_rs(data, nvals=None, fit="RANSAC", debug_plot=False,
# spaced datapoints leaning towards larger n (since smaller n often give
# misleading values, at least for white noise)
nvals = logarithmic_n(max(4, int(0.01* total_N)), 0.1 * total_N, 1.15)
+ # only take n that are larger than 50 (but always take the largest three)
+ nvals = [x for x in nvals[:-3] if x > 50] + nvals[-3:]
# get individual values for (R/S)_n
rsvals = np.array([rs(data, n) for n in nvals])
# filter NaNs (zeros should not be possible, because if R is 0 then
|
updates default value for nvals to lean even more heavily towars larger values of n
|
diff --git a/chrome/src/extension/background.js b/chrome/src/extension/background.js
index <HASH>..<HASH> 100644
--- a/chrome/src/extension/background.js
+++ b/chrome/src/extension/background.js
@@ -815,8 +815,12 @@ function getUrl(url) {
chrome.tabs.update(ChromeDriver.activeTabId, {url: url, selected: true},
getUrlCallback);
} else {
- chrome.tabs.remove(ChromeDriver.activeTabId);
+ // we need to create the new tab before deleting the old one
+ // in order to avoid hanging on OS X
+ var oldId = ChromeDriver.activeTabId;
+ ChromeDriver.activeTabId = undefined;
chrome.tabs.create({url: url, selected: true}, getUrlCallback);
+ chrome.tabs.remove(oldId);
}
}
}
|
SimonStewart: Working through issues with the ChromeDriver on OS X. There's still plenty of the The Strange left to deal with
r<I>
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -91,7 +91,7 @@ export default class Base extends EventEmitter {
backHandler: partialApplyId(screen, "backHandler"),
badgeLink: "https://auth0.com/?utm_source=lock&utm_campaign=badge&utm_medium=widget",
closeHandler: l.ui.closable(m)
- ? partialApplyId(screen, "closeHandler")
+ ? (...args) => closeLock(l.id(m), ...args)
: undefined,
contentRender: ::screen.render,
error: l.globalError(m),
diff --git a/src/lock/screen.js b/src/lock/screen.js
index <HASH>..<HASH> 100644
--- a/src/lock/screen.js
+++ b/src/lock/screen.js
@@ -1,4 +1,3 @@
-import { closeLock } from './actions';
import * as l from './index';
export default class Screen {
@@ -10,10 +9,6 @@ export default class Screen {
return null;
}
- closeHandler() {
- return closeLock;
- }
-
escHandler() {
return null;
}
|
Remove closeHandler method from Screen
|
diff --git a/.gitignore b/.gitignore
index <HASH>..<HASH> 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ dist
raygun_django_middleware.egg-info
.DS_Store
*.pyc
+build
diff --git a/raygun_django_middleware/__init__.py b/raygun_django_middleware/__init__.py
index <HASH>..<HASH> 100644
--- a/raygun_django_middleware/__init__.py
+++ b/raygun_django_middleware/__init__.py
@@ -60,6 +60,7 @@ class RaygunMiddleware(object):
'queryString': dict((key, request.GET[key]) for key in request.GET),
# F. Henard - 2/19/18 - bad practice to access request.POST in middleware - see https://stackoverflow.com/a/28641930
# 'form': dict((key, request.POST[key]) for key in request.POST),
+ 'form': {},
'headers': _headers,
'rawData': raw_data,
}
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="raygun-django-middleware",
- version="1.0.7",
+ version="1.0.8",
description="Raygun Django Middleware",
author="Mirus Research",
author_email="[email protected]",
|
need form for raygun4py
|
diff --git a/oauth2/__init__.py b/oauth2/__init__.py
index <HASH>..<HASH> 100644
--- a/oauth2/__init__.py
+++ b/oauth2/__init__.py
@@ -122,7 +122,7 @@ class Client(object):
"""
def __init__(self, identifier, secret, redirect_uris=[]):
self.identifier = identifier
- self.secret = secret,
+ self.secret = secret
self.redirect_uris = redirect_uris
def has_redirect_uri(self, uri):
diff --git a/oauth2/store.py b/oauth2/store.py
index <HASH>..<HASH> 100644
--- a/oauth2/store.py
+++ b/oauth2/store.py
@@ -2,7 +2,7 @@
Store adapters to persist data during the OAuth 2.0 process.
"""
from oauth2.error import ClientNotFoundError, AuthCodeNotFound
-from oauth2 import AuthorizationCode
+from oauth2 import AuthorizationCode, Client
class AccessTokenStore(object):
"""
@@ -76,9 +76,9 @@ class LocalClientStore(ClientStore):
:param redirect_uris: A list of URIs to redirect to.
"""
- self.clients[client_id] = {"client_id": client_id,
- "client_secret": client_secret,
- "redirect_uris": redirect_uris}
+ self.clients[client_id] = Client(identifier=client_id,
+ secret=client_secret,
+ redirect_uris=redirect_uris)
return True
|
Fixed a bug during Client init
|
diff --git a/tests/Util/ExtraData/DataEntryConverterTest.php b/tests/Util/ExtraData/DataEntryConverterTest.php
index <HASH>..<HASH> 100644
--- a/tests/Util/ExtraData/DataEntryConverterTest.php
+++ b/tests/Util/ExtraData/DataEntryConverterTest.php
@@ -67,11 +67,9 @@ class DataEntryConverterTest extends TestCase
*/
public function testConvertValueUnknown()
{
- $thirdPartyAttribute = DataEntryConverter::convertValue(
+ DataEntryConverter::convertValue(
'Some unknown type',
'Some value'
);
-
- $this->assertNull($thirdPartyAttribute);
}
}
|
SDK-<I>: Remove redundant assertion
|
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Database/Query/Builder.php
+++ b/src/Illuminate/Database/Query/Builder.php
@@ -1542,7 +1542,7 @@ class Builder
*/
public function pluck($column, $key = null)
{
- $results = $this->get(func_get_args());
+ $results = $this->get(is_null($key) ? [$column] : [$column, $key]);
// If the columns are qualified with a table or have an alias, we cannot use
// those directly in the "pluck" operations since the results from the DB
|
Allow null to be passed to pluck explicitely
|
diff --git a/lib/hoodoo/services/middleware/endpoints/inter_resource_remote.rb b/lib/hoodoo/services/middleware/endpoints/inter_resource_remote.rb
index <HASH>..<HASH> 100644
--- a/lib/hoodoo/services/middleware/endpoints/inter_resource_remote.rb
+++ b/lib/hoodoo/services/middleware/endpoints/inter_resource_remote.rb
@@ -148,7 +148,7 @@ module Hoodoo
# around somewhere.
@wrapping_session = session
- @wrapped_endpoint.session_id = session.session_id
+ @wrapped_endpoint.session_id = session.session_id unless session.nil?
return nil
end
end
|
Survive session-less attempts to make inter-resource calls
|
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index <HASH>..<HASH> 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1541,12 +1541,12 @@ module ActiveRecord #:nodoc:
end
def reverse_sql_order(order_query)
- reversed_query = order_query.to_s.split(/,/).each { |s|
+ order_query.to_s.split(/,/).each { |s|
if s.match(/\s(asc|ASC)$/)
s.gsub!(/\s(asc|ASC)$/, ' DESC')
elsif s.match(/\s(desc|DESC)$/)
s.gsub!(/\s(desc|DESC)$/, ' ASC')
- elsif !s.match(/\s(asc|ASC|desc|DESC)$/)
+ else
s.concat(' DESC')
end
}.join(',')
|
Remove unnecessary condition and local variable [#<I> state:resolved]
|
diff --git a/conda_manager/widgets/dialogs/channels.py b/conda_manager/widgets/dialogs/channels.py
index <HASH>..<HASH> 100644
--- a/conda_manager/widgets/dialogs/channels.py
+++ b/conda_manager/widgets/dialogs/channels.py
@@ -186,10 +186,16 @@ class DialogChannels(QDialog):
else:
url = "{0}/{1}".format(self._conda_url, channel)
- worker = self.api.download_is_valid_url(url)
+ if url[-1] == '/':
+ url = url[:-1]
+ plat = self.api.conda_platform()
+ repodata_url = "{0}/{1}/{2}".format(url, plat, 'repodata.json')
+
+ worker = self.api.download_is_valid_url(repodata_url)
worker.sig_finished.connect(self._url_validated)
worker.item = item
worker.url = url
+ worker.repodata_url = repodata_url
self.list.itemChanged.disconnect()
item.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsSelectable)
|
Check that is a valid conda channel and not just a valid url
|
diff --git a/deployment/appserver.py b/deployment/appserver.py
index <HASH>..<HASH> 100644
--- a/deployment/appserver.py
+++ b/deployment/appserver.py
@@ -75,7 +75,7 @@ def briefkasten_ctl(action='restart'):
@task
-def update_backend(index='dev', build=False, user=None, version=None):
+def update_backend(index='dev', build=True, user=None, version=None):
"""
Install the backend from the given devpi index at the given version on the target host and restart the service.
|
build by default
afterall, the whole point of this task is to install the very latest
version
|
diff --git a/src/cli.js b/src/cli.js
index <HASH>..<HASH> 100755
--- a/src/cli.js
+++ b/src/cli.js
@@ -70,12 +70,12 @@ program.command('build')
buildTailwind(inputFile, loadConfig(program.config), writeStrategy(program))
})
-const subCmd = _.head(program.args);
+program.parse(process.argv)
+
+const subCmd = _.get(_.head(program.args), '_name');
const cmds = _.map(program.commands, '_name');
if (!_.includes(cmds, subCmd)) {
program.help();
process.exit()
}
-
-program.parse(process.argv)
|
Fix bug where help was output even if matching command was found
|
diff --git a/openquake/baselib/parallel.py b/openquake/baselib/parallel.py
index <HASH>..<HASH> 100644
--- a/openquake/baselib/parallel.py
+++ b/openquake/baselib/parallel.py
@@ -480,7 +480,7 @@ def safely_call(func, args, task_no=0, mon=dummy_mon):
assert not isgenfunc, func
return Result.new(func, args, mon)
- if mon.operation.startswith(func.__name__):
+ if mon.operation.endswith('_split'):
name = mon.operation
else:
name = func.__name__
|
Fixed task name [ci skip]
|
diff --git a/src/Rocketeer/Commands/DeployCommand.php b/src/Rocketeer/Commands/DeployCommand.php
index <HASH>..<HASH> 100644
--- a/src/Rocketeer/Commands/DeployCommand.php
+++ b/src/Rocketeer/Commands/DeployCommand.php
@@ -1,13 +1,12 @@
<?php
namespace Rocketeer\Commands;
-use Illuminate\Console\Command;
use Rocketeer\Rocketeer;
/**
* Your interface to deploying your projects
*/
-class DeployCommand extends Command
+class DeployCommand extends BaseDeployCommand
{
/**
|
Make DeployCommand extends BaseDeployCommand now that it's lighter
|
diff --git a/http/consumer.go b/http/consumer.go
index <HASH>..<HASH> 100644
--- a/http/consumer.go
+++ b/http/consumer.go
@@ -15,7 +15,7 @@ func newConsumer(resp http.ResponseWriter) (*consumer, error) {
if err != nil {
return nil, err
}
- conn.Write([]byte("HTTP/1.1 200 OK\nContent-Type: text/event-stream\n\n"))
+ conn.Write([]byte("HTTP/1.1 200 OK\nContent-Type: text/event-stream\nX-Accel-Buffering: no\n\n"))
return &consumer{conn, make(chan bool)}, nil
}
|
Turn off nginx buffering (closes #2)
|
diff --git a/src/main/java/no/finn/unleash/repository/ToggleCollection.java b/src/main/java/no/finn/unleash/repository/ToggleCollection.java
index <HASH>..<HASH> 100644
--- a/src/main/java/no/finn/unleash/repository/ToggleCollection.java
+++ b/src/main/java/no/finn/unleash/repository/ToggleCollection.java
@@ -12,7 +12,7 @@ public final class ToggleCollection {
private final int version = 1; // required for serialization
private final transient Map<String, FeatureToggle> cache;
- ToggleCollection(final Collection<FeatureToggle> features) {
+ public ToggleCollection(final Collection<FeatureToggle> features) {
this.features = ensureNotNull(features);
this.cache = new ConcurrentHashMap<>();
for(FeatureToggle featureToggle : this.features) {
|
fix: Make ToggleCollection constructor public (#<I>)
|
diff --git a/js/src/Map.js b/js/src/Map.js
index <HASH>..<HASH> 100644
--- a/js/src/Map.js
+++ b/js/src/Map.js
@@ -82,18 +82,18 @@ export class LeafletMapModel extends widgets.DOMWidgetModel {
style: null,
default_style: null,
dragging_style: null,
- _dragging: false
};
}
initialize(attributes, options) {
super.initialize(attributes, options);
this.set('window_url', window.location.href);
+ this._dragging = false
}
update_style() {
var new_style;
- if (!this.get('_dragging')) {
+ if (!this._dragging) {
new_style = this.get('default_style');
} else {
new_style = this.get('dragging_style');
@@ -264,12 +264,12 @@ export class LeafletMapView extends utils.LeafletDOMWidgetView {
this.model.update_bounds().then(() => {
this.touch();
});
- this.model.set('_dragging', false);
+ this.model._dragging = false;
this.model.update_style();
});
this.obj.on('movestart', () => {
- this.model.set('_dragging', true);
+ this.model._dragging = true;
this.model.update_style();
});
|
Move _dragging from model value to attribute (#<I>)
* move _dragging from model value to attribute
* initialize _dragging at initialize()
* nit
|
diff --git a/config.go b/config.go
index <HASH>..<HASH> 100644
--- a/config.go
+++ b/config.go
@@ -49,7 +49,7 @@ func decodeConfig(r io.Reader, c *config) error {
func (c *config) Discover() error {
// If we are already inside a plugin process we should not need to
// discover anything.
- if os.Getenv(plugin.MagicCookieKey) != "" {
+ if os.Getenv(plugin.MagicCookieKey) == plugin.MagicCookieValue {
return nil
}
|
Change to explicit comparison with MagicCookieValue
|
diff --git a/src/shogun2-core/shogun2-service/src/main/java/de/terrestris/shogun2/service/FileService.java b/src/shogun2-core/shogun2-service/src/main/java/de/terrestris/shogun2/service/FileService.java
index <HASH>..<HASH> 100644
--- a/src/shogun2-core/shogun2-service/src/main/java/de/terrestris/shogun2/service/FileService.java
+++ b/src/shogun2-core/shogun2-service/src/main/java/de/terrestris/shogun2/service/FileService.java
@@ -59,12 +59,11 @@ public class FileService<E extends File, D extends FileDao<E>>
* @return
* @throws Exception
*/
- @SuppressWarnings("unchecked")
- public File uploadFile(MultipartFile file) throws Exception {
+ public E uploadFile(MultipartFile file) throws Exception {
InputStream is = null;
byte[] fileByteArray = null;
- File fileToPersist = getEntityClass().newInstance();
+ E fileToPersist = getEntityClass().newInstance();
try {
is = file.getInputStream();
|
addresses note of @buehner
|
diff --git a/src/js/mixin/slider-autoplay.js b/src/js/mixin/slider-autoplay.js
index <HASH>..<HASH> 100644
--- a/src/js/mixin/slider-autoplay.js
+++ b/src/js/mixin/slider-autoplay.js
@@ -35,7 +35,7 @@ export default {
if (document.hidden) {
this.stopAutoplay();
} else {
- this.startAutoplay();
+ !this.userInteracted && this.startAutoplay();
}
}
@@ -87,7 +87,7 @@ export default {
this.stopAutoplay();
- if (this.autoplay && !this.userInteracted) {
+ if (this.autoplay) {
this.interval = setInterval(
() => !(this.isHovering && this.pauseOnHover) && !this.stack.length && this.show('next'),
this.autoplayInterval
|
fix: autoplay in slider-drag after userinteraction
|
diff --git a/client/deis.py b/client/deis.py
index <HASH>..<HASH> 100755
--- a/client/deis.py
+++ b/client/deis.py
@@ -658,10 +658,13 @@ class DeisClient(object):
-a --app=<app>
the uniquely identifiable name for the application.
"""
+ command = ' '.join(args.get('<command>'))
+ self._logger.info('Running `{}`...'.format(command))
+
app = args.get('--app')
if not app:
app = self._session.app
- body = {'command': ' '.join(args.get('<command>'))}
+ body = {'command': command}
response = self._dispatch('post',
"/api/apps/{}/run".format(app),
json.dumps(body))
|
feat(client): add loading info msg to run command
|
diff --git a/upup/pkg/kutil/delete_cluster.go b/upup/pkg/kutil/delete_cluster.go
index <HASH>..<HASH> 100644
--- a/upup/pkg/kutil/delete_cluster.go
+++ b/upup/pkg/kutil/delete_cluster.go
@@ -35,7 +35,6 @@ import (
"strings"
"sync"
"time"
- "os"
)
const (
@@ -1313,14 +1312,6 @@ func ListAutoScalingGroups(cloud fi.Cloud, clusterName string) ([]*ResourceTrack
return trackers, nil
}
-//func ListBastionLaunchConfigurations(cloud fi.Cloud, clusterName string) ([]*ResourceTracker, error) {
-// c := cloud.(awsup.AWSCloud)
-//
-// glog.V(2).Infof("Listing all Autoscaling LaunchConfigurations for cluster %q", clusterName)
-// var trackers []*ResourceTracker
-// request := &autoscaling.DescribeLaunchConfigurationsInput{}
-//}
-
func ListAutoScalingLaunchConfigurations(cloud fi.Cloud, clusterName string) ([]*ResourceTracker, error) {
c := cloud.(awsup.AWSCloud)
|
Fixing for tests, removing old function
|
diff --git a/addon/components/affinity-engine-stage.js b/addon/components/affinity-engine-stage.js
index <HASH>..<HASH> 100644
--- a/addon/components/affinity-engine-stage.js
+++ b/addon/components/affinity-engine-stage.js
@@ -49,11 +49,11 @@ export default Component.extend({
window
} = getProperties(this, 'initialScene', 'eBus', 'esBus', 'stageId', 'window');
- esBus.subscribe('shouldLoadScene', this, this._loadScene);
esBus.subscribe('shouldStartScene', this, this._startScene);
esBus.subscribe('shouldChangeScene', this, this._changeScene);
if (stageId === 'main') {
+ eBus.subscribe('shouldLoadScene', this, this._loadScene);
eBus.subscribe('restartingEngine', this, this._toInitialScene);
eBus.subscribe('shouldLoadSceneFromPoint', this, this._loadSceneFromPoint);
|
put `shouldLoadScene` on eBus
|
diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
@@ -991,6 +991,8 @@ module ActiveRecord
case @connection.error_code(exception)
when 1
RecordNotUnique.new(message)
+ when 942, 955
+ ActiveRecord::StatementInvalid.new(message)
when 2291
InvalidForeignKey.new(message)
when 12899
|
Handle ORA-<I> and ORA-<I> as `ActiveRecord::StatementInvalid`
not `NativeException` by JRuby
<I>, <I>, "table or view does not exist"
<I>, <I>, "name is already used by an existing object"
Since rails/rails#<I> changes `translate_exception` to handle `RuntimeError` as exception
|
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
index <HASH>..<HASH> 100644
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
+++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
@@ -93,7 +93,13 @@ public class EurekaClientAutoConfiguration {
@Bean
@ConditionalOnMissingBean(value = EurekaClientConfig.class, search = SearchStrategy.CURRENT)
public EurekaClientConfigBean eurekaClientConfigBean() {
- return new EurekaClientConfigBean();
+ EurekaClientConfigBean client = new EurekaClientConfigBean();
+ if ("bootstrap".equals(this.env.getProperty("spring.config.name"))) {
+ // We don't register during bootstrap by default, but there will be another
+ // chance later.
+ client.setRegisterWithEureka(false);
+ }
+ return client;
}
@Bean
|
Check if client is in bootstrap and default to not register
Eureka now has the option (maybe always there) to not register
and that's a sensible default in the bootstrap phase (when we
might not know the port yet).
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ def read(fname):
setup(
name = "reload",
- version = "0.5",
+ version = "0.6",
author = "Jarek Lipski",
author_email = "[email protected]",
description = ("Reload a program if any file in current directory changes."),
|
Bump to <I> due to packaging
|
diff --git a/src/directives/glControls.js b/src/directives/glControls.js
index <HASH>..<HASH> 100644
--- a/src/directives/glControls.js
+++ b/src/directives/glControls.js
@@ -12,6 +12,10 @@ angular.module('mapboxgl-directive').directive('glControls', [function () {
navigation: {
enabled: true | false,
position: 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right'
+ },
+ scale: {
+ enabled: true | false,
+ position: 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right'
}
@@ -44,6 +48,15 @@ angular.module('mapboxgl-directive').directive('glControls', [function () {
map.addControl(mapboxGlControls.navigation);
}
+
+ // Scale Control
+ if (angular.isDefined(controls.scale) && angular.isDefined(controls.scale.enabled) && controls.scale.enabled) {
+ mapboxGlControls.scale = new mapboxgl.Scale({
+ position: controls.scale.position || 'bottom-right'
+ });
+
+ map.addControl(mapboxGlControls.scale);
+ }
}, true);
});
}
|
Added support for Navigation and Scale controls
|
diff --git a/src/main/java/org/openqa/selenium/WebDriver.java b/src/main/java/org/openqa/selenium/WebDriver.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/openqa/selenium/WebDriver.java
+++ b/src/main/java/org/openqa/selenium/WebDriver.java
@@ -84,12 +84,9 @@ public interface WebDriver extends SearchContext {
/**
* Find all elements within the current page using the given mechanism.
- * This method is affected by the 'implicit wait' times in force at the time of execution.
- * For example, that is 5 seconds, the findElements(..) after its first attempt to collect
- * matching WebElements if there is at least one. If there were no matching WebElements
- * after the first attempt, then the method will wait in line with the interval specified,
- * then try again. It will keep going until it finds at least one WebElement in a pass,
- * or the configured timeout is reached.
+ * This method is affected by the 'implicit wait' times in force at the time of execution. When
+ * implicitly waiting, this method will return as soon as there are more than 0 items in the
+ * found collection, or will return an empty list if the timeout is reached.
*
* @param by The locating mechanism to use
* @return A list of all {@link WebElement}s, or an empty list if nothing matches
|
SimonStewart: Rewording some of the docs for findElements
r<I>
|
diff --git a/hearthstone/entities.py b/hearthstone/entities.py
index <HASH>..<HASH> 100644
--- a/hearthstone/entities.py
+++ b/hearthstone/entities.py
@@ -61,6 +61,7 @@ class Game(Entity):
self.initial_entities = []
self.initial_state = State.INVALID
self.initial_step = Step.INVALID
+ self.initial_hero_entity_id = 0
@property
def current_player(self):
@@ -186,9 +187,14 @@ class Player(Entity):
@property
def starting_hero(self):
+ if self.initial_hero_entity_id:
+ return self.game.find_entity_by_id(self.initial_hero_entity_id)
+
+ # Fallback
heroes = list(self.heroes)
if not heroes:
return
+
return heroes[0]
@property
|
entities: Implement Player.initial_hero_entity_id
|
diff --git a/lib/multirepo/branch.rb b/lib/multirepo/branch.rb
index <HASH>..<HASH> 100644
--- a/lib/multirepo/branch.rb
+++ b/lib/multirepo/branch.rb
@@ -8,7 +8,9 @@ module MultiRepo
end
def exists?
- return true
+ lines = Git.run(@repo.working_copy, "branch", false).split("\n")
+ branches = lines.map { |line| line.tr("* ", "")}
+ return branches.include?(@name)
end
def create
@@ -17,7 +19,7 @@ module MultiRepo
end
def checkout
- Git.run(@repo.working_copy, "checkout #{@name}", false)
+ Git.run(@repo.working_copy, "checkout #{@name}", false)
return $?.exitstatus == 0
end
end
diff --git a/lib/multirepo/repo.rb b/lib/multirepo/repo.rb
index <HASH>..<HASH> 100644
--- a/lib/multirepo/repo.rb
+++ b/lib/multirepo/repo.rb
@@ -39,8 +39,10 @@ module MultiRepo
end
end
- # Create and switch to the appropriate branch
- @branch.create unless @branch.exists?
+ unless @branch.exists?
+ if @branch.create then Console.log_info("Created branch #{branch.name}") end
+ end
+
if @branch.checkout
Console.log_info("Checked out branch #{branch.name}")
else
|
Implemented Branch.exists? and logging when we create a branch that didn't exist.
|
diff --git a/src/__tests__/bin.js b/src/__tests__/bin.js
index <HASH>..<HASH> 100644
--- a/src/__tests__/bin.js
+++ b/src/__tests__/bin.js
@@ -3,7 +3,7 @@ const os = require("os");
const path = require("path");
const { bin } = require("..");
-const output = path.join(__dirname, "__output__");
+const output = path.join(__dirname, "..", "__output__");
const output1 = path.join(output, "1");
const output2 = path.join(output, "2");
diff --git a/src/bin.js b/src/bin.js
index <HASH>..<HASH> 100644
--- a/src/bin.js
+++ b/src/bin.js
@@ -9,11 +9,7 @@ const optDefault = {
conartist: [],
description: "",
name: "",
- options: {
- cwd: {
- description: "Set the cwd."
- }
- },
+ options: {},
version: "0.0.0"
};
|
Remove cwd option. Move __output__ to dir that doesn't run tests.
|
diff --git a/src/wizard.js b/src/wizard.js
index <HASH>..<HASH> 100644
--- a/src/wizard.js
+++ b/src/wizard.js
@@ -55,6 +55,13 @@ angular.module('mgo-angular-wizard').directive('wizard', function() {
_.each($scope.getEnabledSteps(), function(step) {
step.completed = true;
});
+ } else {
+ var completedStepsIndex = $scope.currentStepNumber() - 1;
+ angular.forEach($scope.getEnabledSteps(), function(step, stepIndex) {
+ if(stepIndex >= completedStepsIndex) {
+ step.completed = false;
+ }
+ });
}
}, true);
|
corrected issue that only allowed edit mode to toggle once
|
diff --git a/src/main/java/redis/clients/jedis/ShardedJedisPool.java b/src/main/java/redis/clients/jedis/ShardedJedisPool.java
index <HASH>..<HASH> 100644
--- a/src/main/java/redis/clients/jedis/ShardedJedisPool.java
+++ b/src/main/java/redis/clients/jedis/ShardedJedisPool.java
@@ -61,7 +61,17 @@ public class ShardedJedisPool extends Pool<ShardedJedis> {
}
public boolean validateObject(final Object obj) {
- return true;
+ try {
+ ShardedJedis jedis = (ShardedJedis) obj;
+ for (Jedis shard : jedis.getAllShards()) {
+ if (!shard.isConnected() || !shard.ping().equals("PONG")) {
+ return false;
+ }
+ }
+ return true;
+ } catch (Exception ex) {
+ return false;
+ }
}
}
}
\ No newline at end of file
|
reverted back vetify() as connection checks could be disabled in pool config
|
diff --git a/jquery.flot.pie.js b/jquery.flot.pie.js
index <HASH>..<HASH> 100644
--- a/jquery.flot.pie.js
+++ b/jquery.flot.pie.js
@@ -69,6 +69,7 @@ More detail and specific examples can be found in the included HTML file.
var canvas = null,
target = null,
+ options = null,
maxRadius = null,
centerLeft = null,
centerTop = null,
|
Prevent options from becoming global.
The pie plugin was a little too clever in its use of closures. In
processDatapoints it set canvas, target, and options for use in other
functions. Since options was not declared this meant that it became
global. Pages containing multiple pie plots therefore saw a range of
weird effects resulting from earlier plots receiving some of the options
set by later ones. Resolves #<I>, resolves #<I>, resolves #<I>.
|
diff --git a/lib/sp/duh/sharding/sharded_namespace.rb b/lib/sp/duh/sharding/sharded_namespace.rb
index <HASH>..<HASH> 100644
--- a/lib/sp/duh/sharding/sharded_namespace.rb
+++ b/lib/sp/duh/sharding/sharded_namespace.rb
@@ -25,15 +25,7 @@ module SP
add_sharder(sharder)
end
- def get_table(shard_ids, table_name)
- name = table_name
- ids = shard_ids.reverse
- sharders.reverse.each_with_index do |sharder, i|
- name = sharder.get_table(ids[i], name)
- end
- name
- end
-
+ def get_sharded_table(shard_ids, table_name) ; sharders.any? ? sharders.last.get_sharded_table(shard_ids, table_name) : table_name ; end
end
end
|
Implement a get_sharded_table method in the ShardedNamespace that uses the last sharder to get the table name
|
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Database/Query/Builder.php
+++ b/src/Illuminate/Database/Query/Builder.php
@@ -582,7 +582,7 @@ class Builder
/**
* Add an "or where" clause to the query.
*
- * @param string|\Closure $column
+ * @param \Closure|string $column
* @param string $operator
* @param mixed $value
* @return \Illuminate\Database\Query\Builder|static
diff --git a/src/Illuminate/View/Factory.php b/src/Illuminate/View/Factory.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/View/Factory.php
+++ b/src/Illuminate/View/Factory.php
@@ -792,7 +792,7 @@ class Factory implements FactoryContract
/**
* Add new loop to the stack.
*
- * @param array|\Countable $data
+ * @param \Countable|array $data
* @return void
*/
public function addLoop($data)
|
Fix some phpdoc inconsistencies
|
diff --git a/src/ServiceContainer/WordpressBehatExtension.php b/src/ServiceContainer/WordpressBehatExtension.php
index <HASH>..<HASH> 100644
--- a/src/ServiceContainer/WordpressBehatExtension.php
+++ b/src/ServiceContainer/WordpressBehatExtension.php
@@ -69,7 +69,7 @@ class WordpressBehatExtension implements ExtensionInterface
$builder
->children()
->enumNode('default_driver')
- ->values(['wpcli'])
+ ->values(['wpcli', 'wpapi', 'blackbox'])
->defaultValue('wpcli')
->end()
|
Add all 3 drivers to YAML whitelist.
|
diff --git a/lib/glimr_api_client/api.rb b/lib/glimr_api_client/api.rb
index <HASH>..<HASH> 100644
--- a/lib/glimr_api_client/api.rb
+++ b/lib/glimr_api_client/api.rb
@@ -4,7 +4,6 @@ require 'active_support/core_ext/object/to_query'
module GlimrApiClient
module Api
-
def post
@post ||=
client.post(path: endpoint, body: request_body.to_query).tap { |resp|
@@ -45,8 +44,7 @@ module GlimrApiClient
'Content-Type' => 'application/json',
'Accept' => 'application/json'
},
- persistent: true,
- connect_timeout: 15
+ persistent: true
)
end
end
diff --git a/lib/glimr_api_client/version.rb b/lib/glimr_api_client/version.rb
index <HASH>..<HASH> 100644
--- a/lib/glimr_api_client/version.rb
+++ b/lib/glimr_api_client/version.rb
@@ -1,3 +1,3 @@
module GlimrApiClient
- VERSION = '0.1.4'
+ VERSION = '0.1.5'
end
|
Stop mutation tests from breaking for now
I need to properly stub out the connection_timeout to keep it from being
susceptible to mutation. However, the higher priority at the moment is
getting the CI working again so that master branch protection can be
turned on on github. This resolves the problem by going back to the
default timeout. I'll redo this again in a feature branch at a future
date.
|
diff --git a/src/edeposit/amqp/harvester/autoparser/path_patterns.py b/src/edeposit/amqp/harvester/autoparser/path_patterns.py
index <HASH>..<HASH> 100755
--- a/src/edeposit/amqp/harvester/autoparser/path_patterns.py
+++ b/src/edeposit/amqp/harvester/autoparser/path_patterns.py
@@ -46,9 +46,16 @@ def neighbours_pattern(element): #TODO: test
return []
parent = element.parent
- neighbours = parent.childs
- element_index = neighbours.index(element)
+ # filter only visible tags/neighbours
+ neighbours = filter(
+ lambda x: x.isTag() or x.getContent().strip() or x is element,
+ parent.childs
+ )
+ if len(neighbours) <= 1:
+ return []
+
+ element_index = neighbours.index(element)
output = []
# pick left neighbour
@@ -58,9 +65,9 @@ def neighbours_pattern(element): #TODO: test
)
# pick right neighbour
- if element_index < len(neighbours) - 2:
+ if element_index + 2 < len(neighbours):
output.append(
- neighbour_to_path_call("right", neighbours[element_index + 1])
+ neighbour_to_path_call("right", neighbours[element_index + 2])
)
return output
|
#<I>: Fixed few bugs in path_patterns.py / neighbours_pattern()
|
diff --git a/nodeshot/interop/sync/tests.py b/nodeshot/interop/sync/tests.py
index <HASH>..<HASH> 100755
--- a/nodeshot/interop/sync/tests.py
+++ b/nodeshot/interop/sync/tests.py
@@ -623,11 +623,7 @@ class SyncTest(TestCase):
# limit pagination to 1 in geojson view
url = reverse('api_layer_nodes_geojson', args=[layer.slug])
response = self.client.get('%s?limit=1&page=2' % url)
- self.assertEqual(len(response.data['results']), 1)
- self.assertIn(settings.SITE_URL, response.data['previous'])
- self.assertIn(url, response.data['previous'])
- self.assertIn(settings.SITE_URL, response.data['next'])
- self.assertIn(url, response.data['next'])
+ self.assertEqual(len(response.data['features']), 1)
def test_nodeshot_sync_exceptions(self):
layer = Layer.objects.external()[0]
|
interop.sync: updated failing test introduced with <I>a<I>a
|
diff --git a/astrobase/lcproc.py b/astrobase/lcproc.py
index <HASH>..<HASH> 100644
--- a/astrobase/lcproc.py
+++ b/astrobase/lcproc.py
@@ -1154,6 +1154,7 @@ def timebinlc_worker(task):
def parallel_timebin_lclist(lclist,
binsizesec,
+ maxobjects=None,
outdir=None,
lcformat='hat-sql',
timecols=None,
@@ -1170,6 +1171,9 @@ def parallel_timebin_lclist(lclist,
if outdir and not os.path.exists(outdir):
os.mkdir(outdir)
+ if maxobjects is not None:
+ lclist = lclist[:maxobjects]
+
tasks = [(x, binsizesec, {'outdir':outdir,
'lcformat':lcformat,
'timecols':timecols,
@@ -1190,6 +1194,7 @@ def parallel_timebin_lclist(lclist,
def parallel_timebin_lcdir(lcdir,
binsizesec,
+ maxobjects=None,
outdir=None,
lcformat='hat-sql',
timecols=None,
@@ -1215,6 +1220,7 @@ def parallel_timebin_lcdir(lcdir,
return parallel_timebin_lclist(lclist,
binsizesec,
+ maxobjects=maxobjects,
outdir=outdir,
lcformat=lcformat,
timecols=timecols,
|
lcproc: add parallel LC binning functions
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,8 +12,6 @@ if sys.version_info < (2, 6):
print >> sys.stderr, error
sys.exit(1)
-extra = dict()
-
try:
from setuptools import setup, find_packages
from setuptools.command.test import test as testcommand
@@ -120,6 +118,8 @@ except ImportError as err:
print "Proceeding anyway with manual replacements for setuptools.find_packages."
print "Try installing setuptools if you continue to have problems.\n\n"
+ extra = dict()
+
VERSION = __import__('pylti').VERSION
README = open('README.rst').read()
|
Moved extra declaration to line <I> per iceraj's request.
|
diff --git a/core-bundle/src/Resources/contao/library/Contao/Model.php b/core-bundle/src/Resources/contao/library/Contao/Model.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Resources/contao/library/Contao/Model.php
+++ b/core-bundle/src/Resources/contao/library/Contao/Model.php
@@ -96,10 +96,10 @@ abstract class Model
if ($objResult !== null)
{
$arrRelated = array();
- $this->setRow($objResult->row()); // see #5439
+ $arrData = $objResult->row();
// Look for joined fields
- foreach ($this->arrData as $k=>$v)
+ foreach ($arrData as $k=>$v)
{
if (strpos($k, '__') !== false)
{
@@ -111,7 +111,7 @@ abstract class Model
}
$arrRelated[$key][$field] = $v;
- unset($this->arrData[$k]);
+ unset($arrData[$k]);
}
}
@@ -132,6 +132,8 @@ abstract class Model
$this->arrRelated[$key]->setRow($row);
}
}
+
+ $this->setRow($arrData); // see #5439
}
$this->objResult = $objResult;
|
[Core] Strip the related fields before passing a DB result to `Model::setRow()` (see #<I>)
|
diff --git a/spec/cases/helper.rb b/spec/cases/helper.rb
index <HASH>..<HASH> 100644
--- a/spec/cases/helper.rb
+++ b/spec/cases/helper.rb
@@ -2,7 +2,7 @@ require 'bundler/setup'
require 'parallel'
def process_diff
- cmd = "ps uaxw|grep ruby|wc -l"
+ cmd = "ps uxw|grep ruby|wc -l"
processes_before = `#{cmd}`.to_i
|
only check for our processes
by @simcha
I got no errors on my local run and travis got different errors on my copy of same tree:
<URL>
|
diff --git a/java/core/libjoynr/src/main/java/io/joynr/pubsub/publication/PublicationManagerImpl.java b/java/core/libjoynr/src/main/java/io/joynr/pubsub/publication/PublicationManagerImpl.java
index <HASH>..<HASH> 100644
--- a/java/core/libjoynr/src/main/java/io/joynr/pubsub/publication/PublicationManagerImpl.java
+++ b/java/core/libjoynr/src/main/java/io/joynr/pubsub/publication/PublicationManagerImpl.java
@@ -229,6 +229,9 @@ public class PublicationManagerImpl implements PublicationManager {
BroadcastSubscriptionRequest subscriptionRequest,
RequestCaller requestCaller) {
logger.info("adding broadcast publication: " + subscriptionRequest.toString());
+ BroadcastListener broadcastListener = new BroadcastListenerImpl(subscriptionRequest.getSubscriptionId(), this);
+ String broadcastName = subscriptionRequest.getSubscribedToName();
+ requestCaller.registerBroadcastListener(broadcastName, broadcastListener);
}
|
java: broadcasts: register broadcastListener at provider
register broadcastListener in publication Manager on the
provider side.
Change-Id: I<I>bc<I>b<I>dbab<I>ac2ca4b9fd8f<I>afdb
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -244,10 +244,6 @@ var config = require('./core/server/config'),
'yarn; git submodule foreach "git checkout master && git pull ' +
upstream + ' master"';
}
- },
-
- dbhealth: {
- command: 'knex-migrator health'
}
},
@@ -715,7 +711,7 @@ var config = require('./core/server/config'),
// `grunt master` [`upstream` is the default upstream to pull from]
// `grunt master --upstream=parent`
grunt.registerTask('master', 'Update your current working folder to latest master.',
- ['shell:master', 'subgrunt:init', 'shell:dbhealth']
+ ['shell:master', 'subgrunt:init']
);
// ### Release
|
Removed `shell:dbhealth` from `grunt master`
no issue
- since Ghost <I>, the Ghost server takes care of executing `knex-migrator migrate` if needed
|
diff --git a/test/unit/deletion_test.rb b/test/unit/deletion_test.rb
index <HASH>..<HASH> 100644
--- a/test/unit/deletion_test.rb
+++ b/test/unit/deletion_test.rb
@@ -11,7 +11,7 @@ class DeletionTest < ActiveSupport::TestCase
@version = Version.last
end
- should "must be indexed" do
+ should "be indexed" do
@version.indexed = false
assert Deletion.new(version: @version, user: @user).invalid?,
"Deletion should only work on indexed gems"
|
use should 'be indexed' phrase instead of should 'must be indexed'
|
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
index <HASH>..<HASH> 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
* @author Andy Wilkinson
*/
-@ConfigurationProperties(prefix = "security", ignoreUnknownFields = false)
+@ConfigurationProperties(prefix = "security")
public class SecurityProperties implements SecurityPrerequisite {
/**
|
Remove ignoreUnknownFields accidentally added in <I>a<I>
|
diff --git a/aeron-system-tests/src/test/java/io/aeron/DriverNameResolverTest.java b/aeron-system-tests/src/test/java/io/aeron/DriverNameResolverTest.java
index <HASH>..<HASH> 100644
--- a/aeron-system-tests/src/test/java/io/aeron/DriverNameResolverTest.java
+++ b/aeron-system-tests/src/test/java/io/aeron/DriverNameResolverTest.java
@@ -238,7 +238,7 @@ public class DriverNameResolverTest
@SlowTest
@Test
- @Timeout(20)
+ @Timeout(30)
public void shouldTimeoutNeighborsAndCacheEntriesThatAreSeenViaGossip()
{
drivers.add(TestMediaDriver.launch(setDefaults(new MediaDriver.Context())
|
[Java] Increase timeout on shouldTimeoutNeighborsAndCacheEntriesThatAreSeenViaGossip test as occasionally a second timeout cycle within the name resolver is required to remove a neighbor.
|
diff --git a/pixiedust/display/templates/pd_executeDisplay.js b/pixiedust/display/templates/pd_executeDisplay.js
index <HASH>..<HASH> 100644
--- a/pixiedust/display/templates/pd_executeDisplay.js
+++ b/pixiedust/display/templates/pd_executeDisplay.js
@@ -112,7 +112,20 @@
}
var query = groups.join("&")
if (query){
- window.history.pushState("PixieApp", "", "?" + query);
+ var queryPos = window.location.href.indexOf("?");
+ newUrl = "?" + query;
+ if (queryPos > 0){
+ var existingQuery = window.location.href.substring(queryPos+1);
+ var args = existingQuery.split("&");
+ {#Keep only the token argument#}
+ for (i in args){
+ var parts = args[i].split("=");
+ if (parts.length > 1 && parts[0] == "token"){
+ newUrl += "&token=" + parts[1];
+ }
+ }
+ }
+ window.history.pushState("PixieApp", "", newUrl);
}
{%else%}
if (curCell){
|
Correctly handle token urls when state is pushed to the location
|
diff --git a/test.py b/test.py
index <HASH>..<HASH> 100644
--- a/test.py
+++ b/test.py
@@ -150,6 +150,27 @@ class TestRequestsPost(unittest.TestCase):
def test_cached_post_response_text(self):
self.assertEqual(self.unmolested_response.text, self.cached_response.text)
+class TestRequestsHTTPS(unittest.TestCase):
+ def setUp(self):
+ self.unmolested_response = requests.get('https://github.com')
+ with vcr.use_cassette(TEST_CASSETTE_FILE):
+ self.initial_response = requests.get('https://github.com')
+ self.cached_response = requests.get('https://github.com')
+
+ def tearDown(self):
+ try:
+ os.remove(TEST_CASSETTE_FILE)
+ except OSError:
+ pass
+
+ def test_initial_https_response_text(self):
+ self.assertEqual(self.unmolested_response.text, self.initial_response.text)
+
+ def test_cached_https_response_text(self):
+ self.assertEqual(self.unmolested_response.text, self.cached_response.text)
+
+
+
if __name__ == '__main__':
unittest.main()
|
Add failing test for HTTPS requests to shame me into fixing this bug
|
diff --git a/jquery.fullscreen.js b/jquery.fullscreen.js
index <HASH>..<HASH> 100644
--- a/jquery.fullscreen.js
+++ b/jquery.fullscreen.js
@@ -88,10 +88,7 @@ function fullScreen(state)
|| (/** @type {?Function} */ e["mozRequestFullScreen"]);
if (func)
{
- if (Element["ALLOW_KEYBOARD_INPUT"])
- func.call(e, Element["ALLOW_KEYBOARD_INPUT"]);
- else
- func.call(e);
+ func.call(e);
}
return this;
}
|
Stop using ALLOW_KEYBOARD_INPUT.
In Chrome it no longer makes a difference and in Safari it doesn't help
anyway (Fullscreen forms are always read-only). In older Safari the code
didn't work at all so I hope this is now better.
|
diff --git a/src/java/com/samskivert/swing/MultiLineLabel.java b/src/java/com/samskivert/swing/MultiLineLabel.java
index <HASH>..<HASH> 100644
--- a/src/java/com/samskivert/swing/MultiLineLabel.java
+++ b/src/java/com/samskivert/swing/MultiLineLabel.java
@@ -3,7 +3,7 @@
//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2007 Michael Bayne
-//
+//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
@@ -30,6 +30,8 @@ import javax.swing.JComponent;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
+import com.samskivert.swing.util.SwingUtil;
+
/**
* A Swing component that displays a {@link Label}.
*/
@@ -248,7 +250,14 @@ public class MultiLineLabel extends JComponent
}
// draw the label
+ Object oalias = null;
+ if (_antialiased) {
+ oalias = SwingUtil.activateAntiAliasing(gfx);
+ }
_label.render(gfx, dx, dy);
+ if (_antialiased) {
+ SwingUtil.restoreAntiAliasing(gfx, oalias);
+ }
}
// documentation inherited
|
It used to be that if you created a TextLayout with a font render context that
indicated the use of antialiasing, rendering that TextLayout would render with
antialiasing. However, it seems that some JVMs don't do that, so we need to
manually enable antialiasing before rendering the TextLayout. Such are the
millions of tiny inconsistencies that undermine write once run anywhere.
git-svn-id: <URL>
|
diff --git a/examples/FloatTest.php b/examples/FloatTest.php
index <HASH>..<HASH> 100644
--- a/examples/FloatTest.php
+++ b/examples/FloatTest.php
@@ -17,4 +17,17 @@ class FloatTest extends \PHPUnit_Framework_TestCase
);
});
}
+
+ public function testAPropertyHoldingOnlyForPositiveNumbers()
+ {
+ $this->forAll([
+ Generator\float(-10.0, 100.0),
+ ])
+ ->then(function($number) {
+ $this->assertTrue(
+ $number >= 0,
+ "$number is not a (loosely) positive number"
+ );
+ });
+ }
}
diff --git a/test/Eris/ExampleEnd2EndTest.php b/test/Eris/ExampleEnd2EndTest.php
index <HASH>..<HASH> 100644
--- a/test/Eris/ExampleEnd2EndTest.php
+++ b/test/Eris/ExampleEnd2EndTest.php
@@ -47,7 +47,7 @@ class ExampleEnd2EndTest extends \PHPUnit_Framework_TestCase
public function testFloatTests()
{
$this->runExample('FloatTest.php');
- $this->assertAllTestsArePassing();
+ $this->assertTestsAreFailing(1);
}
public function testSumTests()
|
Added a failing test to explore float shrinking
|
diff --git a/src/Message/PurchaseRequest.php b/src/Message/PurchaseRequest.php
index <HASH>..<HASH> 100644
--- a/src/Message/PurchaseRequest.php
+++ b/src/Message/PurchaseRequest.php
@@ -94,10 +94,10 @@ class PurchaseRequest extends AbstractRequest
public function getData()
{
$this->validate('amount', 'card');
- // FIXME -- this won't work if there is no card.
- $data['email'] = $this->getCard()->getEmail();
$data = array();
+ // FIXME -- this won't work if there is no card.
+ $data['email'] = $this->getCard()->getEmail();
$data['amount'] = $this->getAmountInteger();
$data['currency'] = strtolower($this->getCurrency());
$data['description'] = $this->getDescription();
|
Update PurchaseRequest.php
Create $data before setting email. Email was not being passed to gateway.
|
diff --git a/src/main/java/net/openhft/compiler/MyJavaFileManager.java b/src/main/java/net/openhft/compiler/MyJavaFileManager.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/openhft/compiler/MyJavaFileManager.java
+++ b/src/main/java/net/openhft/compiler/MyJavaFileManager.java
@@ -99,7 +99,7 @@ class MyJavaFileManager implements JavaFileManager {
return fileManager.isSameFile(a, b);
}
- public boolean handleOption(String current, Iterator<String> remaining) {
+ public synchronized boolean handleOption(String current, Iterator<String> remaining) {
return fileManager.handleOption(current, remaining);
}
|
Fixed ConcurrentModificationException when compiling lots of method readers under Java <I>, closes #<I> (#<I>)
|
diff --git a/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js b/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js
index <HASH>..<HASH> 100644
--- a/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js
+++ b/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js
@@ -1,5 +1,5 @@
// Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, shell } = require('electron')
+const { app, BrowserWindow, ipcMain, shell, dialog } = require('electron')
const path = require('path')
let mainWindow;
|
fix: dialog is not defined (#<I>)
Corrects the following error in Electron Fiddle:
```
Uncaught Exception:
ReferenceError: dialog is not defined
...
```
|
diff --git a/Socket/Client.php b/Socket/Client.php
index <HASH>..<HASH> 100644
--- a/Socket/Client.php
+++ b/Socket/Client.php
@@ -102,7 +102,7 @@ class sb_Socket_Client {
* @return boolean
*/
public function write($data) {
- $this->log('write to socket');
+
return fwrite($this->socket, $data);
}
@@ -140,7 +140,7 @@ class sb_Socket_Client {
/**
* Logs what is doing
- * @param <type> $message
+ * @param string $message
* @todo convert to sb_Logger
*/
protected function log($message) {
|
no longer writes WRITING TO SOCKET for every write
|
diff --git a/core/Columns/Updater.php b/core/Columns/Updater.php
index <HASH>..<HASH> 100644
--- a/core/Columns/Updater.php
+++ b/core/Columns/Updater.php
@@ -200,7 +200,7 @@ class Updater extends \Piwik\Updates
$component = $componentPrefix . $columnName;
$version = $dimension->getVersion();
- if (in_array($columnName, $columns)
+ if (array_key_exists($columnName, $columns)
&& false === PiwikUpdater::getCurrentRecordedComponentVersion($component)
&& self::wasDimensionMovedFromCoreToPlugin($component, $version)) {
PiwikUpdater::recordComponentSuccessfullyUpdated($component, $version);
|
we actually need to check whether key exists, not in_array...
|
diff --git a/src/streamcorpus_pipeline/_get_name_info.py b/src/streamcorpus_pipeline/_get_name_info.py
index <HASH>..<HASH> 100644
--- a/src/streamcorpus_pipeline/_get_name_info.py
+++ b/src/streamcorpus_pipeline/_get_name_info.py
@@ -29,8 +29,11 @@ def get_name_info(chunk_path, assert_one_date_hour=False, i_str=None):
date_hours = set()
target_names = set()
doc_ids = set()
+ epoch_ticks = None
count = 0
for si in ch:
+ if epoch_ticks is None:
+ epoch_ticks = si.stream_time.epoch_ticks
date_hours.add( si.stream_time.zulu_timestamp[:13] )
doc_ids.add( si.doc_id )
for annotator_id, ratings in si.ratings.items():
@@ -42,6 +45,7 @@ def get_name_info(chunk_path, assert_one_date_hour=False, i_str=None):
## create the md5 property, so we can use it in the filename
name_info['md5'] = ch.md5_hexdigest
name_info['num'] = count
+ name_info['epoch_ticks'] = epoch_ticks
name_info['target_names'] = '-'.join( target_names )
name_info['doc_ids_8'] = '-'.join( [di[:8] for di in doc_ids] )
|
Output filenames can include the epoch_ticks of the first stream item
|
diff --git a/pliers/filters/__init__.py b/pliers/filters/__init__.py
index <HASH>..<HASH> 100644
--- a/pliers/filters/__init__.py
+++ b/pliers/filters/__init__.py
@@ -1,6 +1,7 @@
from abc import ABCMeta, abstractmethod
from pliers.transformers import Transformer
from six import with_metaclass
+from pliers.utils import memory
__all__ = []
@@ -9,12 +10,20 @@ __all__ = []
class Filter(with_metaclass(ABCMeta, Transformer)):
''' Base class for Filters.'''
+ def __init__(self):
+ super(Filter, self).__init__()
+ self.filter = memory.cache(self.filter)
+
def filter(self, stim, *args, **kwargs):
- return self._filter(stim, *args, **kwargs)
+ new_stim = self._filter(stim, *args, **kwargs)
+ if not isinstance(new_stim, stim.__class__):
+ raise ValueError("Filter must return a Stim of the same type as "
+ "its input.")
+ return new_stim
@abstractmethod
def _filter(self, stim):
pass
def _transform(self, stim, *args, **kwargs):
- return self.filter(stim, *args, **kwargs)
\ No newline at end of file
+ return self.filter(stim, *args, **kwargs)
|
cache Filter results and ensure type matching
|
diff --git a/peewee.py b/peewee.py
index <HASH>..<HASH> 100644
--- a/peewee.py
+++ b/peewee.py
@@ -555,13 +555,13 @@ class ForeignKeyField(IntegerField):
class BaseModel(type):
def __new__(cls, name, bases, attrs):
cls = super(BaseModel, cls).__new__(cls, name, bases, attrs)
-
+
class Meta(object):
fields = {}
def __init__(self, model_class):
self.model_class = model_class
- self.database = database
+ self.database = self.model_class.database
def get_field_by_name(self, name):
if name in self.fields:
@@ -637,6 +637,7 @@ class BaseModel(type):
class Model(object):
__metaclass__ = BaseModel
+ database = database
def __init__(self, *args, **kwargs):
for k, v in kwargs.items():
|
Allow a db to be specified on the model
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.