diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/main/java/org/jboss/aerogear/unifiedpush/rest/security/AuthenticationEndpoint.java b/src/main/java/org/jboss/aerogear/unifiedpush/rest/security/AuthenticationEndpoint.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/aerogear/unifiedpush/rest/security/AuthenticationEndpoint.java
+++ b/src/main/java/org/jboss/aerogear/unifiedpush/rest/security/AuthenticationEndpoint.java
@@ -21,6 +21,7 @@ import org.jboss.aerogear.security.auth.AuthenticationManager;
import org.jboss.aerogear.security.authz.IdentityManagement;
import org.jboss.aerogear.security.exception.AeroGearSecurityException;
import org.jboss.aerogear.security.picketlink.auth.CredentialMatcher;
+import org.picketlink.idm.model.basic.Agent;
import org.picketlink.idm.model.basic.User;
import javax.ejb.Stateless;
@@ -39,7 +40,8 @@ import javax.ws.rs.core.Response.Status;
public class AuthenticationEndpoint {
@Inject
- private AuthenticationManager authenticationManager;
+ private AuthenticationManager<Agent> authenticationManager;
+
@Inject
private CredentialMatcher credential;
@Inject
|
Using Agent as parameterized type for the AuthenticationManager injection point
|
diff --git a/dock/plugins/pre_pyrpkg_fetch_artefacts.py b/dock/plugins/pre_pyrpkg_fetch_artefacts.py
index <HASH>..<HASH> 100644
--- a/dock/plugins/pre_pyrpkg_fetch_artefacts.py
+++ b/dock/plugins/pre_pyrpkg_fetch_artefacts.py
@@ -3,6 +3,7 @@ To have everything for a build in dist-git you need to fetch artefacts using 'fe
This plugin should do it.
"""
+import os
import subprocess
from dock.plugin import PreBuildPlugin
@@ -27,4 +28,14 @@ class DistgitFetchArtefactsPlugin(PreBuildPlugin):
"""
fetch artefacts
"""
+ sources_file_path = os.path.join(self.workflow.builder.git_path, 'sources')
+ try:
+ with open(sources_file_path, 'r') as f:
+ self.log.info('Sources file:\n', f.read())
+ except IOError as ex:
+ if ex.errno == 2:
+ self.log.info("no sources file")
+ else:
+ raise
+
subprocess.check_call([self.binary, "--path", self.workflow.builder.git_path, "sources"])
|
pyrpkg sources: print sources file before exec
|
diff --git a/productmd/__init__.py b/productmd/__init__.py
index <HASH>..<HASH> 100644
--- a/productmd/__init__.py
+++ b/productmd/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2015 Red Hat, Inc.
+#
+# 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 (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
+
+from .compose import Compose # noqa
+from .composeinfo import ComposeInfo # noqa
+from .discinfo import DiscInfo # noqa
+from .images import Images # noqa
+from .rpms import Rpms # noqa
+from .treeinfo import TreeInfo # noqa
|
Allow importing major classes directly from productmd
This should simplify things for most users: just import productmd module
and Compose (the one for metadata loading), Rpms and Images classes are
directly available as well as ComposeInfo, DiscInfo and TreeInfo.
|
diff --git a/ca/django_ca/tests/tests_utils.py b/ca/django_ca/tests/tests_utils.py
index <HASH>..<HASH> 100644
--- a/ca/django_ca/tests/tests_utils.py
+++ b/ca/django_ca/tests/tests_utils.py
@@ -345,7 +345,7 @@ class ParseKeyCurveTestCase(TestCase):
self.assertIsInstance(parse_key_curve(), type(ca_settings.CA_DEFAULT_ECC_CURVE))
self.assertIsInstance(parse_key_curve('SECT409R1'), ec.SECT409R1)
self.assertIsInstance(parse_key_curve('SECP521R1'), ec.SECP521R1)
- self.assertIsInstance(parse_key_curve('BrainpoolP256R1'), ec.BrainpoolP256R1)
+ self.assertIsInstance(parse_key_curve('SECP192R1'), ec.SECP192R1)
def test_error(self):
with self.assertRaisesRegex(ValueError, '^FOOBAR: Not a known Eliptic Curve$'):
|
do not use brainpool, it was added in <I>
|
diff --git a/Plugin/ExcludeFilesFromMinification.php b/Plugin/ExcludeFilesFromMinification.php
index <HASH>..<HASH> 100644
--- a/Plugin/ExcludeFilesFromMinification.php
+++ b/Plugin/ExcludeFilesFromMinification.php
@@ -31,15 +31,17 @@ class ExcludeFilesFromMinification
{
/**
* @param Minification $subject
- * @param array $result
+ * @param callable $proceed
* @param $contentType
* @return array
*/
- public function afterGetExcludes(Minification $subject, array $result, $contentType)
+ public function aroundGetExcludes(Minification $subject, callable $proceed, $contentType)
{
- if ($contentType == 'js' && $subject->isEnabled($contentType)) {
- $result[] = 'https://www.gstatic.com/charts/loader.js';
+ $result = $proceed($contentType);
+ if ($contentType != 'js' && !$subject->isEnabled($contentType)) {
+ return $result;
}
+ $result[] = 'https://www.gstatic.com/charts/loader.js';
return $result;
}
}
|
Changed ExcludeFilesFromMinification code to work with Magento versions < <I>
|
diff --git a/core/src/main/java/io/undertow/client/http2/Http2ClientConnection.java b/core/src/main/java/io/undertow/client/http2/Http2ClientConnection.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/io/undertow/client/http2/Http2ClientConnection.java
+++ b/core/src/main/java/io/undertow/client/http2/Http2ClientConnection.java
@@ -127,7 +127,7 @@ public class Http2ClientConnection implements ClientConnection {
}
@Override
- public void sendRequest(ClientRequest request, ClientCallback<ClientExchange> clientCallback) {
+ public synchronized void sendRequest(ClientRequest request, ClientCallback<ClientExchange> clientCallback) {
request.getRequestHeaders().put(METHOD, request.getMethod().toString());
boolean connectRequest = request.getMethod().equals(Methods.CONNECT);
if(!connectRequest) {
|
UNDERTOW-<I> Http2ClientConnection.sendRequest should be syncronized to make sure streams arrive in order
|
diff --git a/FsContext.php b/FsContext.php
index <HASH>..<HASH> 100644
--- a/FsContext.php
+++ b/FsContext.php
@@ -2,6 +2,7 @@
namespace Enqueue\Fs;
+use Doctrine\ORM\Cache\Lock;
use Interop\Queue\InvalidDestinationException;
use Interop\Queue\PsrContext;
use Interop\Queue\PsrDestination;
@@ -94,6 +95,11 @@ class FsContext implements PsrContext
InvalidDestinationException::assertDestinationInstanceOf($destination, FsDestination::class);
set_error_handler(function ($severity, $message, $file, $line) {
+ // do not throw on a deprecation notice.
+ if (E_USER_DEPRECATED === $severity && false !== strpos($message, LockHandler::class)) {
+ return;
+ }
+
throw new \ErrorException($message, 0, $severity, $file, $line);
});
|
[fs] Do not throw error on deprecation notice.
|
diff --git a/command/build_ext.py b/command/build_ext.py
index <HASH>..<HASH> 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -278,7 +278,9 @@ class build_ext (Command):
'extra_objects',
'extra_compile_args',
'extra_link_args'):
- setattr(ext, key, build_info.get(key))
+ val = build_info.get(key)
+ if val is not None:
+ setattr(ext, key, val)
# Medium-easy stuff: same syntax/semantics, different names.
ext.runtime_library_dirs = build_info.get('rpath')
|
In 'check_extensions_list()': when converting old-style 'buildinfo' dict,
don't assign None to any attributes of the Extension object.
|
diff --git a/Entity/CacheRepository.php b/Entity/CacheRepository.php
index <HASH>..<HASH> 100644
--- a/Entity/CacheRepository.php
+++ b/Entity/CacheRepository.php
@@ -149,6 +149,8 @@ class CacheRepository extends CommonRepository
$interval = new \DateInterval('P1M');
}
$oldest->sub($interval);
+ // Switch back to UTC for the format output.
+ $oldest->setTimezone(new \DateTimeZone('UTC'));
return $oldest->format('Y-m-d H:i:s');
}
|
Switch back to UTC for format output.
|
diff --git a/cmd/helm/doctor.go b/cmd/helm/doctor.go
index <HASH>..<HASH> 100644
--- a/cmd/helm/doctor.go
+++ b/cmd/helm/doctor.go
@@ -42,7 +42,7 @@ func doctor(c *cli.Context) error {
if client.IsInstalled(runner) {
format.Success("You have everything you need. Go forth my friend!")
} else {
- format.Warning("Looks like you don't have DM installed.\nRun: `helm install`")
+ format.Warning("Looks like you don't have DM installed.\nRun: `helm server install`")
}
return nil
diff --git a/pkg/kubectl/get.go b/pkg/kubectl/get.go
index <HASH>..<HASH> 100644
--- a/pkg/kubectl/get.go
+++ b/pkg/kubectl/get.go
@@ -34,7 +34,7 @@ func (r RealRunner) GetByKind(kind, name, ns string) (string, error) {
args := []string{"get", kind}
if name != "" {
- args = append([]string{name}, args...)
+ args = append(args, name)
}
if ns != "" {
|
fix(cli): fix 'helm doctor'
Rather than remove 'helm doctor' for MVP, I just fixed the one small bug
that was preventing it from working.
|
diff --git a/Kwf/Util/Maintenance/Dispatcher.php b/Kwf/Util/Maintenance/Dispatcher.php
index <HASH>..<HASH> 100644
--- a/Kwf/Util/Maintenance/Dispatcher.php
+++ b/Kwf/Util/Maintenance/Dispatcher.php
@@ -88,6 +88,7 @@ class Kwf_Util_Maintenance_Dispatcher
if (!$e instanceof Kwf_Exception_Abstract) $e = new Kwf_Exception_Other($e);
$e->logOrThrow();
}
+ Kwf_Events_ModelObserver::getInstance()->process();
}
$t = microtime(true)-$t;
if ($debug) echo "executed ".get_class($job)." in ".round($t, 3)."s\n";
|
Also call ModelObserver::process() after executing minutely/seconds maintenance jobs
|
diff --git a/publish.py b/publish.py
index <HASH>..<HASH> 100755
--- a/publish.py
+++ b/publish.py
@@ -49,7 +49,8 @@ def main():
# create the new tag
check_call(['git', 'tag', tag, '-m', 'Tagged {}'.format(tag)])
# build
- check_call(['python3', 'setup.py', 'sdist', 'bdist_wheel'])
+ check_call(['python3', 'setup.py', 'sdist'])
+ check_call(['python3', 'setup.py', 'bdist_wheel', '--universal'])
# upload
files = ['dist/homely-{}.tar.gz'.format(tag)]
files.extend(glob.glob('dist/homely-{}-py*.whl'.format(tag)))
|
[9] publish.py creates universal wheel for py2/3
|
diff --git a/test/serializer_test.rb b/test/serializer_test.rb
index <HASH>..<HASH> 100644
--- a/test/serializer_test.rb
+++ b/test/serializer_test.rb
@@ -49,8 +49,9 @@ class SerializerTest < Test::Unit::TestCase
assert_equal '302', encoded
end
- def test_encode_invalid_file
- encoded = Fewer::Serializer.encode(fs, ['doesnt-exist.css'])
+ def test_encode_invalid_files
+ encoded = Fewer::Serializer.encode(fs, %w(0 1 2 3 4 5 6 7 8 9 a b c d e f
+ g h i j k l m n o p q r s t u v w x y z 10))
assert_equal '', encoded
end
|
Modify test so that it actually requires the call to compact.
|
diff --git a/src/date-functions.js b/src/date-functions.js
index <HASH>..<HASH> 100644
--- a/src/date-functions.js
+++ b/src/date-functions.js
@@ -403,6 +403,7 @@ Date.patterns = {
ISO8601ShortPattern:"Y-m-d",
ShortDatePattern: "n/j/Y",
FiShortDatePattern: "j.n.Y",
+ FiWeekdayDatePattern: "D j.n.Y",
LongDatePattern: "l, F d, Y",
FullDateTimePattern: "l, F d, Y g:i:s A",
MonthDayPattern: "F d",
|
date pattern for weekdays and finnish date
|
diff --git a/client/src/index.js b/client/src/index.js
index <HASH>..<HASH> 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -188,7 +188,7 @@ function createFS(options) {
// Bail if we're already connected
if(sync.state !== sync.SYNC_DISCONNECTED &&
sync.state !== sync.ERROR) {
- // TODO: https://github.com/mozilla/makedrive/issues/117
+ console.error("MakeDrive: Attempted to connect to \"" + url + "\", but a connection already exists!");
return;
}
@@ -313,7 +313,7 @@ function createFS(options) {
// Bail if we're not already connected
if(sync.state === sync.SYNC_DISCONNECTED ||
sync.state === sync.ERROR) {
- // TODO: https://github.com/mozilla/makedrive/issues/117
+ console.error("MakeDrive: Attempted to disconnect, but no server connection exists!");
return;
}
|
Fixed #<I> - Error handling for disconnect/connect
MakeDrive.js silently errored if `sync.connect()` was called when already connected, or `sync.disconnect()` was called when no connection existed.
|
diff --git a/benchmark.js b/benchmark.js
index <HASH>..<HASH> 100644
--- a/benchmark.js
+++ b/benchmark.js
@@ -23,7 +23,7 @@ function timeit(top, callback) {
var fork = require('child_process').fork;
function bench(name, callback) {
- var cp = fork(__filename, ['baseline']);
+ var cp = fork(__filename, [name]);
cp.once('message', function (stat) {
console.log(name + ': ' + stat.mean.toFixed(4) + ' ± ' + (1.96 * stat.sd).toFixed(4) + ' ns/tick');
});
@@ -46,7 +46,7 @@ function timeit(top, callback) {
'trace': function () {
require('./trace.js');
- var top = 100000;
+ var top = 5000;
timeit(top, function (stat) {
process.send({ "mean": stat.mean(), "sd": stat.sd() });
});
|
[bench] finally got the benchmark working :p
|
diff --git a/qiskit/unroll/_dagunroller.py b/qiskit/unroll/_dagunroller.py
index <HASH>..<HASH> 100644
--- a/qiskit/unroll/_dagunroller.py
+++ b/qiskit/unroll/_dagunroller.py
@@ -78,11 +78,12 @@ class DagUnroller(object):
gatedefs.append(Gate(children))
# Walk through the DAG and examine each node
builtins = ["U", "CX", "measure", "reset", "barrier"]
+ simulator_builtins = ['snapshot', 'save', 'load', 'noise']
topological_sorted_list = list(nx.topological_sort(self.dag_circuit.multi_graph))
for node in topological_sorted_list:
current_node = self.dag_circuit.multi_graph.node[node]
if current_node["type"] == "op" and \
- current_node["name"] not in builtins + basis and \
+ current_node["name"] not in builtins + basis + simulator_builtins and \
not self.dag_circuit.gates[current_node["name"]]["opaque"]:
subcircuit, wires = self._build_subcircuit(gatedefs,
basis,
|
Handle simulator builtins in dag unroller (#<I>)
This commit fixes an issue in the dag unroller when it encounters
simulator builtin instructions like snapshot(). It doesn't know what
those are so it assumes it's a gate. But since it's not a gate when it
tries to look that up it fails on a KeyError. This fixes that by having
a list of simulator builtins to check against and treats those like
other builtins (barrier, reset, etc).
Fixes #<I>
|
diff --git a/src/interactivity/Interactivity.js b/src/interactivity/Interactivity.js
index <HASH>..<HASH> 100644
--- a/src/interactivity/Interactivity.js
+++ b/src/interactivity/Interactivity.js
@@ -154,23 +154,16 @@ export default class Interactivity {
_subscribeToMapEvents (map) {
map.on('mousemove', this._onMouseMove.bind(this));
map.on('click', this._onClick.bind(this));
- this._disableDuringMapEvents(map);
+ this._disableWhileMovingMap(map);
}
- _disableDuringMapEvents (map) {
- const disableEvents = ['movestart'];
- const enableEvents = ['moveend'];
-
- disableEvents.forEach((eventName) => {
- map.on(eventName, () => {
- this.disable();
- });
+ _disableWhileMovingMap (map) {
+ map.on('movestart', () => {
+ this.disable();
});
- enableEvents.forEach((eventName) => {
- map.on(eventName, () => {
- this.enable();
- });
+ map.on('moveend', () => {
+ this.enable();
});
}
|
Refactor to simplify automatic enable & disable in Interactivity
|
diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
index <HASH>..<HASH> 100644
--- a/docs/gatsby-config.js
+++ b/docs/gatsby-config.js
@@ -30,7 +30,8 @@ module.exports = {
root: __dirname,
subtitle: 'SDK Resources',
description: 'Documentation for Resources',
- gitRepo: 'availity/sdk-js',
+ gitRepo: 'github.com/availity/sdk-js',
+ gitType: 'github',
contentDir: 'docs/source',
sidebarCategories: {
null: ['index', 'contributing'],
|
fix: edit on github button working now
|
diff --git a/gxa/src/main/webapp/resources/js/geneQueryTagEditorModule.js b/gxa/src/main/webapp/resources/js/geneQueryTagEditorModule.js
index <HASH>..<HASH> 100644
--- a/gxa/src/main/webapp/resources/js/geneQueryTagEditorModule.js
+++ b/gxa/src/main/webapp/resources/js/geneQueryTagEditorModule.js
@@ -2,6 +2,10 @@
var geneQueryTagEditorModule = (function($) {
+ function sanitize(str) {
+ return $('<span>' + str + '</span>').text();
+ }
+
function initAutocomplete(element, species, onChange, placeholderText, contextPath) {
$(element)
// TODO paste items
@@ -61,7 +65,7 @@ var geneQueryTagEditorModule = (function($) {
.appendTo(ul);
},
select: function(event, ui) {
- ui.item.value = '{"value":"' + ui.item.value + '", "category":"' + ui.item.category + '"}';
+ ui.item.value = '{"value":"' + sanitize(ui.item.value) + '", "category":"' + ui.item.category + '"}';
}
},
onChange: onChange,
|
Remove any markup from the selected tag text
The new Solr suggester highlights the matched substrings with <b>
|
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index <HASH>..<HASH> 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -153,7 +153,7 @@ class ElementPlot(BokehPlot, GenericElementPlot):
return plot
- def _update_plot(self, key, element, plot):
+ def _update_plot(self, key, plot, element=None):
"""
Updates plot parameters on every frame
"""
@@ -234,7 +234,7 @@ class ElementPlot(BokehPlot, GenericElementPlot):
self.handles['source'] = source
self._init_glyph(element, plot, source, ranges)
if not self.overlaid:
- self._update_plot(key, element, plot)
+ self._update_plot(key, plot, element)
self._process_legend()
self.drawn = True
@@ -254,7 +254,7 @@ class ElementPlot(BokehPlot, GenericElementPlot):
source = self.handles['source']
self._update_datasource(source, element, ranges)
if not self.overlaid:
- self._update_plot(key, element, plot)
+ self._update_plot(key, plot, element)
class BokehMPLWrapper(ElementPlot):
|
Updated signature of _update_plot to show element is not always used
|
diff --git a/jodd-http/src/main/java/jodd/http/HttpBrowser.java b/jodd-http/src/main/java/jodd/http/HttpBrowser.java
index <HASH>..<HASH> 100644
--- a/jodd-http/src/main/java/jodd/http/HttpBrowser.java
+++ b/jodd-http/src/main/java/jodd/http/HttpBrowser.java
@@ -176,7 +176,6 @@ public class HttpBrowser {
if (newCookies != null) {
for (String cookieValue : newCookies) {
Cookie cookie = new Cookie(cookieValue);
-
cookies.put(cookie.getName(), cookie);
}
}
@@ -193,6 +192,12 @@ public class HttpBrowser {
if (!cookies.isEmpty()) {
for (Cookie cookie: cookies.values()) {
+
+ Integer maxAge = cookie.getMaxAge();
+ if (maxAge != null && maxAge.intValue() == 0) {
+ continue;
+ }
+
if (!first) {
cookieString.append("; ");
}
@@ -205,4 +210,4 @@ public class HttpBrowser {
httpRequest.header("cookie", cookieString.toString(), true);
}
}
-}
\ No newline at end of file
+}
|
- don't add cookies to the header that have been deleted
|
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -107,11 +107,18 @@ if(config.tls){
}
restify.CORS.ALLOW_HEADERS.push('authorization');
+restify.CORS.ALLOW_HEADERS.push('accept');
+restify.CORS.ALLOW_HEADERS.push('sid');
+restify.CORS.ALLOW_HEADERS.push('lang');
+restify.CORS.ALLOW_HEADERS.push('origin');
+restify.CORS.ALLOW_HEADERS.push('withcredentials');
+restify.CORS.ALLOW_HEADERS.push('x-requested-with');
server.use(restify.acceptParser(server.acceptable));
server.use(restify.queryParser());
server.use(restify.bodyParser());
server.use(restify.CORS());
+server.use(restify.fullResponse());
// Add throttling to HTTP API requests
// server.use(restify.throttle({
|
added more CORS logic to support mobile app
|
diff --git a/test/test_master_slave_connection.py b/test/test_master_slave_connection.py
index <HASH>..<HASH> 100644
--- a/test/test_master_slave_connection.py
+++ b/test/test_master_slave_connection.py
@@ -182,11 +182,11 @@ class TestMasterSlaveConnection(unittest.TestCase):
self.assert_("pymongo_test_mike" in dbs)
def test_drop_database(self):
- raise SkipTest("This test often fails due to SERVER-2329")
-
self.assertRaises(TypeError, self.connection.drop_database, 5)
self.assertRaises(TypeError, self.connection.drop_database, None)
+ raise SkipTest("This test often fails due to SERVER-2329")
+
self.connection.pymongo_test.test.save({"dummy": u"object"}, safe=True)
dbs = self.connection.database_names()
self.assert_("pymongo_test" in dbs)
|
Restore two useful asserts before skipping a test that fails due to SERVER-<I>
|
diff --git a/lang/en_utf8/xmldb.php b/lang/en_utf8/xmldb.php
index <HASH>..<HASH> 100644
--- a/lang/en_utf8/xmldb.php
+++ b/lang/en_utf8/xmldb.php
@@ -76,6 +76,7 @@ $string['missingvaluesinsentence'] = 'Missing values in sentence';
$string['mustselectonefield'] = 'You must select one field to see field related actions!';
$string['mustselectoneindex'] = 'You must select one index to see index related actions!';
$string['mustselectonekey'] = 'You must select one key to see key related actions!';
+$string['mysqlextracheckbigints'] = 'Under MySQL it also looks for incorrectly signed bigints, generating the required SQL to be executed in order to fix all them.';
$string['new_statement'] = 'New Statement';
$string['new_table_from_mysql'] = 'New Table From MySQL';
$string['newfield'] = 'New Field';
|
Added one new string to explain the signed ints hunting under MySQL. MDL-<I>
|
diff --git a/ufork/ufork.py b/ufork/ufork.py
index <HASH>..<HASH> 100644
--- a/ufork/ufork.py
+++ b/ufork/ufork.py
@@ -166,7 +166,7 @@ class Arbiter(object):
log.info('shutting down arbiter '+repr(self)+\
repr(threading.current_thread())+"N:{0} t:{1}".format(os.getpid(),time.time()%1))
if self.parent_pre_stop:
- self.parent_pre_stop()
+ self.parent_pre_stop() #hope this doesn't error
#give workers the opportunity to shut down cleanly
for worker in workers:
worker.parent_notify_stop()
@@ -259,14 +259,11 @@ else:
sock.listen(128) #TODO: what value?
server = gevent.pywsgi.WSGIServer(sock, wsgi)
server.stop_timeout = stop_timeout
- arbiter = Arbiter(post_fork=server.start, child_pre_exit=server.stop, sleep=gevent.sleep)
- try:
- arbiter.run()
- finally: #TODO: clean shutdown should be 1- stop listening, 2- close socket when accept queue is clear
- try:
- sock.close()
- except socket.error:
- pass #TODO: log it?
+ def close_socket():
+ sock.close()
+ arbiter = Arbiter(post_fork=server.start, child_pre_exit=server.stop,
+ parent_pre_stop=close_socket, sleep=gevent.sleep)
+ arbiter.run()
def serve_wsgiref_thread(wsgi, host, port):
|
migrating gevent function to use parent_pre_exit to shutdown socket
|
diff --git a/searx/utils.py b/searx/utils.py
index <HASH>..<HASH> 100644
--- a/searx/utils.py
+++ b/searx/utils.py
@@ -17,17 +17,16 @@ from searx import logger
logger = logger.getChild('utils')
-ua_versions = ('31.0',
- '32.0',
- '33.0',
+ua_versions = ('33.0',
'34.0',
- '35.0')
+ '35.0',
+ '36.0',
+ '37.0')
ua_os = ('Windows NT 6.3; WOW64',
'X11; Linux x86_64',
'X11; Linux x86')
-
-ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}"
+ua = "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}"
blocked_tags = ('script',
'style')
|
[fix] user agent : the "rv:{version}" was missing (can be a issue with some engine, like flickr)
|
diff --git a/vault/generate_root.go b/vault/generate_root.go
index <HASH>..<HASH> 100644
--- a/vault/generate_root.go
+++ b/vault/generate_root.go
@@ -191,7 +191,7 @@ func (c *Core) GenerateRootUpdate(key []byte, nonce string) (*GenerateRootResult
// Check if we already have this piece
for _, existing := range c.generateRootProgress {
if bytes.Equal(existing, key) {
- return nil, nil
+ return nil, fmt.Errorf("given key has already been provided during this generation operation")
}
}
|
Return bad request error on providing same key for root generation (#<I>)
Fixes #<I>
|
diff --git a/config/dashboard-plugins/MelisCoreDashboardRecentUserActivityPlugin.config.php b/config/dashboard-plugins/MelisCoreDashboardRecentUserActivityPlugin.config.php
index <HASH>..<HASH> 100644
--- a/config/dashboard-plugins/MelisCoreDashboardRecentUserActivityPlugin.config.php
+++ b/config/dashboard-plugins/MelisCoreDashboardRecentUserActivityPlugin.config.php
@@ -29,7 +29,7 @@
'module' => 'MelisCore',
'controller' => 'Dashboard',
'action' => 'recentActivityUsers',
- 'jscallback' => 'console.log("test");',
+ 'jscallback' => '',
'jsdatas' => array()
),
),
|
Dashboard plugin user recent active test function on jscallback removed
|
diff --git a/h2o-core/src/main/java/water/util/Log.java b/h2o-core/src/main/java/water/util/Log.java
index <HASH>..<HASH> 100644
--- a/h2o-core/src/main/java/water/util/Log.java
+++ b/h2o-core/src/main/java/water/util/Log.java
@@ -293,5 +293,14 @@ abstract public class Log {
if( strb.length() < size ) strb.append(' ');
return strb.toString();
}
-
+
+ public static void ignore(Throwable e) {
+ ignore(e,"[h2o] Problem ignored: ");
+ }
+ public static void ignore(Throwable e, String msg) {
+ ignore(e, msg, true);
+ }
+ public static void ignore(Throwable e, String msg, boolean printException) {
+ debug(msg + (printException? e.toString() : ""));
+ }
}
|
Tiny log functions marking ignored exceptions.
Useful for retry-logic inside HDFS/S3 persist API.
|
diff --git a/esda/getisord.py b/esda/getisord.py
index <HASH>..<HASH> 100644
--- a/esda/getisord.py
+++ b/esda/getisord.py
@@ -4,7 +4,7 @@ Getis and Ord G statistic for spatial autocorrelation
__author__ = "Sergio J. Rey <srey@asu.edu>, Myunghwa Hwang <mhwang4@gmail.com> "
__all__ = ['G', 'G_Local']
-from libpysal.common import np, stats, math
+from libpysal.common import np, stats
from libpysal.weights.spatial_lag import lag_spatial as slag
from .tabular import _univariate_handler
@@ -106,7 +106,7 @@ class G(object):
y = y.reshape(len(y), 1) # Ensure that y is an n by 1 vector, otherwise y*y.T == y*y
self.den_sum = (y * y.T).sum() - (y * y).sum()
self.G = self.__calc(self.y)
- self.z_norm = (self.G - self.EG) / math.sqrt(self.VG)
+ self.z_norm = (self.G - self.EG) / np.sqrt(self.VG)
self.p_norm = 1.0 - stats.norm.cdf(np.abs(self.z_norm))
if permutations:
|
remove math and swap to numpy
|
diff --git a/cmd/auth.go b/cmd/auth.go
index <HASH>..<HASH> 100644
--- a/cmd/auth.go
+++ b/cmd/auth.go
@@ -241,15 +241,14 @@ func (c *teamCreate) Run(context *Context, client *Client) error {
return nil
}
-type teamRemove struct{}
+type teamRemove struct {
+ ConfirmationCommand
+}
func (c *teamRemove) Run(context *Context, client *Client) error {
team := context.Args[0]
- var answer string
- fmt.Fprintf(context.Stdout, `Are you sure you want to remove team "%s"? (y/n) `, team)
- fmt.Fscanf(context.Stdin, "%s", &answer)
- if answer != "y" {
- fmt.Fprintln(context.Stdout, "Abort.")
+ question := fmt.Sprintf("Are you sure you want to remove team %q?", team)
+ if !c.Confirm(context, question) {
return nil
}
url, err := GetURL(fmt.Sprintf("/teams/%s", team))
|
cmd: use ConfirmationCommand in teamRemove
|
diff --git a/commons/src/main/java/com/composum/sling/core/logging/MessageContainer.java b/commons/src/main/java/com/composum/sling/core/logging/MessageContainer.java
index <HASH>..<HASH> 100644
--- a/commons/src/main/java/com/composum/sling/core/logging/MessageContainer.java
+++ b/commons/src/main/java/com/composum/sling/core/logging/MessageContainer.java
@@ -101,12 +101,21 @@ public class MessageContainer implements Iterable<Message> {
/**
* Adds a message to the container, and logs it into the logger if one was specified for this container.
+ * Like in SLF4J, if the last argument is a Throwable we use it for logging with {@link #add(Message, Throwable)}.
*
* @return this MessageContainer, for builder-style operation chaining.
*/
@Nonnull
public MessageContainer add(@Nullable Message message) {
- return add(message, null);
+ Throwable throwable = null;
+ List<Object> args = message.getArguments();
+ if (args != null && !args.isEmpty()) {
+ Object lastarg = args.get(args.size() - 1);
+ if (lastarg instanceof Throwable) {
+ throwable = (Throwable) lastarg;
+ }
+ }
+ return add(message, throwable);
}
/**
|
Status: ensure that throwable given to error as last argument is logged with stacktrace
|
diff --git a/osmnx/stats.py b/osmnx/stats.py
index <HASH>..<HASH> 100644
--- a/osmnx/stats.py
+++ b/osmnx/stats.py
@@ -418,8 +418,9 @@ def extended_stats(G, connectivity=False, anc=False, ecc=False, bc=False, cc=Fal
if bc:
# betweenness centrality of a node is the sum of the fraction of
# all-pairs shortest paths that pass through node
+ # networkx 2.4+ implementation cannot run on Multi(Di)Graphs, so use DiGraph
start_time = time.time()
- betweenness_centrality = nx.betweenness_centrality(G, weight='length')
+ betweenness_centrality = nx.betweenness_centrality(G_dir, weight='length')
stats['betweenness_centrality'] = betweenness_centrality
stats['betweenness_centrality_avg'] = sum(betweenness_centrality.values())/len(betweenness_centrality)
log('Calculated betweenness centrality in {:,.2f} seconds'.format(time.time() - start_time))
|
convert to DiGraph for betweenness centrality calculation
|
diff --git a/warren/main.py b/warren/main.py
index <HASH>..<HASH> 100644
--- a/warren/main.py
+++ b/warren/main.py
@@ -72,9 +72,6 @@ class RabbitMQCtl(object):
local_node = self._trim_quotes(match.group(1))
else:
raise Exception('Unexpected header line: {0!r}'.format(output[0]))
- match = re.match('^...done', output[-1])
- if not match:
- raise Exception('Unexpected footer line: {0!r}'.format(output[-1]))
cluster_info = ''.join(output[1:-1])
match = re.search(r'{nodes,\[((?:{.*?\[.*?\]},?)+)\]}', cluster_info)
if not match:
|
Remove unnecessary get_cluster_status lines
These lines do not exist in newer version of rabbitmq-server and aren't
necessary for the function to execute safely.
|
diff --git a/src/Offer/OfferIdentifierCollection.php b/src/Offer/OfferIdentifierCollection.php
index <HASH>..<HASH> 100644
--- a/src/Offer/OfferIdentifierCollection.php
+++ b/src/Offer/OfferIdentifierCollection.php
@@ -5,6 +5,7 @@ namespace CultuurNet\UDB3\Offer;
use TwoDotsTwice\Collection\AbstractCollection;
/**
+ * @method OfferIdentifierCollection with($item)
* @method OfferIdentifierInterface[] toArray()
*/
class OfferIdentifierCollection extends AbstractCollection
|
III-<I>: Docblock for better type hinting.
|
diff --git a/Controller/ConnectController.php b/Controller/ConnectController.php
index <HASH>..<HASH> 100644
--- a/Controller/ConnectController.php
+++ b/Controller/ConnectController.php
@@ -271,7 +271,8 @@ class ConnectController extends Controller
}
}
- return $this->redirect($authorizationUrl);
+ $this->redirect($authorizationUrl)->sendHeaders();
+ return new RedirectResponse($authorizationUrl);
}
/**
|
redirectToServiceAction is not redirecting (SF2 <I>)
redirectToServiceAction is not redirect, in order to work I have done this change.
|
diff --git a/actionview/lib/action_view/testing/resolvers.rb b/actionview/lib/action_view/testing/resolvers.rb
index <HASH>..<HASH> 100644
--- a/actionview/lib/action_view/testing/resolvers.rb
+++ b/actionview/lib/action_view/testing/resolvers.rb
@@ -36,10 +36,11 @@ module ActionView #:nodoc:
end
end
- class NullResolver < PathResolver
- def query(path, exts, _, locals, cache:)
- handler, format, variant = extract_handler_and_format_and_variant(path)
- [ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: format, variant: variant, locals: locals)]
+ class NullResolver < Resolver
+ def find_templates(name, prefix, partial, details, locals = [])
+ path = Path.build(name, prefix, partial)
+ handler = ActionView::Template::Handlers::Raw
+ [ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: nil, variant: nil, locals: locals)]
end
end
end
|
Reimplement NullResolver on base resolver
|
diff --git a/lib/opal/lexer.rb b/lib/opal/lexer.rb
index <HASH>..<HASH> 100644
--- a/lib/opal/lexer.rb
+++ b/lib/opal/lexer.rb
@@ -1371,6 +1371,7 @@ module Opal
return :SUPER, matched
when 'then'
+ @lex_state = :expr_beg
return :THEN, matched
when 'while'
|
Fix lex_state after 'then' keyword
|
diff --git a/ghost/admin/components/gh-navitem-url-input.js b/ghost/admin/components/gh-navitem-url-input.js
index <HASH>..<HASH> 100644
--- a/ghost/admin/components/gh-navitem-url-input.js
+++ b/ghost/admin/components/gh-navitem-url-input.js
@@ -27,13 +27,13 @@ var NavItemUrlInputComponent = Ember.TextField.extend({
var url = this.get('url'),
baseUrl = this.get('baseUrl');
+ this.set('value', url);
+
// if we have a relative url, create the absolute url to be displayed in the input
if (this.get('isRelative')) {
url = joinUrlParts(baseUrl, url);
+ this.set('value', url);
}
-
- this.set('value', url);
- this.sendAction('change', this.get('value'));
},
focusIn: function (event) {
|
Set 'value' property before a dependent CP is used
No issue.
- Make sure value property has been set before computed
property isRelative is referenced.
|
diff --git a/salt/cloud/clouds/gce.py b/salt/cloud/clouds/gce.py
index <HASH>..<HASH> 100644
--- a/salt/cloud/clouds/gce.py
+++ b/salt/cloud/clouds/gce.py
@@ -445,6 +445,15 @@ def __get_network(conn, vm_):
default='default', search_global=False)
return conn.ex_get_network(network)
+def __get_subnetwork(vm_):
+ '''
+ Get configured subnetwork.
+ '''
+ ex_subnetwork = config.get_cloud_config_value(
+ 'subnetwork', vm_, __opts__,
+ default='default', search_global=False)
+
+ return ex_subnetwork
def __get_ssh_interface(vm_):
'''
@@ -2226,6 +2235,7 @@ def request_instance(vm_):
'image': __get_image(conn, vm_),
'location': __get_location(conn, vm_),
'ex_network': __get_network(conn, vm_),
+ 'ex_subnetwork': __get_subnetwork(vm_),
'ex_tags': __get_tags(vm_),
'ex_metadata': __get_metadata(vm_),
}
|
bugfix adding subnetwork option to gce
Previously when deploying to custom networks salt-cloud would fail with the error described in #<I>
Now it is possible to specify a subnetwork in the profile, to deploy to a custom network and a specific subnet in that network.
|
diff --git a/test/test_helper.js b/test/test_helper.js
index <HASH>..<HASH> 100644
--- a/test/test_helper.js
+++ b/test/test_helper.js
@@ -206,6 +206,10 @@ if (process.env.GLOBAL_CLIENT !== 'false') {
before(() => client.connect()
.then(() => serverInfoHelper.fetch_info())
.then(() => serverInfoHelper.fetch_namespace_config(options.namespace))
+ .catch(error => {
+ console.error(error)
+ throw error
+ })
)
}
|
Print full connection error if test is unable to connect
|
diff --git a/templates/module/modularity-mod-slider.php b/templates/module/modularity-mod-slider.php
index <HASH>..<HASH> 100644
--- a/templates/module/modularity-mod-slider.php
+++ b/templates/module/modularity-mod-slider.php
@@ -28,7 +28,7 @@
</div>
<?php elseif ($slide['acf_fc_layout'] == 'video' && $slide['type'] == 'embed') : ?>
- <?php echo \Modularity\Module\Slider\Slider::getEmbed($slide['embed_link'], ['player','ratio-16-9'], $image); ?>
+ <?php echo \Modularity\Module\Slider\Slider::getEmbed($slide['embed_link'], ['player'], $image); ?>
<?php elseif ($slide['acf_fc_layout'] == 'video' && $slide['type'] == 'upload') : ?>
<div class="slider-video" style="background-image:url('<?php echo ($image !== false ) ? $image[0] : ''; ?>');">
|
REmoved <I>:9 class. Better to default to cropped view.
|
diff --git a/aeron-cluster/src/test/java/io/aeron/cluster/SingleNodeTest.java b/aeron-cluster/src/test/java/io/aeron/cluster/SingleNodeTest.java
index <HASH>..<HASH> 100644
--- a/aeron-cluster/src/test/java/io/aeron/cluster/SingleNodeTest.java
+++ b/aeron-cluster/src/test/java/io/aeron/cluster/SingleNodeTest.java
@@ -46,7 +46,7 @@ public class SingleNodeTest
@Ignore
public void shouldBeAbleToLoadUpFromPreviousLog()
{
- final int count = 110_000;
+ final int count = 150_000;
final int length = 100;
ConsensusModuleHarness.makeRecordingLog(count, length, null, null, new ConsensusModule.Context());
|
[Java] Put back failing value.
|
diff --git a/Module.php b/Module.php
index <HASH>..<HASH> 100644
--- a/Module.php
+++ b/Module.php
@@ -39,7 +39,7 @@ class Module
public function getConfig()
{
- defined('APPLICTION_PATH') or define('APPLICATION_PATH', realpath(dirname('./')));
+ defined('APPLICATION_PATH') or define('APPLICATION_PATH', realpath(dirname('./')));
return include __DIR__ . '/config/module.config.php';
}
|
fixed typo in module check for APPLICATION_PATH
|
diff --git a/lib/ood_core/job/adapters/pbspro.rb b/lib/ood_core/job/adapters/pbspro.rb
index <HASH>..<HASH> 100644
--- a/lib/ood_core/job/adapters/pbspro.rb
+++ b/lib/ood_core/job/adapters/pbspro.rb
@@ -310,10 +310,6 @@ module OodCore
end
end
- def supports_job_arrays?
- false
- end
-
# Retrieve job info from the resource manager
# @param id [#to_s] the id of the job
# @raise [JobAdapterError] if something goes wrong getting job info
|
Remove the override for supports_job_arrays?
|
diff --git a/Resources/public/js/apps/ez-editorialapp.js b/Resources/public/js/apps/ez-editorialapp.js
index <HASH>..<HASH> 100644
--- a/Resources/public/js/apps/ez-editorialapp.js
+++ b/Resources/public/js/apps/ez-editorialapp.js
@@ -145,6 +145,7 @@ YUI.add('ez-editorialapp', function (Y) {
container.addClass(APP_OPEN);
viewContainer.setStyle('height', container.get('docHeight') + 'px');
+ this.showView('dummyView');
if ( L.isFunction(next) ) {
next();
}
|
Fixed: made the first view transition a bit smoother
|
diff --git a/src/validators/numeric.js b/src/validators/numeric.js
index <HASH>..<HASH> 100644
--- a/src/validators/numeric.js
+++ b/src/validators/numeric.js
@@ -1,8 +1,6 @@
-const numericRegex = /^[-+]?[0-9]+$/;
-
const validate = val => {
if (val) {
- return numericRegex.test(val);
+ return !isNaN(Number(val));
}
return true;
|
Cast to number and check if the result isNaN or not
|
diff --git a/tests/sanity_tests.py b/tests/sanity_tests.py
index <HASH>..<HASH> 100644
--- a/tests/sanity_tests.py
+++ b/tests/sanity_tests.py
@@ -1 +1,4 @@
-from appengine_fixture_loader.loader import *
+#from appengine_fixture_loader.loader import load_fixture
+
+# TODO: We need a way to test it without relying on Google App Engine SDK being
+# installed on this envidonment
|
There has to be a better way. Mock, perhaps?
|
diff --git a/utilities/src/main/java/org/craftercms/commons/http/HttpUtils.java b/utilities/src/main/java/org/craftercms/commons/http/HttpUtils.java
index <HASH>..<HASH> 100644
--- a/utilities/src/main/java/org/craftercms/commons/http/HttpUtils.java
+++ b/utilities/src/main/java/org/craftercms/commons/http/HttpUtils.java
@@ -268,7 +268,7 @@ public class HttpUtils {
return getQueryStringFromParams(queryParams, "UTF-8", encodeValues);
} catch (UnsupportedEncodingException e) {
// Should NEVER happen
- throw new RuntimeException(e);
+ throw new IllegalStateException("UTF-8 should always be supported by the JVM", e);
}
}
|
Code style fix:
* Fixed issue with raw type being thrown: now an IllegalStateException is thrown instead of a raw RuntimeException.
|
diff --git a/src/analyse/callback/analyse/Objects.php b/src/analyse/callback/analyse/Objects.php
index <HASH>..<HASH> 100644
--- a/src/analyse/callback/analyse/Objects.php
+++ b/src/analyse/callback/analyse/Objects.php
@@ -323,6 +323,7 @@ class Objects extends AbstractCallback
// We've got a required parameter!
// We will not call this one.
$foundRequired = true;
+ break;
}
}
unset($ref);
|
Optimized the calling of configured debug methods.
|
diff --git a/text/bayes_test.go b/text/bayes_test.go
index <HASH>..<HASH> 100644
--- a/text/bayes_test.go
+++ b/text/bayes_test.go
@@ -253,19 +253,15 @@ func TestConcurrentPredictionAndLearningShouldNotFail(t *testing.T) {
wg.Add(1)
go func() {
defer wg.Done()
- // fmt.Println("beginning predicting")
for i := 0; i < 500; i++ {
model.Predict(strings.Repeat("some stuff that might be in the training data like iterate", 25))
}
- // fmt.Println("done predicting")
}()
wg.Add(1)
go func() {
defer wg.Done()
- // fmt.Println("beginning learning")
model.OnlineLearn(errors)
- // fmt.Println("done learning")
}()
go func() {
|
Remove fmt.printf from Naive Bayes test
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,12 +13,10 @@
import sys, os
-# import sphinx_rtd_theme
-
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../'))
# -- General configuration -----------------------------------------------------
@@ -98,8 +96,6 @@ pygments_style = 'sphinx'
# html_theme = "sphinx_rtd_theme"
-# html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
|
Trying to make docs work correctly
|
diff --git a/src/xterm.js b/src/xterm.js
index <HASH>..<HASH> 100644
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -1915,6 +1915,10 @@ Terminal.prototype.resize = function(x, y) {
return;
}
+ if (y > this.getOption('scrollback')) {
+ this.setOption('scrollback', y)
+ }
+
var line
, el
, i
|
Set minimum scrollback value to number of rows if needed on resize
|
diff --git a/addon/services/notification.js b/addon/services/notification.js
index <HASH>..<HASH> 100644
--- a/addon/services/notification.js
+++ b/addon/services/notification.js
@@ -15,7 +15,9 @@ function notification(status) {
export default class NotificationService extends Service {
_notification(message, options) {
const n = UIkit.notification(
- Object.assign(config["ember-uikit"]?.notification, options, { message })
+ Object.assign(config["ember-uikit"]?.notification ?? {}, options, {
+ message,
+ })
);
return n?.$el
|
fix(notification): fix notification options if app doesn't configure anything
|
diff --git a/shoebot/gui/gtk_drawingarea.py b/shoebot/gui/gtk_drawingarea.py
index <HASH>..<HASH> 100644
--- a/shoebot/gui/gtk_drawingarea.py
+++ b/shoebot/gui/gtk_drawingarea.py
@@ -48,9 +48,7 @@ class ShoebotDrawingArea(gtk.DrawingArea):
self.is_dynamic = True
if self.is_dynamic:
- print self.bot.WIDTH, self.bot.HEIGHT
self.bot.run()
- print self.bot.WIDTH, self.bot.HEIGHT
if 'setup' in self.bot.namespace:
self.bot.namespace['setup']()
|
Removed extraneous print statements from debugging
|
diff --git a/lint.py b/lint.py
index <HASH>..<HASH> 100644
--- a/lint.py
+++ b/lint.py
@@ -526,6 +526,7 @@ This is used by the global evaluation report (RP0004).'}),
"""
if not modname and filepath is None:
return
+ self.reporter.on_set_current_module(modname, filepath)
self.current_name = modname
self.current_file = filepath or modname
self.stats['by_module'][modname] = {}
diff --git a/reporters/__init__.py b/reporters/__init__.py
index <HASH>..<HASH> 100644
--- a/reporters/__init__.py
+++ b/reporters/__init__.py
@@ -77,3 +77,9 @@ class BaseReporter:
"""display the layout"""
raise NotImplementedError()
+ # Event callbacks
+
+ def on_set_current_module(self, module, filepath):
+ """starting analyzis of a module"""
+ pass
+
|
Add 'on_set_current_module' event trigerring and event callback for reporters.
|
diff --git a/src/Generator/EntityBundleGenerator.php b/src/Generator/EntityBundleGenerator.php
index <HASH>..<HASH> 100644
--- a/src/Generator/EntityBundleGenerator.php
+++ b/src/Generator/EntityBundleGenerator.php
@@ -48,11 +48,11 @@ class EntityBundleGenerator extends Generator
/**
* Generate core.entity_view_mode.node.teaser.yml
*/
-/* $this->renderFile(
+ $this->renderFile(
'module/src/Entity/Bundle/core.entity_view_mode.node.teaser.yml.twig',
$this->getSite()->getModulePath($module) . '/config/install/core.entity_view_mode.node.teaser.yml',
$parameters
- ); */
+ );
/**
* Generate field.field.node.{ bundle_name }.body.yml
@@ -66,11 +66,11 @@ class EntityBundleGenerator extends Generator
/**
* Generate field.storage.node.body.yml
*/
-/* $this->renderFile(
+ $this->renderFile(
'module/src/Entity/Bundle/field.storage.node.body.yml.twig',
$this->getSite()->getModulePath($module) . '/config/install/field.storage.node.body.yml',
$parameters
- ); */
+ );
/**
* Generate node.type.{ bundle_name }.yml
|
[generate:entity:bundle] Accept blank spaces in human readable name.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -19,8 +19,8 @@ setup(
version='0.9',
author='Andrea de Marco',
author_email='<24erre@gmail.com>',
- url='https://github.com/z4r/python-mocket',
- description='A Mock Socket Framework',
+ url='https://github.com/mocketize/python-mocket',
+ description='Socket Mock Framework',
long_description=open('README.rst').read(),
packages=find_packages(exclude=('tests', )),
install_requires=install_requires,
|
repo fix [ci skip]
|
diff --git a/sources/scalac/backend/msil/GenMSIL.java b/sources/scalac/backend/msil/GenMSIL.java
index <HASH>..<HASH> 100644
--- a/sources/scalac/backend/msil/GenMSIL.java
+++ b/sources/scalac/backend/msil/GenMSIL.java
@@ -21,7 +21,6 @@ import scalac.ast.Tree;
import scalac.ast.TreeList;
import scalac.atree.AConstant;
import Tree.*;
-import scalac.symtab.AttrInfo;
import scalac.symtab.Symbol;
import scalac.symtab.TypeTags;
import scalac.symtab.Modifiers;
|
Removed in import that prevented proper compila...
Removed in import that prevented proper compilation from the CVS
repository
|
diff --git a/tests/local/serializer.php b/tests/local/serializer.php
index <HASH>..<HASH> 100644
--- a/tests/local/serializer.php
+++ b/tests/local/serializer.php
@@ -7,9 +7,9 @@ use WebSharks\Core\Classes\CoreFacades as c;
require_once dirname(__FILE__, 2).'/includes/local.php';
/* ------------------------------------------------------------------------------------------------------------------ */
-
-echo $closure = c::serializeClosure(function (string $string) {
- return $string;
+$_brand_name = $App->Config->©brand['©name'];
+echo $closure = c::serializeClosure(function (string $string) use ($_brand_name) {
+ return $_brand_name.' says: '.$string;
})."\n\n";
c::dump($closure = c::unserializeClosure($closure));
echo $closure('Closure serialization works.')."\n\n";
|
Updating tests against serializer.
|
diff --git a/src/hmr/hotModuleReplacement.js b/src/hmr/hotModuleReplacement.js
index <HASH>..<HASH> 100644
--- a/src/hmr/hotModuleReplacement.js
+++ b/src/hmr/hotModuleReplacement.js
@@ -174,17 +174,12 @@ function reloadAll() {
function isUrlRequest(url) {
// An URL is not an request if
- // 1. It's an absolute url
- if (/^[a-z][a-z0-9+.-]*:/i.test(url)) {
- return false;
- }
-
- // 2. It's a protocol-relative
+ // 1. It's a protocol-relative
if (/^\/\//.test(url)) {
return false;
}
- // 3. Its a `#` link
+ // 2. Its a `#` link
if (/^#/.test(url)) {
return false;
}
|
fix: Remove absolute URL condition from HMR request checker. (#<I>)
|
diff --git a/src/Caouecs/Sirtrevorjs/Converter/ImageConverter.php b/src/Caouecs/Sirtrevorjs/Converter/ImageConverter.php
index <HASH>..<HASH> 100644
--- a/src/Caouecs/Sirtrevorjs/Converter/ImageConverter.php
+++ b/src/Caouecs/Sirtrevorjs/Converter/ImageConverter.php
@@ -37,9 +37,15 @@ class ImageConverter extends BaseConverter implements ConverterInterface
return;
}
+ $text = array_get($this->data, 'text');
+
+ if ($text != null) {
+ $text = $this->markdown->text($text);
+ }
+
return $this->view('image.image', [
'url' => array_get($this->data, 'file.url'),
- 'text' => array_get($this->data, 'text'),
+ 'text' => $text,
]);
}
|
feature: markdown in image's caption
|
diff --git a/rinoh/dimension.py b/rinoh/dimension.py
index <HASH>..<HASH> 100644
--- a/rinoh/dimension.py
+++ b/rinoh/dimension.py
@@ -135,9 +135,17 @@ class DimensionMultiplication(DimensionBase):
return float(self.multiplicand) * self.multiplier
+class DimensionUnit(object):
+ def __init__(self, points_per_unit):
+ self.points_per_unit = float(points_per_unit)
+
+ def __rmul__(self, value):
+ return Dimension(value * self.points_per_unit)
+
+
# Units
-PT = Dimension(1)
-INCH = 72*PT
-MM = INCH / 25.4
-CM = 10*MM
+PT = DimensionUnit(1)
+INCH = DimensionUnit(72*PT)
+MM = DimensionUnit(1 / 25.4 * INCH)
+CM = DimensionUnit(10*MM)
|
Introduce DimensionUnit class
- 1*PT now produces a Dimension instead of a DimensionMultiplication
- Eliminates most of the DimensionMultiplication.__float__ calls
- Allow only right-multiplication with a DimensionUnit
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,12 +1,5 @@
-"use strict";
-module.exports = function(grunt) {
- function readOptionalJSON( filepath ) {
- var data = {};
- try {
- data = grunt.file.readJSON( filepath );
- } catch(e) {}
- return data;
- }
+module.exports = grunt => {
+ const jshintrc = grunt.file.readJSON("./.jshintrc");
// Project configuration.
grunt.initConfig({
@@ -17,7 +10,7 @@ module.exports = function(grunt) {
jshint: {
all: {
src: ["grunt.js", "lib/**/*.js", "test/**/*.js"],
- options: readOptionalJSON(".jshintrc")
+ options: jshintrc
}
},
jsbeautifier: {
@@ -63,7 +56,5 @@ module.exports = function(grunt) {
grunt.loadNpmTasks("grunt-contrib-nodeunit");
grunt.loadNpmTasks("grunt-jsbeautifier");
// Default task.
- grunt.registerTask( "default", [ "jsbeautifier", "jshint", "nodeunit" ] );
-
-
+ grunt.registerTask("default", ["jsbeautifier", "jshint", "nodeunit"]);
};
|
Gruntfile: nitpicking
|
diff --git a/salt/states/dockerng.py b/salt/states/dockerng.py
index <HASH>..<HASH> 100644
--- a/salt/states/dockerng.py
+++ b/salt/states/dockerng.py
@@ -183,6 +183,8 @@ def _compare(actual, create_kwargs, defaults_from_image):
continue
elif item == 'environment':
+ if actual_data is None:
+ actual_data = []
actual_env = {}
for env_var in actual_data:
try:
|
docker daemon returns sometimes empty list and sometimes None
We deal with it
|
diff --git a/molgenis-omx-biobankconnect/src/main/java/org/molgenis/omx/biobankconnect/ontologyannotator/AsyncOntologyAnnotator.java b/molgenis-omx-biobankconnect/src/main/java/org/molgenis/omx/biobankconnect/ontologyannotator/AsyncOntologyAnnotator.java
index <HASH>..<HASH> 100644
--- a/molgenis-omx-biobankconnect/src/main/java/org/molgenis/omx/biobankconnect/ontologyannotator/AsyncOntologyAnnotator.java
+++ b/molgenis-omx-biobankconnect/src/main/java/org/molgenis/omx/biobankconnect/ontologyannotator/AsyncOntologyAnnotator.java
@@ -100,7 +100,6 @@ public class AsyncOntologyAnnotator implements OntologyAnnotator, InitializingBe
List<String> requiredColumns = new ArrayList<String>(Arrays.asList(ObservableFeature.NAME.toLowerCase(),
ObservableFeature.DESCRIPTION));
Iterator<AttributeMetaData> columnNamesIterator = csvRepository.getAttributes().iterator();
- // Iterator<String> columnNamesIterator = reader.colNamesIterator();
while (columnNamesIterator.hasNext())
{
requiredColumns.remove(columnNamesIterator.next().getName());
|
removed unused comment from AsyncOntologyAnnotator.java
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -26,7 +26,6 @@ import { setAutoPlan, setMapCenter } from './actions/config'
import { getCurrentPosition } from './actions/location'
import { setLocationToCurrent } from './actions/map'
import { findNearbyStops } from './actions/api'
-import { setShowExtendedSettings } from './actions/ui'
import createOtpReducer from './reducers/create-otp-reducer'
@@ -76,7 +75,6 @@ export {
setAutoPlan,
setLocationToCurrent,
setMapCenter,
- setShowExtendedSettings,
// redux utilities
createOtpReducer,
|
fix(api): Remove obselete include from index.js
|
diff --git a/languagetool-core/src/main/java/org/languagetool/MultiThreadedJLanguageTool.java b/languagetool-core/src/main/java/org/languagetool/MultiThreadedJLanguageTool.java
index <HASH>..<HASH> 100644
--- a/languagetool-core/src/main/java/org/languagetool/MultiThreadedJLanguageTool.java
+++ b/languagetool-core/src/main/java/org/languagetool/MultiThreadedJLanguageTool.java
@@ -55,7 +55,7 @@ public class MultiThreadedJLanguageTool extends JLanguageTool {
}
private static int getDefaultThreadCount() {
- String threadCountStr = System.getProperty("org.languagetool.thread_count", "-1");
+ String threadCountStr = System.getProperty("org.languagetool.thread_count_internal", "-1");
int threadPoolSize = Integer.parseInt(threadCountStr);
if (threadPoolSize == -1) {
threadPoolSize = Runtime.getRuntime().availableProcessors();
|
Rename thred_count property as internal
|
diff --git a/Tests/Entity/Parameters/BodyParameterTest.php b/Tests/Entity/Parameters/BodyParameterTest.php
index <HASH>..<HASH> 100644
--- a/Tests/Entity/Parameters/BodyParameterTest.php
+++ b/Tests/Entity/Parameters/BodyParameterTest.php
@@ -55,7 +55,7 @@ class BodyParameterTest extends \PHPUnit_Framework_TestCase
public function testSerialization()
{
$data = json_encode([
- 'in' => 'body',
+ 'in' => AbstractParameter::IN_BODY,
'name' => 'foo',
'description' => 'bar',
'required' => false,
|
Converted to using class constant in body serialization test
|
diff --git a/tests/test_xlsm_wrf.py b/tests/test_xlsm_wrf.py
index <HASH>..<HASH> 100644
--- a/tests/test_xlsm_wrf.py
+++ b/tests/test_xlsm_wrf.py
@@ -53,7 +53,7 @@ def test_read_wrf(wrf):
# make sure coordinates correct
assert wrf.lsm_lat_var in xd.coords
assert wrf.lsm_lon_var in xd.coords
- assert wrf.lsm_time_var in xd.coords
+ assert 'time' in xd.coords
# check @property attributes
date_array = ['2016-08-23 22:00:00', '2016-08-23 23:00:00',
'2016-08-24 00:00:00', '2016-08-24 01:00:00',
|
rename time dimension for slicing
|
diff --git a/carrot/messaging.py b/carrot/messaging.py
index <HASH>..<HASH> 100644
--- a/carrot/messaging.py
+++ b/carrot/messaging.py
@@ -248,7 +248,7 @@ class Consumer(object):
self.decoder = kwargs.get("decoder", deserialize)
if not self.backend:
self.backend = DefaultBackend(connection=connection,
- decoder=self.decoder)
+ decoder=self.decoder)
self.queue = queue or self.queue
# Binding.
@@ -354,7 +354,8 @@ class Consumer(object):
disabled and the receiver is required to manually handle
acknowledgment.
- :returns: The resulting :class:`carrot.backends.base.BaseMessage` object.
+ :returns: The resulting :class:`carrot.backends.base.BaseMessage`
+ object.
"""
message = self.fetch()
@@ -401,13 +402,6 @@ class Consumer(object):
message.ack()
discarded_count = discarded_count + 1
- def next(self):
- """*DEPRECATED*: Process the next pending message.
- Deprecated in favour of :meth:`process_next`"""
- warnings.warn("next() is deprecated, use process_next() instead.",
- DeprecationWarning)
- return self.process_next()
-
def wait(self):
"""Go into consume mode.
|
Consumer.next() is now removed (it was deprecated in favor of Consumer.process_next())
|
diff --git a/rados/ioctx.go b/rados/ioctx.go
index <HASH>..<HASH> 100644
--- a/rados/ioctx.go
+++ b/rados/ioctx.go
@@ -137,15 +137,15 @@ func (ioctx *IOContext) Create(oid string, exclusive CreateOption) error {
// Write writes len(data) bytes to the object with key oid starting at byte
// offset offset. It returns an error, if any.
func (ioctx *IOContext) Write(oid string, data []byte, offset uint64) error {
- c_oid := C.CString(oid)
- defer C.free(unsafe.Pointer(c_oid))
+ coid := C.CString(oid)
+ defer C.free(unsafe.Pointer(coid))
dataPointer := unsafe.Pointer(nil)
if len(data) > 0 {
dataPointer = unsafe.Pointer(&data[0])
}
- ret := C.rados_write(ioctx.ioctx, c_oid,
+ ret := C.rados_write(ioctx.ioctx, coid,
(*C.char)(dataPointer),
(C.size_t)(len(data)),
(C.uint64_t)(offset))
|
rados: naming conventions: fixes in Write function
Fix up variable names that don't meet Go standards.
|
diff --git a/bugwarrior/services/bitbucket.py b/bugwarrior/services/bitbucket.py
index <HASH>..<HASH> 100644
--- a/bugwarrior/services/bitbucket.py
+++ b/bugwarrior/services/bitbucket.py
@@ -24,7 +24,7 @@ class BitbucketIssue(Issue):
'label': 'Bitbucket URL',
},
FOREIGN_ID: {
- 'type': 'string',
+ 'type': 'numeric',
'label': 'Bitbucket Issue ID',
}
}
|
Make bitbucketid numeric. (#<I>)
This silences all the warnings from taskw that a number is being coerced
into a string.
|
diff --git a/moment.js b/moment.js
index <HASH>..<HASH> 100644
--- a/moment.js
+++ b/moment.js
@@ -1508,12 +1508,12 @@
get : function (units) {
units = normalizeUnits(units);
- return this[units.toLowerCase() + 's']();
+ return this[units.toLowerCase()]();
},
set : function (units, value) {
units = normalizeUnits(units);
- this[units.toLowerCase() + 's'](value);
+ this[units.toLowerCase()](value);
},
// If passed a language key, it will set the language for this
|
removing extra s in get() and set()
|
diff --git a/event/event.go b/event/event.go
index <HASH>..<HASH> 100644
--- a/event/event.go
+++ b/event/event.go
@@ -28,9 +28,8 @@ var levelNames = [8]string{
"Emergency",
}
-// LevelName converts a level into its textual representation.
-func LevelName(level Level) string {
- return levelNames[level]
+func (l Level) String() string {
+ return levelNames[l]
}
type Event struct {
@@ -60,8 +59,3 @@ func NewEvent(id uint64, level Level, message string, fields interface{}) *Event
return event
}
-
-// LevelName returns the textual representation of the level name for the event.
-func (event *Event) LevelName() string {
- return LevelName(event.Level)
-}
diff --git a/event/formatter/formatter.go b/event/formatter/formatter.go
index <HASH>..<HASH> 100644
--- a/event/formatter/formatter.go
+++ b/event/formatter/formatter.go
@@ -61,7 +61,7 @@ func (formatter *Formatter) Time(format string) string {
// Level converts the event's level into a string.
func (formatter *Formatter) Level() string {
- return formatter.Event.LevelName()
+ return formatter.Event.Level.String()
}
// Color wraps the given text in ANSI color escapes appropriate to the event's level.
|
add stringer interface to levels and drop LevelName
|
diff --git a/lib/rubocop/target_ruby.rb b/lib/rubocop/target_ruby.rb
index <HASH>..<HASH> 100644
--- a/lib/rubocop/target_ruby.rb
+++ b/lib/rubocop/target_ruby.rb
@@ -7,7 +7,7 @@ module RuboCop
DEFAULT_VERSION = KNOWN_RUBIES.first
OBSOLETE_RUBIES = {
- 1.9 => '0.50', 2.0 => '0.50', 2.1 => '0.58', 2.2 => '0.69', 2.3 => '0.82'
+ 1.9 => '0.50', 2.0 => '0.50', 2.1 => '0.58', 2.2 => '0.69', 2.3 => '0.81'
}.freeze
private_constant :KNOWN_RUBIES, :OBSOLETE_RUBIES
|
Update target_ruby.rb
rubocop <I> is the last version to support <I> mode, not <I>.
This is a partical revert of <I>a5bee<I>bb<I>
|
diff --git a/src/Writer.php b/src/Writer.php
index <HASH>..<HASH> 100644
--- a/src/Writer.php
+++ b/src/Writer.php
@@ -15,6 +15,14 @@ class Writer
/** @var string Write method to be relayed to Colorizer */
protected $method;
+ /** @var Color */
+ protected $colorizer;
+
+ public function __construct()
+ {
+ $this->colorizer = new Color;
+ }
+
/**
* Magically set methods.
*
@@ -22,7 +30,7 @@ class Writer
*
* @return self
*/
- public function __get($name)
+ public function __get(string $name): self
{
if (\strpos($this->method, $name) === false) {
$this->method .= $this->method ? \ucfirst($name) : $name;
@@ -39,12 +47,12 @@ class Writer
*
* @return void
*/
- public function write($text, $eol = false)
+ public function write(string $text, bool $eol = false)
{
list($method, $this->method) = [$this->method ?: 'line', ''];
$stream = \stripos($method, 'error') !== false ? \STDERR : \STDOUT;
- \fwrite($stream, Color::{$method}($text, [], $eol));
+ \fwrite($stream, $this->colorizer->{$method}($text, [], $eol));
}
}
|
refactor(writer): colorizer is no longer static, add typehints
|
diff --git a/core-bundle/src/Monolog/ContaoTableHandler.php b/core-bundle/src/Monolog/ContaoTableHandler.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Monolog/ContaoTableHandler.php
+++ b/core-bundle/src/Monolog/ContaoTableHandler.php
@@ -2,8 +2,8 @@
namespace Contao\CoreBundle\Monolog;
-use Contao\CoreBundle\EventListener\ScopeAwareTrait;
use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
+use Contao\CoreBundle\Framework\ScopeAwareTrait;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Statement;
|
[Core] ScopeAwareTrait namespace has changed
|
diff --git a/decompress_tar_test.go b/decompress_tar_test.go
index <HASH>..<HASH> 100644
--- a/decompress_tar_test.go
+++ b/decompress_tar_test.go
@@ -9,14 +9,18 @@ import (
func TestTar(t *testing.T) {
mtime := time.Unix(0, 0)
cases := []TestDecompressCase{
- {
- "extended_header.tar",
- true,
- false,
- []string{"directory/", "directory/a", "directory/b"},
- "",
- nil,
- },
+ /*
+ Disabled for now, this was broken in Go 1.10 and doesn't parse at
+ all anymore. Issue open here: https://github.com/golang/go/issues/28843
+ {
+ "extended_header.tar",
+ true,
+ false,
+ []string{"directory/", "directory/a", "directory/b"},
+ "",
+ nil,
+ },
+ */
{
"implied_dir.tar",
true,
|
Disable extended headers tar test
Go <I> and <I> can't even parse the tar header anymore (errors with
"invalid header"). I'm not sure if this is a bug so I opened an issue
here: <URL>
|
diff --git a/test/test-integration-sftp.js b/test/test-integration-sftp.js
index <HASH>..<HASH> 100644
--- a/test/test-integration-sftp.js
+++ b/test/test-integration-sftp.js
@@ -1693,13 +1693,8 @@ function cleanupTemp() {
}
function next() {
- if (t === tests.length - 1) {
- cleanup(function() {
- if (fs.existsSync(join(fixturesdir, 'testfile')))
- fs.unlinkSync(join(fixturesdir, 'testfile'));
- });
- return;
- }
+ if (t === tests.length - 1)
+ return cleanup();
//cleanupTemp();
var v = tests[++t];
v.run.call(v);
@@ -1723,12 +1718,14 @@ function waitForSshd(cb) {
waitForSshd(cb);
}, 50);
}
- cb();
+ cb && cb();
});
}
function cleanup(cb) {
cleanupTemp();
+ if (fs.existsSync(join(fixturesdir, 'testfile')))
+ fs.unlinkSync(join(fixturesdir, 'testfile'));
cpexec('lsof -Fp -a -u '
+ USER
+ ' -c sshd -i tcp@localhost:'
@@ -1741,7 +1738,7 @@ function cleanup(cb) {
} catch (ex) {}
}
}
- cb();
+ cb && cb();
});
}
|
test: make sure big testfile is removed on error or normal exit
|
diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py
index <HASH>..<HASH> 100644
--- a/openstack_dashboard/api/neutron.py
+++ b/openstack_dashboard/api/neutron.py
@@ -283,7 +283,7 @@ class SecurityGroupManager(network_base.SecurityGroupManager):
sg_ids = []
for p in ports:
sg_ids += p.security_groups
- return self._list(id=set(sg_ids))
+ return self._list(id=set(sg_ids)) if sg_ids else []
def update_instance_security_group(self, instance_id,
new_security_group_ids):
|
Ensure to return empty when no secgroup is associated to VM
Change-Id: I6a<I>bc6d3d<I>e7cb<I>e<I>e<I>d<I>f2bfbfc5
Closes-Bug: #<I>
|
diff --git a/acceptancetests/assess_bootstrap.py b/acceptancetests/assess_bootstrap.py
index <HASH>..<HASH> 100755
--- a/acceptancetests/assess_bootstrap.py
+++ b/acceptancetests/assess_bootstrap.py
@@ -87,7 +87,8 @@ def assess_to(bs_manager, to):
log.info('To {} bootstrap successful.'.format(to))
addr = get_controller_hostname(client)
if addr != to:
- raise JujuAssertionError('Not bootstrapped to the correct address.')
+ raise JujuAssertionError(
+ 'Not bootstrapped to the correct address; expected {}, got {}'.format(to, addr))
def assess_bootstrap(args):
|
Adds detail to assertion error output for deployment tests that
bootstrap with the --to option.
|
diff --git a/tests/unit/test_s3.py b/tests/unit/test_s3.py
index <HASH>..<HASH> 100644
--- a/tests/unit/test_s3.py
+++ b/tests/unit/test_s3.py
@@ -27,9 +27,9 @@ class S3Tests(unittest.TestCase):
@classmethod
def setUpClass(cls):
# create mock session, replace dummytoken with real token to create cassette
- #mock_gbdx_session = get_mock_gbdx_session(token="dummytoken")
- #cls.gbdx = Interface(gbdx_connection=mock_gbdx_session)
- cls.gbdx = Interface()
+ mock_gbdx_session = get_mock_gbdx_session(token="dummytoken")
+ cls.gbdx = Interface(gbdx_connection=mock_gbdx_session)
+ #cls.gbdx = Interface()
cls._temp_path = tempfile.mkdtemp()
print("Created: {}".format(cls._temp_path))
|
using mock interface in s3 test
|
diff --git a/js/cdax.js b/js/cdax.js
index <HASH>..<HASH> 100644
--- a/js/cdax.js
+++ b/js/cdax.js
@@ -865,6 +865,8 @@ module.exports = class cdax extends Exchange {
// 'transfer': undefined,
'name': name,
'active': active,
+ 'deposit': depositEnabled,
+ 'withdraw': withdrawEnabled,
'fee': undefined, // todo need to fetch from fee endpoint
'precision': precision,
'limits': {
|
cdax: add deposit/withdraw flag in currencies ccxt/ccxt#<I>
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -95,7 +95,8 @@ module.exports = function(grunt) {
port: port,
base: base,
livereload: true,
- open: true
+ open: true,
+ useAvailablePort: true
}
}
},
|
adds `useAvailablePort` option when serving page with connect.
|
diff --git a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/internal/DefaultVelocityEngine.java b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/internal/DefaultVelocityEngine.java
index <HASH>..<HASH> 100644
--- a/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/internal/DefaultVelocityEngine.java
+++ b/xwiki-commons-core/xwiki-commons-velocity/src/main/java/org/xwiki/velocity/internal/DefaultVelocityEngine.java
@@ -295,9 +295,6 @@ public class DefaultVelocityEngine extends AbstractSLF4JLogChute implements Velo
// to make macros included with #includeMacros() work even though we're using
// the Velocity setting:
// velocimacro.permissions.allow.inline.local.scope = true
- // TODO: Fix this when by rewriting the XWiki.include() implementation so that
- // included Velocity templates are added to the current document before
- // evaluation instead of doing 2 separate executions.
this.rsvc = runtimeServices;
}
|
[misc] Remove TODO that does not make sense anymore
|
diff --git a/ipywidgets/static/widgets/js/widget_bool.js b/ipywidgets/static/widgets/js/widget_bool.js
index <HASH>..<HASH> 100644
--- a/ipywidgets/static/widgets/js/widget_bool.js
+++ b/ipywidgets/static/widgets/js/widget_bool.js
@@ -178,9 +178,10 @@ define([
}
this.$el.text(readout);
$('<i class="fa"></i>').prependTo(this.$el).addClass(icon);
+ var that = this;
this.displayed.then(function() {
- this.$el.css("color", color);
- }, this);
+ that.$el.css("color", color);
+ });
}
});
|
then does not take a context argument
|
diff --git a/src/DoctrineServiceProvider.php b/src/DoctrineServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/DoctrineServiceProvider.php
+++ b/src/DoctrineServiceProvider.php
@@ -108,7 +108,6 @@ class DoctrineServiceProvider extends ServiceProvider
protected function registerManagerRegistry()
{
$this->app->singleton('registry', function ($app) {
-
$registry = new IlluminateRegistry($app, $app->make(EntityManagerFactory::class));
// Add all managers into the registry
@@ -122,7 +121,6 @@ class DoctrineServiceProvider extends ServiceProvider
// Once the registry get's resolved, we will call the resolve callbacks which were waiting for the registry
$this->app->afterResolving('registry', function (ManagerRegistry $registry, Container $container) {
-
$this->bootExtensionManager();
BootChain::boot($registry);
@@ -176,7 +174,6 @@ class DoctrineServiceProvider extends ServiceProvider
// Bind extension manager as singleton,
// so user can call it and add own extensions
$this->app->singleton(ExtensionManager::class, function ($app) {
-
$manager = new ExtensionManager($app);
// Register the extensions
@@ -214,7 +211,6 @@ class DoctrineServiceProvider extends ServiceProvider
protected function extendAuthManager()
{
$this->app->make('auth')->provider('doctrine', function ($app, $config) {
-
$entity = $config['model'];
$em = $app['registry']->getManagerForClass($entity);
|
Applied fixes from StyleCI (#<I>)
|
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
from codecs import open
REPO_URL = "http://github.com/MatMaul/pynetgear"
-VERSION = "0.10.1"
+VERSION = "0.10.2"
with open("requirements.txt") as f:
required = f.read().splitlines()
|
bump to version <I> (#<I>)
|
diff --git a/zendesk/endpoints_v2.py b/zendesk/endpoints_v2.py
index <HASH>..<HASH> 100644
--- a/zendesk/endpoints_v2.py
+++ b/zendesk/endpoints_v2.py
@@ -335,11 +335,11 @@ mapping_table = {
'method': 'POST',
},
'update_organzation': {
- 'path': '/organizations.json',
+ 'path': '/organizations/{{organization_id}}.json',
'method': 'PUT',
},
'delete_organzation': {
- 'path': '/organizations.json',
+ 'path': '/organizations/{{organization_id}}.json',
'method': 'DELETE',
},
|
Fixed update and delete organization endpoint for v2 API.
|
diff --git a/lib/spring/version.rb b/lib/spring/version.rb
index <HASH>..<HASH> 100644
--- a/lib/spring/version.rb
+++ b/lib/spring/version.rb
@@ -1,3 +1,3 @@
module Spring
- VERSION = "1.1.0.beta3"
+ VERSION = "1.1.0.beta4"
end
|
Bump to <I>.beta4
|
diff --git a/test/rjsconfig.js b/test/rjsconfig.js
index <HASH>..<HASH> 100644
--- a/test/rjsconfig.js
+++ b/test/rjsconfig.js
@@ -2,12 +2,7 @@ var require = {
paths: {
"power-assert": "../build/power-assert",
expect: "../bower_components/expect/index",
- "power-assert-formatter": "../bower_components/power-assert-formatter/lib/power-assert-formatter",
- "qunit-tap": "../bower_components/qunit-tap/lib/qunit-tap",
- qunit: "../bower_components/qunit/qunit/qunit",
mocha: "../bower_components/mocha/mocha",
- empower: "../bower_components/empower/lib/empower",
- esprima: "../bower_components/esprima/esprima",
requirejs: "../bower_components/requirejs/require"
},
shim: {
|
Remove unused dependencies from AMD testing.
|
diff --git a/src/Floppy/Client/BuzzFileSourceUploader.php b/src/Floppy/Client/BuzzFileSourceUploader.php
index <HASH>..<HASH> 100644
--- a/src/Floppy/Client/BuzzFileSourceUploader.php
+++ b/src/Floppy/Client/BuzzFileSourceUploader.php
@@ -32,7 +32,7 @@ class BuzzFileSourceUploader implements FileSourceUploader
$formUpload = new FormUpload();
$formUpload->setName($this->fileKey);
- $formUpload->setFilename(basename($fileSource->filepath()));
+ $formUpload->setFilename($this->getFilename($fileSource));
$formUpload->setContent($fileSource->content());
$request->addFields($extraFields + array(
@@ -63,4 +63,17 @@ class BuzzFileSourceUploader implements FileSourceUploader
throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
}
}
+
+ private function getFilename(FileSource $fileSource)
+ {
+ $filename = basename($fileSource->filepath());
+ $extension = pathinfo($filename, PATHINFO_EXTENSION);
+ $preferredExtension = $fileSource->fileType()->prefferedExtension();
+
+ //make sure filename has valid extension. When FileSource was created from UploadedFile, filepath might be a hash
+ //and extension would be meaningless
+ return $preferredExtension && $preferredExtension !== $extension
+ ? 'file.'.$preferredExtension
+ : $filename;
+ }
}
\ No newline at end of file
|
fix BuzzFileSourceUploader compatibility with FileSource created from UploadedFile
|
diff --git a/tests/integration/test.replication.js b/tests/integration/test.replication.js
index <HASH>..<HASH> 100644
--- a/tests/integration/test.replication.js
+++ b/tests/integration/test.replication.js
@@ -2924,7 +2924,11 @@ adapters.forEach(function (adapters) {
live: true,
onChange: function (change) {
change.changes.should.have.length(1);
- change.seq.should.equal(info.update_seq);
+
+ // not a valid assertion in CouchDB 2.0
+ if (!testUtils.isCouchMaster()) {
+ change.seq.should.equal(info.update_seq);
+ }
done();
}
});
|
(#<I>) - Fix "issue #<I> update_seq after replication"
Do not assume that the update_seq and change seq are equal (not
true in CouchDB <I>).
|
diff --git a/test/e2e/driver.go b/test/e2e/driver.go
index <HASH>..<HASH> 100644
--- a/test/e2e/driver.go
+++ b/test/e2e/driver.go
@@ -74,10 +74,7 @@ func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, orderseed
}()
tests := []testSpec{
- /* Disable TestKubernetesROService due to rate limiter issues.
- TODO: Add this test back when rate limiting is working properly.
- {TestKubernetesROService, "TestKubernetesROService"},
- */
+ {TestKubernetesROService, "TestKubernetesROService"},
{TestKubeletSendsEvent, "TestKubeletSendsEvent"},
{TestImportantURLs, "TestImportantURLs"},
{TestPodUpdate, "TestPodUpdate"},
|
Reinstate ROService test now that rate limit issue has been addressed
|
diff --git a/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java b/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java
+++ b/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java
@@ -622,6 +622,9 @@ public abstract class BaseDaoImpl<T, ID> implements Dao<T, ID> {
public ID extractId(T data) throws SQLException {
checkForInitialized();
FieldType idField = tableInfo.getIdField();
+ if (idField == null) {
+ throw new SQLException("Class " + dataClass + " does not have an id field");
+ }
@SuppressWarnings("unchecked")
ID id = (ID) idField.extractJavaFieldValue(data);
return id;
|
Added a better throw instead of a NPE.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -65,6 +65,7 @@ An extensive
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development :: Libraries :: Python Modules',
],
)
|
Added "Implementation :: PyPy" to classifiers.
|
diff --git a/src/Security/Auth0Service.php b/src/Security/Auth0Service.php
index <HASH>..<HASH> 100644
--- a/src/Security/Auth0Service.php
+++ b/src/Security/Auth0Service.php
@@ -116,6 +116,12 @@ class Auth0Service
*/
public function getUserProfileByA0UID(string $jwt): ?array
{
+ // The /userinfo endpoint is only accessible with RS256.
+ // Return details from JWT instead, in this case.
+ if ('HS256' === $this->algorithm) {
+ return (array) $this->tokenInfo;
+ }
+
return $this->a0->userinfo($jwt);
}
|
fix: HS<I> does not support /userinfo; return profile based on JWT data in this case.
|
diff --git a/src/Toolbar/LeftElement.react.js b/src/Toolbar/LeftElement.react.js
index <HASH>..<HASH> 100644
--- a/src/Toolbar/LeftElement.react.js
+++ b/src/Toolbar/LeftElement.react.js
@@ -27,7 +27,6 @@ const contextTypes = {
uiTheme: PropTypes.object.isRequired,
};
-const SEARCH_BACK_ICON = 'arrow-back';
const SEARCH_FORWARD_ICON = 'arrow-forward';
function shouldUpdateStyles(props, nextProps) {
@@ -90,12 +89,7 @@ class LeftElement extends PureComponent {
easing: Easing.linear,
useNativeDriver: Platform.OS === 'android',
}).start(() => {
- let leftElement = activate ? SEARCH_FORWARD_ICON : this.props.leftElement;
-
- if (!this.state.leftElement) {
- // because there won't be animation in this case
- leftElement = SEARCH_BACK_ICON;
- }
+ const leftElement = activate ? SEARCH_FORWARD_ICON : this.props.leftElement;
this.setState({ leftElement });
|
Toolbar search without leftElement shows forward icon (#<I>)
* Show back icon while search is active
It should show back icon instead of forward icon
* Show back icon while search is active
* Fix eslint syntax error
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.