diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/search-index/index.js b/lib/search-index/index.js
index <HASH>..<HASH> 100644
--- a/lib/search-index/index.js
+++ b/lib/search-index/index.js
@@ -217,7 +217,7 @@ function indexDoc(docID, doc, facets, indexMetaDataGlobal, callback) {
if( Object.prototype.toString.call(doc[fieldKey]) === '[object Array]' ) {
value['fields'][fieldKey] = doc[fieldKey];
} else {
- value['fields'][fieldKey] = doc[fieldKey].substring(0, maxStringFieldLength);
+ value['fields'][fieldKey] = doc[fieldKey].toString().substring(0, maxStringFieldLength);
}
}
|
Convert integers to strings before using substring
|
diff --git a/utils.js b/utils.js
index <HASH>..<HASH> 100644
--- a/utils.js
+++ b/utils.js
@@ -233,7 +233,7 @@ Utils.makeRoutes = function(baseRoute, file, options) {
// and pass the subsequent URL on as a "query" parameter
if (/^html?$/.test(ext) && ("template" === file.name)) {
route = route.split("/").slice(0, -1).join("/");
- return [route + "/:query"];
+ return [route + "/:$slug"];
}
// Add file and default extension
|
utils#makeRoutes: changes "query" to "$slug"
This is part of effort to differentiate special variables
|
diff --git a/OpenPNM/Network/__init__.py b/OpenPNM/Network/__init__.py
index <HASH>..<HASH> 100644
--- a/OpenPNM/Network/__init__.py
+++ b/OpenPNM/Network/__init__.py
@@ -40,4 +40,3 @@ from .__MatFile__ import MatFile
from .__TestNet__ import TestNet
from .__Empty__ import Empty
from . import models
-
diff --git a/OpenPNM/Utilities/__init__.py b/OpenPNM/Utilities/__init__.py
index <HASH>..<HASH> 100644
--- a/OpenPNM/Utilities/__init__.py
+++ b/OpenPNM/Utilities/__init__.py
@@ -13,4 +13,4 @@ r"""
from . import IO
from . import misc
from . import vertexops
-from .__topology__ import topology
\ No newline at end of file
+from .__topology__ import topology
|
2 pep8 fixes (it seems my local pytest does not check for pep8)
|
diff --git a/syn/base_utils/tests/test_dict.py b/syn/base_utils/tests/test_dict.py
index <HASH>..<HASH> 100644
--- a/syn/base_utils/tests/test_dict.py
+++ b/syn/base_utils/tests/test_dict.py
@@ -107,7 +107,6 @@ def test_reflexivedict():
#-------------------------------------------------------------------------------
# SeqDict
-
def test_seqdict():
dct = SeqDict(a = [1, 2],
b = (10, 11))
@@ -116,9 +115,11 @@ def test_seqdict():
assert dct.b == (10, 11)
dct.update(dict(a = (3, 4),
- b = [12, 13]))
+ b = [12, 13],
+ c = [20]))
assert dct.a == [1, 2, 3, 4]
assert dct.b == (10, 11, 12, 13)
+ assert dct.c == [20]
#-------------------------------------------------------------------------------
|
Completing SeqDict test coverage
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ except ImportError:
from setuptools import setup
setup(
- setup_requires=['d2to1>=0.2.5', 'stsci.distutils>=0.2.2dev'],
+ setup_requires=['d2to1>=0.2.5', 'stsci.distutils>=0.3dev'],
namespace_packages=['stsci'], packages=['stsci'],
d2to1=True,
use_2to3=True,
|
Bumped the development version of stscil.distutils since it contains significant API changes. Also bumped the version requirement on the sample stsci.tools and acstools packages.
git-svn-id: <URL>
|
diff --git a/components/api/src/main/java/org/openengsb/core/api/model/OpenEngSBModel.java b/components/api/src/main/java/org/openengsb/core/api/model/OpenEngSBModel.java
index <HASH>..<HASH> 100644
--- a/components/api/src/main/java/org/openengsb/core/api/model/OpenEngSBModel.java
+++ b/components/api/src/main/java/org/openengsb/core/api/model/OpenEngSBModel.java
@@ -17,6 +17,7 @@
package org.openengsb.core.api.model;
+import java.io.Serializable;
import java.util.List;
/**
@@ -24,7 +25,7 @@ import java.util.List;
* use one model for all kinds of domain model data. Every domain model marked with the Model interface get this
* interface injected.
*/
-public interface OpenEngSBModel {
+public interface OpenEngSBModel extends Serializable {
/**
* Returns a list of OpenEngSBModelEntries. The list contains all data fields which are used by the specific domain.
|
[OPENENGSB-<I>] made OpenEngSBModel interface extend Serializable
|
diff --git a/zipline/lines.py b/zipline/lines.py
index <HASH>..<HASH> 100644
--- a/zipline/lines.py
+++ b/zipline/lines.py
@@ -83,11 +83,6 @@ import zipline.protocol as zp
log = Logger('Lines')
-class CancelSignal(Exception):
- def __init__(self):
- pass
-
-
class SimulatedTrading(object):
def __init__(self,
@@ -184,12 +179,7 @@ class SimulatedTrading(object):
os.kill(ppid, SIGINT)
def handle_exception(self, exc):
- if isinstance(exc, CancelSignal):
- # signal from monitor of an orderly shutdown,
- # do nothing.
- pass
- else:
- self.signal_exception(exc)
+ self.signal_exception(exc)
def signal_exception(self, exc=None):
"""
|
Removes unused CancelSignal.
This was only triggered by the now removed Monitor.
|
diff --git a/thermo/stream.py b/thermo/stream.py
index <HASH>..<HASH> 100644
--- a/thermo/stream.py
+++ b/thermo/stream.py
@@ -866,25 +866,29 @@ class Stream(Mixture):
# flow_spec, composition_spec are attributes already
@property
def specified_composition_vars(self):
+ '''number of composition variables'''
return 1
@property
def composition_specified(self):
- # Always needs a composition
+ '''Always needs a composition'''
return True
@property
def specified_state_vars(self):
- # Always needs two
+ '''Always needs two states'''
return 2
@property
def state_specified(self):
- # Always needs a state
+ '''Always needs a state'''
return True
@property
def state_specs(self):
+ '''Returns a list of tuples of (state_variable, state_value) representing
+ the thermodynamic state of the system.
+ '''
specs = []
for i, var in enumerate(('T', 'P', 'VF', 'Hm', 'H', 'Sm', 'S', 'energy')):
v = self.specs[i]
@@ -894,12 +898,12 @@ class Stream(Mixture):
@property
def specified_flow_vars(self):
- # Always needs only one flow specified
+ '''Always needs only one flow specified'''
return 1
@property
def flow_specified(self):
- # Always needs a flow specified
+ '''Always needs a flow specified'''
return True
|
Add a few docstrings
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -634,8 +634,12 @@ Driver.prototype.identityPublishStatus = function () {
})
status.ever = !!unchained.length
- status.current = unchained.some(function (e) {
- return e[CUR_HASH] === curHash
+ unchained.some(function (e) {
+ if (e[CUR_HASH] === curHash) {
+ status.txId = e.txId
+ status.current = true
+ return true
+ }
})
status.queued = !status.current && entries.some(function (e) {
diff --git a/test/end-to-end.js b/test/end-to-end.js
index <HASH>..<HASH> 100644
--- a/test/end-to-end.js
+++ b/test/end-to-end.js
@@ -570,6 +570,7 @@ test('the reader and the writer', function (t) {
.then(function (status) {
t.ok(status.ever)
t.ok(status.current)
+ t.ok(status.txId)
return reader.send({
chain: false,
deliver: true,
|
add txId to identity publish status
|
diff --git a/src/runner.js b/src/runner.js
index <HASH>..<HASH> 100644
--- a/src/runner.js
+++ b/src/runner.js
@@ -16,23 +16,24 @@ var regexLog = /^\[([^\]]*)\]\(([^\)]*) ([^\)]*)\):([^\n]*)/gm;
function Runner () {
Emitter.call(this);
+ this.initialize();
+}
+// Extend Event.Emitter.
+util.inherits(Runner, Emitter);
+
+Runner.prototype.initialize = function () {
this.uuid = uuid();
this.folder = path.join(__dirname, './bots/files/', this.uuid);
this.captures = path.join(this.folder, 'captures');
this.log = path.join(this.folder, 'log.txt');
this.cookie = path.join(this.folder, 'cookies.txt');
- this.logs = {};
- this.tasks = {};
this.children = {};
this.createFiles();
this.bindings();
-}
-
-// Extend Event.Emitter.
-util.inherits(Runner, Emitter);
+};
Runner.prototype.createFiles = function createFiles () {
// Create its captures folder.
|
feat: add an initialize function to the runner
|
diff --git a/lib/resilient/circuit_breaker.rb b/lib/resilient/circuit_breaker.rb
index <HASH>..<HASH> 100644
--- a/lib/resilient/circuit_breaker.rb
+++ b/lib/resilient/circuit_breaker.rb
@@ -38,12 +38,14 @@ module Resilient
else
@metrics.mark_success
end
+ nil
}
end
def mark_failure
instrument("resilient.circuit_breaker.mark_failure") { |payload|
@metrics.mark_failure
+ nil
}
end
diff --git a/test/support/circuit_breaker_interface_test.rb b/test/support/circuit_breaker_interface_test.rb
index <HASH>..<HASH> 100644
--- a/test/support/circuit_breaker_interface_test.rb
+++ b/test/support/circuit_breaker_interface_test.rb
@@ -7,10 +7,18 @@ module CircuitBreakerInterfaceTest
assert_respond_to @object, :mark_success
end
+ def test_mark_success_returns_nothing
+ assert_nil @object.mark_success
+ end
+
def test_responds_to_mark_failure
assert_respond_to @object, :mark_failure
end
+ def test_mark_failure_returns_nothing
+ assert_nil @object.mark_failure
+ end
+
def test_responds_to_reset
assert_respond_to @object, :reset
end
|
Ensure circuit breaker mark success/failure return nothing
|
diff --git a/lib/reporters/html.js b/lib/reporters/html.js
index <HASH>..<HASH> 100644
--- a/lib/reporters/html.js
+++ b/lib/reporters/html.js
@@ -181,7 +181,7 @@ function HTML(runner, options) {
if (indexOfMessage === -1) {
stackString = test.err.stack;
} else {
- stackString = test.err.stack.substr(
+ stackString = test.err.stack.slice(
test.err.message.length + indexOfMessage
);
}
|
refactor: replace deprecated 'String.prototype.substr()' (#<I>)
'substr()' is deprecated, so we replace it with 'slice()' which works similarily.
|
diff --git a/lib/rest-core/promise.rb b/lib/rest-core/promise.rb
index <HASH>..<HASH> 100644
--- a/lib/rest-core/promise.rb
+++ b/lib/rest-core/promise.rb
@@ -167,7 +167,7 @@ class RestCore::Promise
begin
rejecting(e)
rescue Exception => f # log user callback error
- callback_error(f)
+ callback_error(f, true)
end
end
end
@@ -196,8 +196,9 @@ class RestCore::Promise
end
# log user callback error
- def callback_error e
+ def callback_error e, set_backtrace=false
never_raise_yield do
+ self.class.set_backtrace(e) if set_backtrace
if env[CLIENT].error_callback
env[CLIENT].error_callback.call(e)
else
|
should set_backtrace for callback error from rejecting
|
diff --git a/src/Hodor/JobQueue/Config.php b/src/Hodor/JobQueue/Config.php
index <HASH>..<HASH> 100644
--- a/src/Hodor/JobQueue/Config.php
+++ b/src/Hodor/JobQueue/Config.php
@@ -213,21 +213,20 @@ class Config implements ConfigInterface
}
$config = array_merge(
- $this->getOption('queue_defaults', [
+ [
'host' => null,
'port' => 5672,
'username' => null,
'password' => null,
- 'queue_prefix' => 'hodor-'
- ]),
- $this->getOption($queue_type_keys['defaults_key'], [])
+ 'queue_prefix' => 'hodor-',
+ ],
+ $this->getOption('queue_defaults', []),
+ $this->getOption($queue_type_keys['defaults_key'], []),
+ $queues[$queue_name]
);
$config = array_merge(
$config,
- [
- 'queue_name' => "{$config['queue_prefix']}{$queue_name}",
- ],
- $queues[$queue_name]
+ ['queue_name' => "{$config['queue_prefix']}{$queue_name}"]
);
$config['key_name'] = $queue_name;
$config['fetch_count'] = 1;
|
Update the way queue configs are merged
- Default any/all of host, port, username, and password
rather than it being all or nothing
- Always append the queue prefix to the queue name, even
if the queue prefix is defined at the queue level
|
diff --git a/metrics-core/src/test/java/com/codahale/metrics/InstrumentedThreadFactoryTest.java b/metrics-core/src/test/java/com/codahale/metrics/InstrumentedThreadFactoryTest.java
index <HASH>..<HASH> 100644
--- a/metrics-core/src/test/java/com/codahale/metrics/InstrumentedThreadFactoryTest.java
+++ b/metrics-core/src/test/java/com/codahale/metrics/InstrumentedThreadFactoryTest.java
@@ -33,7 +33,7 @@ public class InstrumentedThreadFactoryTest {
// terminate all threads in the executor service.
executor.shutdown();
- assertThat(executor.awaitTermination(1, TimeUnit.SECONDS)).isTrue();
+ assertThat(executor.awaitTermination(2, TimeUnit.SECONDS)).isTrue();
// assert that all threads from the factory have been terminated.
assertThat(terminated.getCount()).isEqualTo(10);
|
Provide a slightly longer wait for thread termination
|
diff --git a/tests/spec/container-spec.js b/tests/spec/container-spec.js
index <HASH>..<HASH> 100644
--- a/tests/spec/container-spec.js
+++ b/tests/spec/container-spec.js
@@ -650,7 +650,7 @@ describe('F2.registerApps - xhr overrides', function() {
});
F2.registerApps({
appId: 'com_test_app',
- manifestUrl: 'http://127.0.0.1:8080/httpPostTest'
+ manifestUrl: 'http://openf2.herokuapp.com/httpPostTest'
});
});
diff --git a/tests/spec/spec-helpers.js b/tests/spec/spec-helpers.js
index <HASH>..<HASH> 100644
--- a/tests/spec/spec-helpers.js
+++ b/tests/spec/spec-helpers.js
@@ -1,4 +1,4 @@
-var TEST_MANIFEST_URL = 'http://docs.openf2.org/demos/apps/JavaScript/HelloWorld/manifest.js',
+var TEST_MANIFEST_URL = 'http://openf2.herokuapp.com/helloworldapp',
TEST_APP_ID = 'com_openf2_examples_javascript_helloworld',
TEST_MANIFEST_URL2 = 'http://www.openf2.org/Examples/Apps',
TEST_APP_ID2 = 'com_openf2_examples_csharp_marketnews'
|
Fixed CORS issue with tests, 2 outstanding issues
|
diff --git a/examples/ex5.rb b/examples/ex5.rb
index <HASH>..<HASH> 100644
--- a/examples/ex5.rb
+++ b/examples/ex5.rb
@@ -1,5 +1,5 @@
(wav = WavIn.new("ex1.wav")) >> WavOut.new("ex5.wav") >> blackhole
-play 0.5.seconds # silence
+wav.stop; play 0.5.seconds # silence
wav.play; play 1.second # play first second
(r = Ramp.new(1.0, 2.0, 1.minute)) >> blackhole
|
Updated example to reflect API change: WavIn starts unpaused
|
diff --git a/salt/master.py b/salt/master.py
index <HASH>..<HASH> 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -667,8 +667,8 @@ class AESFuncs(object):
mopts = dict(self.opts)
file_roots = dict(mopts['file_roots'])
envs = self._file_envs()
- for env in file_roots:
- if not env in envs:
+ for env in envs:
+ if not env in file_roots:
file_roots[env] = []
mopts['file_roots'] = file_roots
return mopts
|
Fix bug in environment gathering on the master
|
diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php b/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php
@@ -100,8 +100,6 @@ final class OvhCloudTransport extends AbstractTransport
$endpoint = sprintf('%s/auth/time', $this->getEndpoint());
$response = $this->client->request('GET', $endpoint);
- $serverTimestamp = (int) (string) $response->getContent();
-
- return $serverTimestamp - (int) time();
+ return $response->getContent() - time();
}
}
|
time ( void ) : int
no need to cast
|
diff --git a/lib/cronlib.php b/lib/cronlib.php
index <HASH>..<HASH> 100644
--- a/lib/cronlib.php
+++ b/lib/cronlib.php
@@ -32,6 +32,11 @@ function cron_run() {
exit(1);
}
+ if (moodle_needs_upgrading()) {
+ echo "Moodle upgrade pending, cron execution suspended.\n";
+ exit(1);
+ }
+
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/gradelib.php');
|
MDL-<I> prevent cron execution when upgrade pending
|
diff --git a/src/rez/package_help.py b/src/rez/package_help.py
index <HASH>..<HASH> 100644
--- a/src/rez/package_help.py
+++ b/src/rez/package_help.py
@@ -1,7 +1,9 @@
from rez.packages import iter_packages
from rez.config import config
+from rez.rex_bindings import VersionBinding
from rez.util import AttrDictWrapper, ObjectStringFormatter, \
convert_old_command_expansions
+from rez.system import system
import subprocess
import webbrowser
import os.path
@@ -54,7 +56,9 @@ class PackageHelp(object):
base = variant.base
root = variant.root
- namespace = dict(base=base, root=root, config=config)
+ namespace = dict(base=base, root=root, config=config,
+ version=VersionBinding(package.version),
+ system=system)
formatter = ObjectStringFormatter(AttrDictWrapper(namespace),
expand='unchanged')
|
+ Add support for package version and system variables to the namespace expansion.
|
diff --git a/lib/fog/vsphere/requests/compute/vm_clone.rb b/lib/fog/vsphere/requests/compute/vm_clone.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/vsphere/requests/compute/vm_clone.rb
+++ b/lib/fog/vsphere/requests/compute/vm_clone.rb
@@ -18,7 +18,7 @@ module Fog
raise ArgumentError, "#{required_options.join(', ')} are required" unless options.has_key? param
end
# TODO This is ugly and needs to rethink mocks
- unless ENV['FOG_MOCK']
+ unless Fog.mock?
raise ArgumentError, "#{options["datacenter"]} Doesn't Exist!" unless get_datacenter(options["datacenter"])
raise ArgumentError, "#{options["template_path"]} Doesn't Exist!" unless get_virtual_machine(options["template_path"], options["datacenter"])
end
|
[vsphere] Use Fog.mock? as the other providers
Specs can set Fog.mock! without setting the env var
|
diff --git a/src/main/java/com/pinterest/secor/common/SecorConfig.java b/src/main/java/com/pinterest/secor/common/SecorConfig.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/pinterest/secor/common/SecorConfig.java
+++ b/src/main/java/com/pinterest/secor/common/SecorConfig.java
@@ -204,7 +204,7 @@ public class SecorConfig {
}
public String getHivePrefix() {
- return getString("secor.hive.prefix", "");
+ return getString("secor.hive.prefix");
}
public String getCompressionCodec() {
@@ -235,11 +235,6 @@ public class SecorConfig {
return mProperties.getString(name);
}
- private String getString(String name, String defaultValue) {
- checkProperty(name);
- return mProperties.getString(name, defaultValue);
- }
-
private int getInt(String name) {
checkProperty(name);
return mProperties.getInt(name);
|
Cleaning up code based on review - need to specific config ; no defaults
|
diff --git a/core/API/Inconsistencies.php b/core/API/Inconsistencies.php
index <HASH>..<HASH> 100644
--- a/core/API/Inconsistencies.php
+++ b/core/API/Inconsistencies.php
@@ -38,6 +38,8 @@ class Inconsistencies
'nb_visits_percentage',
'/.*_evolution/',
'/goal_.*_conversion_rate/',
+ '/step_.*_rate/',
+ '/funnel_.*_rate/',
'/form_.*_rate/',
'/field_.*_rate/',
);
|
Proceed rate in Goal Funnel report and row evolution of funnel is mismatching (#<I>)
fix DEV-<I>
|
diff --git a/parsl/executors/high_throughput/interchange.py b/parsl/executors/high_throughput/interchange.py
index <HASH>..<HASH> 100644
--- a/parsl/executors/high_throughput/interchange.py
+++ b/parsl/executors/high_throughput/interchange.py
@@ -81,8 +81,8 @@ class VersionMismatch(Exception):
def __repr__(self):
return "Manager version info {} does not match interchange version info {}, causing a critical failure".format(
- self.interchange_version,
- self.manager_version)
+ self.manager_version,
+ self.interchange_version)
def __str__(self):
return self.__repr__()
|
Fix incorrect order of manager and interchange versions in error text (#<I>)
|
diff --git a/responses.py b/responses.py
index <HASH>..<HASH> 100644
--- a/responses.py
+++ b/responses.py
@@ -640,9 +640,15 @@ class RequestsMock(object):
return _real_send(adapter, request, **kwargs)
error_msg = (
- "Connection refused by Responses: {0} {1} doesn't "
- "match Responses Mock".format(request.method, request.url)
+ "Connection refused by Responses - the call doesn't "
+ "match any registered mock.\n\n"
+ "Request: \n"
+ "- {0} {1}\n\n"
+ "Available matches:\n".format(request.method, request.url)
)
+ for m in self._matches:
+ error_msg += "- {} {}\n".format(m.method, m.url)
+
response = ConnectionError(error_msg)
response.request = request
|
Improve ConnectionError message
When a request doesn't match the responses mock the error message isn't
very helpful. It tells you the request that was made which doesn't match
any mock, but it doesn't show you what responses have been registered.
This PR shows the request that has been made together with registered
responses. It makes it easier to spot why a test is failing because you
can compare the request with the mocks side by side.
Prior output:
```
requests.exceptions.ConnectionError: Connection refused by Responses: GET <URL>
|
diff --git a/jenetics.ext/src/test/java/io/jenetics/ext/util/TreeTest.java b/jenetics.ext/src/test/java/io/jenetics/ext/util/TreeTest.java
index <HASH>..<HASH> 100644
--- a/jenetics.ext/src/test/java/io/jenetics/ext/util/TreeTest.java
+++ b/jenetics.ext/src/test/java/io/jenetics/ext/util/TreeTest.java
@@ -143,7 +143,9 @@ public class TreeTest {
@Test
public void reduce() {
- final Tree<String, ?> formula = TreeNode.parse("add(sub(6,div(230,10)),mul(5,6))");
+ final Tree<String, ?> formula = TreeNode.parse(
+ "add(sub(6,div(230,10)),mul(5,6))"
+ );
final double result = formula.reduce(new Double[0], (op, args) ->
switch (op) {
case "add" -> args[0] + args[1];
|
#<I>: Improve `Tree::reduce` interface.
|
diff --git a/src/Security/Security.php b/src/Security/Security.php
index <HASH>..<HASH> 100644
--- a/src/Security/Security.php
+++ b/src/Security/Security.php
@@ -33,7 +33,7 @@ class Security
*/
protected function setTimezone()
{
- $parser = new TimezoneSetter();
- $parser->register();
+ $setter = new TimezoneSetter();
+ $setter->register();
}
}
|
renamed the variable to be more descriptive
|
diff --git a/example/image-classification/symbols/vgg.py b/example/image-classification/symbols/vgg.py
index <HASH>..<HASH> 100644
--- a/example/image-classification/symbols/vgg.py
+++ b/example/image-classification/symbols/vgg.py
@@ -6,7 +6,7 @@ large-scale image recognition." arXiv preprint arXiv:1409.1556 (2014).
import mxnet as mx
def get_symbol(num_classes, **kwargs):
- ## define alexnet
+ ## define VGG11
data = mx.symbol.Variable(name="data")
# group 1
conv1_1 = mx.symbol.Convolution(data=data, kernel=(3, 3), pad=(1, 1), num_filter=64, name="conv1_1")
|
Update vgg.py (#<I>)
|
diff --git a/h2o-core/src/main/java/water/util/TwoDimTable.java b/h2o-core/src/main/java/water/util/TwoDimTable.java
index <HASH>..<HASH> 100644
--- a/h2o-core/src/main/java/water/util/TwoDimTable.java
+++ b/h2o-core/src/main/java/water/util/TwoDimTable.java
@@ -303,7 +303,7 @@ public class TwoDimTable extends Iced {
sb.append(tableHeader);
}
if (tableDescription.length() > 0) {
- sb.append("\n").append(tableDescription);
+ sb.append(" (").append(tableDescription).append(")");
}
sb.append(":\n");
for (int r = 0; r <= rowDim; ++r) {
|
Put the TwoDimTable description in parentheses after the title.
|
diff --git a/src/peh/ThrowView.php b/src/peh/ThrowView.php
index <HASH>..<HASH> 100644
--- a/src/peh/ThrowView.php
+++ b/src/peh/ThrowView.php
@@ -14,7 +14,6 @@ namespace pukoframework\peh;
use Exception;
use pte\CustomRender;
use pte\Pte;
-use pukoframework\pte\RenderEngine;
use pukoframework\Response;
/**
|
fix unresolved imports
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -13,15 +13,14 @@
'MSAnimationEnd',
]
- const done = () => {
+ const done = _ => {
$.classList.remove('animated', commands[0])
event.forEach(e => $.removeEventListener(e, done))
commands.shift()
- commands.length > 0 ?
- animate() : resolve($)
+ commands.length ? animate() : resolve($)
}
- const animate = () => {
+ const animate = _ => {
event.forEach(e => $.addEventListener(e, done))
$.classList.add('animated', commands[0])
}
|
Removes > 0 check and swaps out () for _
|
diff --git a/client/lib/signup/step-actions.js b/client/lib/signup/step-actions.js
index <HASH>..<HASH> 100644
--- a/client/lib/signup/step-actions.js
+++ b/client/lib/signup/step-actions.js
@@ -175,10 +175,12 @@ export function createSiteWithCart(
const importingFromUrl =
'import' === flowName ? normalizeImportUrl( getNuxUrlInputValue( state ) ) : '';
+ const importEngine = 'import' === flowName ? getSelectedImportEngine( state ) : '';
if ( importingFromUrl ) {
newSiteParams.blog_name = importingFromUrl;
newSiteParams.find_available_url = true;
+ newSiteParams.options.nux_import_engine = importEngine;
} else if (
flowName === 'onboarding' &&
'remove' === getABTestVariation( 'removeDomainsStepFromOnboarding' )
|
Import Signup Flow: Include import engine in options to new site endpoint (#<I>)
|
diff --git a/environs/cloudinit/cloudinit.go b/environs/cloudinit/cloudinit.go
index <HASH>..<HASH> 100644
--- a/environs/cloudinit/cloudinit.go
+++ b/environs/cloudinit/cloudinit.go
@@ -194,7 +194,9 @@ func addMongoToBoot(c *cloudinit.Config) error {
conf := &upstart.Conf{
Service: *svc,
Desc: "juju state database",
- Cmd: "/opt/mongo/bin/mongod --port 37017 --bind_ip 0.0.0.0 --dbpath=/var/lib/juju/db --noprealloc",
+ Cmd: fmt.Sprintf(
+ "/opt/mongo/bin/mongod --port %d --bind_ip 0.0.0.0 --dbpath=/var/lib/juju/db --noprealloc --smallfiles",
+ mgoPort),
}
cmds, err := conf.InstallCommands()
if err != nil {
|
environs/cloudinit: add flags to try to make mongo start more quickly
|
diff --git a/tests/markFeatureWriter_test.py b/tests/markFeatureWriter_test.py
index <HASH>..<HASH> 100644
--- a/tests/markFeatureWriter_test.py
+++ b/tests/markFeatureWriter_test.py
@@ -31,6 +31,21 @@ class MarkFeatureWriterTest(unittest.TestCase):
'markClass cedilla <anchor 100 0> @MC_bottom;\n\n'
'markClass grave <anchor 100 200> @MC_top;')
+ def test_skip_empty_feature(self):
+ ufo = Font()
+ glyph = ufo.newGlyph('a')
+ glyph.appendAnchor(glyph.anchorClass(
+ anchorDict={'name': 'top', 'x': 100, 'y': 200}))
+ glyph = ufo.newGlyph('acutecomb')
+ glyph.appendAnchor(glyph.anchorClass(
+ anchorDict={'name': '_top', 'x': 100, 'y': 200}))
+
+ writer = MarkFeatureWriter(ufo)
+ fea = writer.write()
+
+ self.assertIn("feature mark", fea)
+ self.assertNotIn("feature mkmk", fea)
+
if __name__ == '__main__':
unittest.main()
|
[markFeatureWriter_test] add test for skipping empty feature
|
diff --git a/packages/plugin-rss-feed/src/index.js b/packages/plugin-rss-feed/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/plugin-rss-feed/src/index.js
+++ b/packages/plugin-rss-feed/src/index.js
@@ -106,12 +106,18 @@ const rssFeed: PhenomicPluginModule<options> = (
getFeedKeys(options).forEach(feedUrl => {
router.get("/" + feedUrl, async (req, res: express$Response) => {
debug(req.url);
- const output = await makeFeed(
- getRoot(config),
- feedUrl,
- options.feeds[feedUrl]
- );
- res.type("xml").send(output);
+ try {
+ const output = await makeFeed(
+ getRoot(config),
+ feedUrl,
+ options.feeds[feedUrl]
+ );
+ res.type("xml").send(output);
+ } catch (error) {
+ log.error(error.toString());
+ debug(error);
+ res.status(500).end();
+ }
});
});
return [router];
|
🚨 `phenomic/plugin-rss-feed`: fail with a http <I> if rss feed fail to be generated
|
diff --git a/src/WPConfigTransformer.php b/src/WPConfigTransformer.php
index <HASH>..<HASH> 100644
--- a/src/WPConfigTransformer.php
+++ b/src/WPConfigTransformer.php
@@ -99,7 +99,7 @@ class WPConfigTransformer {
$defaults = array(
'raw' => false, // Display value in raw format without quotes.
'target' => "/* That's all, stop editing!", // Config placement target string.
- 'buffer' => "\n\n", // Buffer between config definition and target string.
+ 'buffer' => PHP_EOL . PHP_EOL, // Buffer between config definition and target string.
'placement' => 'before', // Config placement direction (insert before or after).
);
|
Use PHP_EOL in target buffer
|
diff --git a/modules/dropdown/js/dropdown_directive.js b/modules/dropdown/js/dropdown_directive.js
index <HASH>..<HASH> 100644
--- a/modules/dropdown/js/dropdown_directive.js
+++ b/modules/dropdown/js/dropdown_directive.js
@@ -383,7 +383,7 @@
function onDocumentClick() {
$timeout(function nextDigest() {
LxDropdownService.close(lxDropdown.uuid, true);
- })
+ }, 250)
}
function openDropdownMenu()
|
fix(dropdown): add timeout for ios
|
diff --git a/public/js/admin/config.js b/public/js/admin/config.js
index <HASH>..<HASH> 100644
--- a/public/js/admin/config.js
+++ b/public/js/admin/config.js
@@ -1,6 +1,6 @@
var rcmConfig = {
filebrowserBrowseUrl: '/elfinder',
- filebrowserWindowHeight : '400',
+ filebrowserWindowHeight : null,
filebrowserWindowWidth : null
};
@@ -30,7 +30,7 @@ var rcmCkConfig = {
],
filebrowserBrowseUrl : '/elfinder/ckeditor',
filebrowserImageBrowseUrl : '/elfinder/ckeditor/images',
- filebrowserWindowHeight : '400',
+ filebrowserWindowHeight : null,
filebrowserWindowWidth : null,
basicEntities : false,
allowedContent : true,
|
PROD-<I> : Set CKEditor and Standalone instance to be hight of window and added autogrow.
|
diff --git a/manifest.php b/manifest.php
index <HASH>..<HASH> 100755
--- a/manifest.php
+++ b/manifest.php
@@ -31,7 +31,7 @@ return array(
'label' => 'Test core extension',
'description' => 'TAO Tests extension contains the abstraction of the test-runners, but requires an implementation in order to be able to run tests',
'license' => 'GPL-2.0',
- 'version' => '11.2.0',
+ 'version' => '11.2.1',
'author' => 'Open Assessment Technologies, CRP Henri Tudor',
'requires' => array(
'generis' => '>=7.1.0',
diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
index <HASH>..<HASH> 100644
--- a/scripts/update/Updater.php
+++ b/scripts/update/Updater.php
@@ -135,6 +135,6 @@ class Updater extends \common_ext_ExtensionUpdater
$this->setVersion('7.8.0');
}
- $this->skip('7.8.0', '11.2.0');
+ $this->skip('7.8.0', '11.2.1');
}
}
|
TAO-<I> - The version is changed <I> => <I>
|
diff --git a/server/src/main/java/org/jboss/as/server/deployment/DeploymentUnitPhaseService.java b/server/src/main/java/org/jboss/as/server/deployment/DeploymentUnitPhaseService.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/org/jboss/as/server/deployment/DeploymentUnitPhaseService.java
+++ b/server/src/main/java/org/jboss/as/server/deployment/DeploymentUnitPhaseService.java
@@ -132,7 +132,7 @@ final class DeploymentUnitPhaseService<T> implements Service<T> {
final DeploymentUnit deploymentUnitContext = deploymentUnitInjector.getValue();
final DeployerChains chains = deployerChainsInjector.getValue();
final List<DeploymentUnitProcessor> list = chains.getChain(phase);
- final ListIterator<DeploymentUnitProcessor> iterator = list.listIterator();
+ final ListIterator<DeploymentUnitProcessor> iterator = list.listIterator(list.size());
while (iterator.hasPrevious()) {
final DeploymentUnitProcessor prev = iterator.previous();
safeUndeploy(deploymentUnitContext, phase, prev);
|
Correctly setup the ListIterator in DUPService.stop
was: db2c<I>dda<I>e<I>f4e<I>accfc<I>e4c<I>
|
diff --git a/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java b/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
@@ -267,6 +267,7 @@ public class DistributionInterceptor extends BaseRpcInterceptor {
* time. If the operation didn't originate locally we won't do any replication either.
*/
private Object handleWriteCommand(InvocationContext ctx, WriteCommand command, RecipientGenerator recipientGenerator, boolean skipRemoteGet) throws Throwable {
+ // TODO Remove isSingleOwnerAndLocal() once https://jira.jboss.org/jira/browse/JGRP-1084 has been implemented
boolean localModeForced = isLocalModeForced(ctx) || isSingleOwnerAndLocal(recipientGenerator);
// see if we need to load values from remote srcs first
if (!skipRemoteGet) remoteGetBeforeWrite(ctx, command.isConditional(), recipientGenerator);
|
Added TODO so that [ISPN-<I>] optimization is removed once [JGRP-<I>]
|
diff --git a/src/javascript/runtime/html5/image/Image.js b/src/javascript/runtime/html5/image/Image.js
index <HASH>..<HASH> 100644
--- a/src/javascript/runtime/html5/image/Image.js
+++ b/src/javascript/runtime/html5/image/Image.js
@@ -251,11 +251,17 @@ define("moxie/runtime/html5/image/Image", [
// use FileReader if it's available
if (window.FileReader) {
- fr = new FileReader();
- fr.onload = function() {
- callback(this.result);
- };
- fr.readAsBinaryString(file);
+ if (FileReader.readAsBinaryString) {
+ fr = new FileReader();
+ fr.onload = function() {
+ callback(this.result);
+ };
+ fr.readAsBinaryString(file);
+ } else {
+ _readAsDataUrl(file, function(result) {
+ callback(_convertToBinary(result));
+ });
+ }
} else {
return callback(file.getAsBinary());
}
|
Image, HTML5: Use readAsDataURL for preloading where readAsBinaryString is not available. Address #<I>.
|
diff --git a/sdk/dist/cc.js b/sdk/dist/cc.js
index <HASH>..<HASH> 100644
--- a/sdk/dist/cc.js
+++ b/sdk/dist/cc.js
@@ -2291,7 +2291,7 @@ cc.Util = {
for (index in iterable) {
if (Object.prototype.hasOwnProperty.call(iterable, index)) {
- if (callback(iterable[index], index, collection) === cc.Util.indicatorObject) {
+ if (callback(iterable[index], index, collection) === false) {
return result;
}
}
diff --git a/sdk/src/core/cc.util.js b/sdk/src/core/cc.util.js
index <HASH>..<HASH> 100644
--- a/sdk/src/core/cc.util.js
+++ b/sdk/src/core/cc.util.js
@@ -184,7 +184,7 @@ cc.Util = {
for (index in iterable) {
if (Object.prototype.hasOwnProperty.call(iterable, index)) {
- if (callback(iterable[index], index, collection) === cc.Util.indicatorObject) {
+ if (callback(iterable[index], index, collection) === false) {
return result;
}
}
|
fix(cc.util): make forOwn allow early breakout as intended
|
diff --git a/salt/cloud/clouds/digital_ocean.py b/salt/cloud/clouds/digital_ocean.py
index <HASH>..<HASH> 100644
--- a/salt/cloud/clouds/digital_ocean.py
+++ b/salt/cloud/clouds/digital_ocean.py
@@ -281,6 +281,12 @@ def create(vm_):
)
)
+ if key_filename is None:
+ raise SaltCloudConfigError(
+ 'The Digital Ocean driver requires a ssh_key_file because it does not supply a root password '
+ 'upon building the server'
+ )
+
private_networking = config.get_cloud_config_value(
'private_networking', vm_, __opts__, search_global=False, default=None,
)
|
digital ocean requires an ssh key file
The api does not return a root password via the api, and it also does
not return one when calling for a root password reset. The password is
only sent via email to the user.
|
diff --git a/tests/spec/fs.rename.spec.js b/tests/spec/fs.rename.spec.js
index <HASH>..<HASH> 100644
--- a/tests/spec/fs.rename.spec.js
+++ b/tests/spec/fs.rename.spec.js
@@ -10,6 +10,23 @@ describe('fs.rename', function() {
expect(fs.rename).to.be.a('function');
});
+ it.skip('should be able to rename an existing file to the same filename', function(done) {
+ var fs = util.fs();
+
+ fs.open('/myfile', 'w+', function(error, fd) {
+ if(error) throw error;
+
+ fs.close(fd, function(error) {
+ if(error) throw error;
+
+ fs.rename('/myfile', '/myfile', function(error) {
+ expect(error).not.to.exist;
+ done();
+ });
+ });
+ });
+ });
+
it('should rename an existing file', function(done) {
var complete1 = false;
var complete2 = false;
|
rename() should be able to rename an existing file to the same filename (#<I>)
* rename should not change name to itself
* new test expects failure
* should rename an existing file to itself
* should rename an existing file to itself
* Update tests/spec/fs.rename.spec.js
* add .skip to the test
|
diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
index <HASH>..<HASH> 100644
--- a/tests/unit/grains/test_core.py
+++ b/tests/unit/grains/test_core.py
@@ -2160,6 +2160,12 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
"GeForce GTX 950M",
"nvidia",
], # 3D controller
+ [
+ "Display controller",
+ "Intel Corporation",
+ "HD Graphics P630",
+ "intel",
+ ], # Display controller
]
with patch.dict(
core.__salt__, {"cmd.run": MagicMock(side_effect=_cmd_side_effect)}
|
Updating test_linux_gpus to include display controller changes.
|
diff --git a/lib/searchlogic/search.rb b/lib/searchlogic/search.rb
index <HASH>..<HASH> 100644
--- a/lib/searchlogic/search.rb
+++ b/lib/searchlogic/search.rb
@@ -117,7 +117,11 @@ module Searchlogic
end
def normalize_scope_name(scope_name)
- klass.column_names.include?(scope_name.to_s) ? "#{scope_name}_equals".to_sym : scope_name.to_sym
+ case
+ when klass.scopes.key?(scope_name.to_sym) then scope_name.to_sym
+ when klass.column_names.include?(scope_name.to_s) then "#{scope_name}_equals".to_sym
+ else scope_name.to_sym
+ end
end
def setter?(name)
|
Modified Searchlogic::Search#normalize_scope_name to account for user-defined scopes that share their names with column names.
|
diff --git a/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java b/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java
index <HASH>..<HASH> 100644
--- a/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java
+++ b/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
import java.io.File;
import org.neo4j.driver.v1.Config;
+import org.neo4j.driver.v1.util.FileTools;
import static java.lang.System.getProperty;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -92,7 +93,7 @@ public class ConfigTest
{
if( DEFAULT_KNOWN_HOSTS.exists() )
{
- DEFAULT_KNOWN_HOSTS.delete();
+ FileTools.deleteFile( DEFAULT_KNOWN_HOSTS );
}
}
|
Fix the bug that windows cert file is not deleted
|
diff --git a/modelx/core/api.py b/modelx/core/api.py
index <HASH>..<HASH> 100644
--- a/modelx/core/api.py
+++ b/modelx/core/api.py
@@ -168,7 +168,10 @@ def cur_model(name=None):
If ``name`` is not given, the current model is returned.
"""
if name is None:
- return _system.currentmodel.interface
+ if _system.currentmodel is not None:
+ return _system.currentmodel.interface
+ else:
+ return None
else:
_system.currentmodel = _system.models[name]
return _system.currentmodel.interface
@@ -183,7 +186,13 @@ def cur_space(name=None):
is returned.
"""
if name is None:
- return _system.currentmodel.currentspace.interface
+ if _system.currentmodel is not None:
+ if _system.currentmodel.currentspace is not None:
+ return _system.currentmodel.currentspace.interface
+ else:
+ return None
+ else:
+ return None
else:
_system.currentmodel.currentspace = _system.currentmodel.spaces[name]
return cur_space()
|
ENH: cur_model and cur_space to return None if not set
|
diff --git a/Twilio/VersionInfo.php b/Twilio/VersionInfo.php
index <HASH>..<HASH> 100644
--- a/Twilio/VersionInfo.php
+++ b/Twilio/VersionInfo.php
@@ -5,9 +5,9 @@ namespace Twilio;
class VersionInfo {
- const MAJOR = '';
- const MINOR = '';
- const PATCH = '';
+ const MAJOR = 5;
+ const MINOR = 2;
+ const PATCH = 0;
public static function string() {
return implode('.', array(self::MAJOR, self::MINOR, self::PATCH));
diff --git a/deploy.php b/deploy.php
index <HASH>..<HASH> 100644
--- a/deploy.php
+++ b/deploy.php
@@ -10,7 +10,7 @@ $args = $_SERVER['argv'];
array_shift($args);
if ($args) {
- $version = $args;
+ $version = $args[0];
} else {
$patchParts = explode('-', VersionInfo::PATCH);
$lastPatch = array_pop($patchParts);
|
Bumping to version <I>
|
diff --git a/public/javascript/pump/model.js b/public/javascript/pump/model.js
index <HASH>..<HASH> 100644
--- a/public/javascript/pump/model.js
+++ b/public/javascript/pump/model.js
@@ -513,7 +513,7 @@
stream.getNext(stream.maxCount(), function(err, data) {
if (err) {
callback(err);
- } else if (data.items && data.items.length > 0) {
+ } else if (data.items && data.items.length > 0 && stream.items.length < stream.get("totalItems")) {
// recurse
stream.getAllNext(callback);
} else {
@@ -527,7 +527,7 @@
stream.getPrev(stream.maxCount(), function(err, data) {
if (err) {
callback(err);
- } else if (data.items && data.items.length > 0) {
+ } else if (data.items && data.items.length > 0 && stream.items.length < stream.get("totalItems")) {
// recurse
stream.getAllPrev(callback);
} else {
|
Don't recurse if we already have all known members
|
diff --git a/Minimal-J/src/main/java/ch/openech/mj/db/AbstractTable.java b/Minimal-J/src/main/java/ch/openech/mj/db/AbstractTable.java
index <HASH>..<HASH> 100644
--- a/Minimal-J/src/main/java/ch/openech/mj/db/AbstractTable.java
+++ b/Minimal-J/src/main/java/ch/openech/mj/db/AbstractTable.java
@@ -509,7 +509,6 @@ public abstract class AbstractTable<T> {
}
public ColumnIndexUnqiue<T> createIndexUnique(PropertyInterface property, String fieldPath) {
- sqlLogger.info("Create index on " + getTableName() + " with: " + fieldPath);
Map.Entry<String, PropertyInterface> entry = findX(fieldPath);
ColumnIndex<?> innerIndex = null;
|
AbstractTable: removed logging when index is created
|
diff --git a/image.php b/image.php
index <HASH>..<HASH> 100644
--- a/image.php
+++ b/image.php
@@ -373,7 +373,7 @@ class Image {
**/
function captcha($font,$size=24,$len=5,
$key=NULL,$path='',$fg=0xFFFFFF,$bg=0x000000,$alpha=0) {
- if ($len<4 && $len>23) {
+ if ($len<4 || $len>22) {
user_error(sprintf(self::E_Length,$len));
return FALSE;
}
@@ -381,7 +381,8 @@ class Image {
$fw=Base::instance();
foreach ($fw->split($path?:$fw->get('UI').';./') as $dir)
if (is_file($path=$dir.$font)) {
- $seed=strtoupper(substr(uniqid(),-$len));
+ $seed=strtoupper(substr(
+ str_replace('.','',uniqid('',TRUE)),-$len));
$block=$size*3;
$tmp=array();
for ($i=0,$width=0,$height=0;$i<$len;$i++) {
|
Improve detection of acceptable limits in captcha() (Feature request #<I>)
|
diff --git a/lib/specials.js b/lib/specials.js
index <HASH>..<HASH> 100644
--- a/lib/specials.js
+++ b/lib/specials.js
@@ -1,6 +1,8 @@
const intended = [
'ZEIT',
'ZEIT Inc.',
+ 'Vercel',
+ 'Vercel Inc.',
'CLI',
'API',
'HTTP',
@@ -10,6 +12,8 @@ const intended = [
'URL',
'now.sh',
'now.json',
+ 'vercel.app',
+ 'vercel.json',
'CI',
'CDN',
'package.json',
|
Add Vercel to specials (#<I>)
|
diff --git a/src/Picqer/Financials/Exact/Account.php b/src/Picqer/Financials/Exact/Account.php
index <HASH>..<HASH> 100644
--- a/src/Picqer/Financials/Exact/Account.php
+++ b/src/Picqer/Financials/Exact/Account.php
@@ -20,7 +20,8 @@ class Account extends Model {
'Name',
'Phone',
'Postcode',
- 'Website'
+ 'Website',
+ 'Status'
];
protected $url = 'crm/Accounts';
|
Added 'Sales' property to Account
|
diff --git a/argonaut.go b/argonaut.go
index <HASH>..<HASH> 100644
--- a/argonaut.go
+++ b/argonaut.go
@@ -240,7 +240,7 @@ func generateCommand(v interface{}, toplevel bool) ([]string, string, error) {
} else if tag.SuffixPrevious {
// SuffixPrevious: modifies the last argument on the command stack with the current value
// ---------------------------------------------------------------------------------
- if len(command) > 0 {
+ if len(command) > 0 && (!typeutil.IsZero(value) || tag.Required) {
last := command[len(command)-1]
last += tag.DelimiterAt(0)
|
Only apply SuffixPrevious if the value is non-zero or required
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ def read(fname):
setup(
name='segments',
- version="1.1.0",
+ version="1.1.1",
description='',
long_description=read("README.rst"),
author='Steven Moran and Robert Forkel',
diff --git a/src/segments/__init__.py b/src/segments/__init__.py
index <HASH>..<HASH> 100644
--- a/src/segments/__init__.py
+++ b/src/segments/__init__.py
@@ -1,4 +1,4 @@
from segments.tokenizer import Tokenizer, Profile, Rules # noqa: F401
-__version__ = '1.1.0'
+__version__ = '1.1.1'
__all__ = ['Tokenizer', 'Profile', 'Rules']
|
bumped version number to <I>
|
diff --git a/system_maintenance/admin.py b/system_maintenance/admin.py
index <HASH>..<HASH> 100644
--- a/system_maintenance/admin.py
+++ b/system_maintenance/admin.py
@@ -1,3 +1,10 @@
from django.contrib import admin
-# Register your models here.
+from .models import Maintenance, MaintenanceType, Software, SysAdmin, System
+
+
+admin.site.register(Maintenance)
+admin.site.register(MaintenanceType)
+admin.site.register(Software)
+admin.site.register(SysAdmin)
+admin.site.register(System)
|
Register basic admins for system maintenance models
|
diff --git a/blocks/course_overview/version.php b/blocks/course_overview/version.php
index <HASH>..<HASH> 100644
--- a/blocks/course_overview/version.php
+++ b/blocks/course_overview/version.php
@@ -25,5 +25,5 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2012121000; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires = 2012121000; // Requires this Moodle version
+$plugin->requires = 2012061700; // Requires this Moodle version
$plugin->component = 'block_course_overview'; // Full name of the plugin (used for diagnostics)
|
MDL-<I> course_overview block: fix idiot version
I will shoot the programmer responsible for this mess.
|
diff --git a/lib/dry/view/decorator.rb b/lib/dry/view/decorator.rb
index <HASH>..<HASH> 100644
--- a/lib/dry/view/decorator.rb
+++ b/lib/dry/view/decorator.rb
@@ -6,8 +6,9 @@ module Dry
class Decorator
attr_reader :config
+ # @api public
def call(name, value, renderer:, context:, **options)
- klass = part_class(name, options)
+ klass = part_class(name, value, **options)
if value.respond_to?(:to_ary)
singular_name = Inflecto.singularize(name).to_sym
@@ -18,7 +19,8 @@ module Dry
end
end
- def part_class(name, options)
+ # @api public
+ def part_class(name, value, **options)
options.fetch(:as) { Part }
end
end
|
Pass options to Decorator#part_class as a splat
Since this is a method we support overriding in subclasses, the splat makes it possible for overrides methods to declare required keyword arguments.
|
diff --git a/Auth/OpenID/CryptUtil.php b/Auth/OpenID/CryptUtil.php
index <HASH>..<HASH> 100644
--- a/Auth/OpenID/CryptUtil.php
+++ b/Auth/OpenID/CryptUtil.php
@@ -538,11 +538,6 @@ class Auth_OpenID_MathWrapper {
class Auth_OpenID_BcMathWrapper extends Auth_OpenID_MathWrapper {
var $type = 'bcmath';
- function random($min, $max)
- {
- return mt_rand($min, $max);
- }
-
function add($x, $y)
{
return bcadd($x, $y);
|
[project @ Remove insecure random call from math library]
|
diff --git a/lib/dynamoRequest.js b/lib/dynamoRequest.js
index <HASH>..<HASH> 100644
--- a/lib/dynamoRequest.js
+++ b/lib/dynamoRequest.js
@@ -93,6 +93,7 @@ module.exports = function(type, parameters, opts, callback) {
var meta = {};
if (resp.ConsumedCapacity) meta.capacity = resp.ConsumedCapacity;
+ if (resp.LastEvaluatedKey) meta.last = resp.LastEvaluatedKey;
metas.push(meta);
while (read && items.length > 0) {
|
Pass last evaluated key to caller.
last key in metas now.
|
diff --git a/lib/email_notify.rb b/lib/email_notify.rb
index <HASH>..<HASH> 100644
--- a/lib/email_notify.rb
+++ b/lib/email_notify.rb
@@ -28,7 +28,7 @@ class EmailNotify
# Send a welcome mail to the user created
def self.send_user_create_notification(user)
begin
- email_notification = NotificationMailer.notif_user(user)
+ email = NotificationMailer.notif_user(user)
email.deliver
rescue => err
logger.error "Unable to send notification of create user email: #{err.inspect}"
|
Update email_notify.rb
Change email_notification to email to fix password reset etc.
|
diff --git a/spyderlib/widgets/__init__.py b/spyderlib/widgets/__init__.py
index <HASH>..<HASH> 100644
--- a/spyderlib/widgets/__init__.py
+++ b/spyderlib/widgets/__init__.py
@@ -109,19 +109,23 @@ class OneColumnTree(QTreeWidget):
"""Save all items expanded state"""
self.__expanded_state = {}
def add_to_state(item):
+ user_text = get_item_user_text(item)
+ self.__expanded_state[user_text] = item.isExpanded()
+ def browse_children(item):
+ add_to_state(item)
for index in range(item.childCount()):
citem = item.child(index)
user_text = get_item_user_text(citem)
self.__expanded_state[user_text] = citem.isExpanded()
- add_to_state(citem)
+ browse_children(citem)
for tlitem in self.get_top_level_items():
- add_to_state(tlitem)
+ browse_children(tlitem)
def restore_expanded_state(self):
"""Restore all items expanded state"""
if self.__expanded_state is None:
return
- for item in self.get_items():
+ for item in self.get_items()+self.get_top_level_items():
user_text = get_item_user_text(item)
is_expanded = self.__expanded_state.get(user_text)
if is_expanded is not None:
|
Tree widgets: "expanded state" of top level items is now saved/restored (Class Browser)
|
diff --git a/tests/testcases/rabbit/asyn/rabbit_asynchronous_tests.py b/tests/testcases/rabbit/asyn/rabbit_asynchronous_tests.py
index <HASH>..<HASH> 100644
--- a/tests/testcases/rabbit/asyn/rabbit_asynchronous_tests.py
+++ b/tests/testcases/rabbit/asyn/rabbit_asynchronous_tests.py
@@ -239,8 +239,7 @@ class RabbitAsynConnectorTestCase(unittest.TestCase):
# Check that the four messages were NOT put into the queue:
queue = testrabbit._AsynchronousRabbitConnector__unpublished_messages_queue
- with self.assertRaises(Queue.Empty):
- queue.get(False)
+ self.assertTrue(queue.empty())
def test_send_message_user_closed(self):
@@ -268,8 +267,7 @@ class RabbitAsynConnectorTestCase(unittest.TestCase):
# Check that the four messages were NOT put into the queue:
queue = testrabbit._AsynchronousRabbitConnector__unpublished_messages_queue
- with self.assertRaises(Queue.Empty):
- queue.get(False)
+ self.assertTrue(queue.empty())
#
|
Change tests to check if queue is empty
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -4,12 +4,13 @@ from os.path import dirname, join
import sys, os
# When creating the sdist, make sure the django.mo file also exists:
-try:
- os.chdir('fluent_dashboard')
- from django.core.management.commands.compilemessages import compile_messages
- compile_messages(sys.stderr)
-finally:
- os.chdir('..')
+if 'sdist' in sys.argv:
+ try:
+ os.chdir('fluent_dashboard')
+ from django.core.management.commands.compilemessages import compile_messages
+ compile_messages(sys.stderr)
+ finally:
+ os.chdir('..')
setup(
|
setup.py: only generate django.po during sdist
|
diff --git a/sramongo/mongo_schema.py b/sramongo/mongo_schema.py
index <HASH>..<HASH> 100644
--- a/sramongo/mongo_schema.py
+++ b/sramongo/mongo_schema.py
@@ -414,6 +414,8 @@ class Sample(Document):
ddbj_links = ListField(EmbeddedDocumentField(DDBJLink), default=list)
ena_links = ListField(EmbeddedDocumentField(ENALink), default=list)
+ meta = {'allow_inheritance': True}
+
def __str__(self):
return DocumentString(self).string
@@ -509,6 +511,8 @@ class Experiment(Document):
db_flags = ListField(StringField(), default=list)
pipeline_flags = ListField(StringField(), default=list)
+ meta = {'allow_inheritance': True}
+
def __str__(self):
return DocumentString(self).string
@@ -629,6 +633,8 @@ class Run(Document):
db_created = DateTimeField(default=datetime.datetime.now)
db_modified = DateTimeField()
+ meta = {'allow_inheritance': True}
+
def __str__(self):
return DocumentString(self).string
|
Adds inheritance to Sample, Experiment, and Run.
|
diff --git a/umi_tools/group.py b/umi_tools/group.py
index <HASH>..<HASH> 100644
--- a/umi_tools/group.py
+++ b/umi_tools/group.py
@@ -456,7 +456,7 @@ def main(argv=None):
gene_tag = metatag
else:
- inreads = infile.fetch()
+ inreads = infile.fetch(until_eof=options.output_unmapped)
gene_tag = options.gene_tag
for bundle, read_events, status in umi_methods.get_bundles(
|
resolves bug introduced with group + unmapped reads
|
diff --git a/src/client/pkg/grpcutil/dialer.go b/src/client/pkg/grpcutil/dialer.go
index <HASH>..<HASH> 100644
--- a/src/client/pkg/grpcutil/dialer.go
+++ b/src/client/pkg/grpcutil/dialer.go
@@ -36,7 +36,6 @@ func newDialer(opts ...grpc.DialOption) *dialer {
func (d *dialer) Dial(addr string) (*grpc.ClientConn, error) {
d.lock.Lock()
defer d.lock.Unlock()
-
if conn, ok := d.connMap[addr]; ok {
return conn, nil
}
@@ -44,10 +43,11 @@ func (d *dialer) Dial(addr string) (*grpc.ClientConn, error) {
grpc.WithUnaryInterceptor(tracing.UnaryClientInterceptor()),
grpc.WithStreamInterceptor(tracing.StreamClientInterceptor()),
)
- if !strings.HasPrefix(addr, "dns:///") {
- addr = "dns:///" + addr
+ daddr := addr
+ if !strings.HasPrefix(daddr, "dns:///") {
+ daddr = "dns:///" + daddr
}
- conn, err := grpc.Dial(addr, opts...)
+ conn, err := grpc.Dial(daddr, opts...)
if err != nil {
return nil, err
}
|
Don't override addr
|
diff --git a/nyawc/helpers/PackageHelper.py b/nyawc/helpers/PackageHelper.py
index <HASH>..<HASH> 100644
--- a/nyawc/helpers/PackageHelper.py
+++ b/nyawc/helpers/PackageHelper.py
@@ -78,6 +78,7 @@ class PackageHelper:
semver = open(folder + "/../../.semver", "r")
PackageHelper.__version = semver.read()
semver.close()
+ return PackageHelper.__version
except:
pass
@@ -86,6 +87,7 @@ class PackageHelper:
distribution = pkg_resources.get_distribution(PackageHelper.get_alias())
if distribution.version:
PackageHelper.__version = distribution.version
+ return PackageHelper.__version
except:
pass
|
Fixed invalid semver version on GIT clone.
|
diff --git a/views/v3/partials/hero.blade.php b/views/v3/partials/hero.blade.php
index <HASH>..<HASH> 100644
--- a/views/v3/partials/hero.blade.php
+++ b/views/v3/partials/hero.blade.php
@@ -2,7 +2,7 @@
<div id="sidebar-slider-area--container" class="o-container o-container--fullwidth u-print-display--none">
@if (is_active_sidebar('slider-area') === true )
- @includeIf('partials.sidebar', ['id' => 'slider-area', 'classes' => ['o-grid', 'o-grid--no-margin']])
+ @includeIf('partials.sidebar', ['id' => 'slider-area', 'classes' => ['o-grid', 'o-grid--no-margin', 'o-grid--no-gutter']])
{{-- Search in hero --}}
@includeWhen($showHeroSearch, 'partials.search.hero-search-form')
|
- remove gutter from hero (#<I>)
|
diff --git a/example.js b/example.js
index <HASH>..<HASH> 100644
--- a/example.js
+++ b/example.js
@@ -1,9 +1,9 @@
var Pokeio = require('./poke.io')
-var location = 'Stockflethsvej 39';
-
-var username = 'Arm4x';
-var password = 'OHSHITWADDUP';
+//Set environment variables or replace placeholder text
+var location = process.env.PGO_LOCATION || 'times squere';
+var username = process.env.PGO_USERNAME || 'USERNAME';
+var password = process.env.PGO_PASSWORD || 'PASSWORD';
Pokeio.SetLocation(location, function(err, loc) {
if (err) throw err;
|
Add optional env vars to prevent additional leakage of personal info
|
diff --git a/src/sentry_plugins/github/plugin.py b/src/sentry_plugins/github/plugin.py
index <HASH>..<HASH> 100644
--- a/src/sentry_plugins/github/plugin.py
+++ b/src/sentry_plugins/github/plugin.py
@@ -334,8 +334,10 @@ class GitHubRepositoryProvider(GitHubMixin, providers.RepositoryProvider):
raise NotImplementedError('Cannot fetch commits anonymously')
client = self.get_client(actor)
+ # use config name because that is kept in sync via webhooks
+ name = repo.config['name']
try:
- res = client.compare_commits(repo, start_sha, end_sha)
+ res = client.compare_commits(name, start_sha, end_sha)
except Exception as e:
self.raise_error(e)
- return [{'id': c['sha'], 'repository': repo} for c in res['commits']]
+ return [{'id': c['sha'], 'repository': repo.name} for c in res['commits']]
|
update compare_commits to take repo model (#<I>)
* update compare_commits to take repo model
* allow keyerrors
|
diff --git a/DependencyInjection/DoctrineMongoDBExtension.php b/DependencyInjection/DoctrineMongoDBExtension.php
index <HASH>..<HASH> 100644
--- a/DependencyInjection/DoctrineMongoDBExtension.php
+++ b/DependencyInjection/DoctrineMongoDBExtension.php
@@ -106,7 +106,7 @@ class DoctrineMongoDBExtension extends AbstractDoctrineExtension
$container
);
- $this->loadConstraints($config, $container);
+ $this->loadConstraints($container);
}
/**
@@ -339,7 +339,7 @@ class DoctrineMongoDBExtension extends AbstractDoctrineExtension
$odmConfigDef->addMethodCall('setDocumentNamespaces', array($this->aliasMap));
}
- protected function loadConstraints($config, ContainerBuilder $container)
+ protected function loadConstraints(ContainerBuilder $container)
{
if ($container->hasParameter('validator.annotations.namespaces')) {
$container->setParameter('validator.annotations.namespaces', array_merge(
|
[DoctrineMongoDBBundle] Removing unused variable.
|
diff --git a/app/javascript/client_messenger/homePanel.js b/app/javascript/client_messenger/homePanel.js
index <HASH>..<HASH> 100644
--- a/app/javascript/client_messenger/homePanel.js
+++ b/app/javascript/client_messenger/homePanel.js
@@ -148,12 +148,12 @@ const HomePanel = ({
const sameDay = nextDay === today
const nextWeek = nextDay < today
- if(nextWeek) return <p>volvemos la proxima semana</p>
- if(sameDay) return <p>{t("availability.aprox", {time: at.getHours() })}</p>
+ if(nextWeek) return <Availability><p>volvemos la proxima semana</p></Availability>
+ if(sameDay) return <Availability><p>{t("availability.aprox", {time: at.getHours() })}</p></Availability>
const out = text(val, sameDay, at)
- return out && <Availability>{out}</Availability>
+ return <Availability>{out}</Availability>
}
function text(val, sameDay, at){
|
Update homePanel.js
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -106,7 +106,7 @@ setup(
setup_requires=['numpy>=1.14.3', 'setuptools>=18.0'],
python_requires='>=3.6',
install_requires=["numpy>=1.14.3", "requests", "ruamel.yaml>=0.15.6",
- "monty>=3.0.2", "scipy>=1.0.1",
+ "monty>=3.0.2", "scipy>=1.5.0",
"tabulate", "spglib>=1.9.9.44", "networkx>=2.2",
"matplotlib>=1.5", "palettable>=3.1.1", "sympy", "pandas",
"plotly>=4.5.0"],
|
Make sure scipy version is at least <I> for isntall. Otherwise
FortranEOFError import in pymatgen.io.wannier does not exist.
|
diff --git a/modules/custom/d_p_subscribe_file/src/Forms/SubscribeFileForm.php b/modules/custom/d_p_subscribe_file/src/Forms/SubscribeFileForm.php
index <HASH>..<HASH> 100644
--- a/modules/custom/d_p_subscribe_file/src/Forms/SubscribeFileForm.php
+++ b/modules/custom/d_p_subscribe_file/src/Forms/SubscribeFileForm.php
@@ -66,13 +66,17 @@ class SubscribeFileForm extends FormBase {
'#value' => $this->t('Get Download link'),
];
- $consents = $paragraph->get('field_d_p_sf_consent')->getValue();
- foreach ($consents as $key => $consent) {
- $form["consent_$key"] = [
- '#type' => 'checkbox',
- '#title' => $consent['value'],
- '#required' => TRUE,
- ];
+ // Keep compatibility with older Droopler.
+ // Check field existence first.
+ if ($paragraph->hasField('field_d_p_sf_consent')) {
+ $consents = $paragraph->get('field_d_p_sf_consent')->getValue();
+ foreach ($consents as $key => $consent) {
+ $form["consent_$key"] = [
+ '#type' => 'checkbox',
+ '#title' => $consent['value'],
+ '#required' => TRUE,
+ ];
+ }
}
$file = $paragraph->get('field_file_download');
|
Issue #<I>: Improved compatibility with beta2
|
diff --git a/Entity/TaxClass.php b/Entity/TaxClass.php
index <HASH>..<HASH> 100644
--- a/Entity/TaxClass.php
+++ b/Entity/TaxClass.php
@@ -96,6 +96,21 @@ class TaxClass
}
/**
+ * @return TaxClassTranslation|null
+ */
+ public function getTranslation($locale)
+ {
+ /** @var TaxClassTranslation $translation */
+ foreach ($this->getTranslations() as $translation) {
+ if ($translation->getLocale() === $locale) {
+ return $translation;
+ }
+ }
+
+ return null;
+ }
+
+ /**
* @param Product $product
*
* @return self
|
added function to get translation by locale in tax-class entity
|
diff --git a/tests/test_cli.py b/tests/test_cli.py
index <HASH>..<HASH> 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -1167,12 +1167,13 @@ def no_warning():
# There should be no warning
for record in records:
- # Temporary exception for for this one, see #865
+ # Temporary exception for this one, see #865
+ # (does not seem to not occur anymore, as of April 2022, see #947)
if (
"Passing a schema to Validator.iter_errors is deprecated "
"and will be removed in a future release" in str(record.message)
):
- continue
+ continue # pragma: no cover
raise RuntimeError(record)
|
Ignore non-coverage of exception (#<I>)
|
diff --git a/src/main/java/org/jboss/netty/util/ExecutorUtil.java b/src/main/java/org/jboss/netty/util/ExecutorUtil.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/netty/util/ExecutorUtil.java
+++ b/src/main/java/org/jboss/netty/util/ExecutorUtil.java
@@ -74,6 +74,17 @@ public class ExecutorUtil {
for (;;) {
try {
es.shutdownNow();
+ } catch (SecurityException ex) {
+ // Running in a restricted environment - fall back.
+ try {
+ es.shutdown();
+ } catch (SecurityException ex2) {
+ // Running in a more restricted environment.
+ // Can't shut down this executor - skip to the next.
+ break;
+ } catch (NullPointerException ex2) {
+ // Some JDK throws NPE here, but shouldn't.
+ }
} catch (NullPointerException ex) {
// Some JDK throws NPE here, but shouldn't.
}
|
Fixed issue: NETTY-<I> Unable to run netty client with a Security Manager
|
diff --git a/LiSE/LiSE/proxy.py b/LiSE/LiSE/proxy.py
index <HASH>..<HASH> 100644
--- a/LiSE/LiSE/proxy.py
+++ b/LiSE/LiSE/proxy.py
@@ -3251,11 +3251,6 @@ class EngineProxy(AbstractEngine):
return cls(self.character[char].portal[nodeA][nodeB], k, v)
else:
return tuple(self.json_rewrap(v) for v in r)
- elif isinstance(r, dict):
- return {
- self.json_rewrap(k): self.json_rewrap(v)
- for (k, v) in r.items()
- }
elif isinstance(r, list):
return [self.json_rewrap(v) for v in r]
return r
|
Don't mess with dicts in json_rewrap
They'll never represent anything actually stored in LiSE, only
stuff like diffs. So I don't have to worry so much that the user
will want to put something weird in there.
In any case, it was causing RecursionError.
|
diff --git a/findimports.py b/findimports.py
index <HASH>..<HASH> 100755
--- a/findimports.py
+++ b/findimports.py
@@ -344,21 +344,6 @@ class ImportInfo(object):
level=self.level
)
- @property
- def toplvl_name(self):
- """Return the 'toplevel' name of an import.
-
- For example, these imports :
- import numpy as np
- from .directory.filename import function
- import scipy.io
- have respectively the following toplevel names :
- numpy
- filename
- scipy
- """
- return self.name
-
class ImportFinder(ast.NodeVisitor):
"""AST visitor that collects all imported names in its imports attribute.
@@ -718,7 +703,7 @@ class ModuleGraph(object):
dir = os.path.dirname(filename)
if ignore_stdlib_modules:
module.imported_names = list(filter(
- lambda modname: modname.toplvl_name not in STDLIB_MODNAMES_SET,
+ lambda modname: modname.name not in STDLIB_MODNAMES_SET,
module.imported_names
))
module.imports = {
|
removed unecessary property of ImportInfo class 'toplvl_name'
|
diff --git a/lib/queue.js b/lib/queue.js
index <HASH>..<HASH> 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -49,7 +49,6 @@ function Queue(process, opts) {
// TODO: Hold queue (wait for some event; like reconnect)
// TODO: Priority function
- // TODO: Load from persistent storage
}
Queue.prototype.resume = function (cb) {
|
fixup! Preparing for persistence
|
diff --git a/src/Command/PlatformLoginCommand.php b/src/Command/PlatformLoginCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/PlatformLoginCommand.php
+++ b/src/Command/PlatformLoginCommand.php
@@ -18,7 +18,11 @@ class PlatformLoginCommand extends PlatformCommand
public function isLocal()
{
- return TRUE;
+ return true;
+ }
+
+ public static function skipLogin() {
+ return true;
}
protected function execute(InputInterface $input, OutputInterface $output)
|
Don't force logging in to run the login command (fixes #<I>).
|
diff --git a/src/ViewRenderer.php b/src/ViewRenderer.php
index <HASH>..<HASH> 100644
--- a/src/ViewRenderer.php
+++ b/src/ViewRenderer.php
@@ -13,7 +13,7 @@ class ViewRenderer
public function render($path, $data)
{
- $data = $this->addMeta($data);
+ $data = $this->updateMetaForCollectionItem($data);
return $this->viewFactory->file(
$path,
@@ -21,10 +21,13 @@ class ViewRenderer
)->render();
}
- private function addMeta($data)
+ private function updateMetaForCollectionItem($data)
{
- $data['path'] = trim(array_get($data, 'link'), '/');
- $data['url'] = rtrim(array_get($data, 'url'), '/') . '/' . trim(array_get($data, 'link'), '/');
+ if ($data->item) {
+ $data->link = $data->item->link;
+ $data->path = $data->item->path;
+ $data->url = $data->item->url;
+ }
return $data;
}
|
Update ViewRenderer to use CollectionItem's path-related meta
|
diff --git a/components/dialog-ng/dialog-ng.js b/components/dialog-ng/dialog-ng.js
index <HASH>..<HASH> 100644
--- a/components/dialog-ng/dialog-ng.js
+++ b/components/dialog-ng/dialog-ng.js
@@ -3,7 +3,7 @@ import angular from 'angular';
import angularSanitize from 'angular-sanitize';
import 'dom4';
-import createFocusTrap from 'focus-trap';
+import {createFocusTrap} from 'focus-trap';
import {getRect, getStyles} from '../global/dom';
import RingAngularComponent from '../global/ring-angular-component';
|
Fix eslint: use named import
|
diff --git a/lib/stealth/cli.rb b/lib/stealth/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/stealth/cli.rb
+++ b/lib/stealth/cli.rb
@@ -95,16 +95,16 @@ module Stealth
service_setup_klass.trigger
end
-
- desc 'clear_sessions', 'Clears all sessions in development'
+ desc 'sessions:clear', 'Clears all sessions in development'
long_desc <<-EOS
- `stealth clear_sessions` clears all sessions from Redis in development.
+ `stealth sessions:clear` clears all sessions from Redis in development.
- $ > stealth clear_sessions
+ $ > stealth sessions:clear
EOS
- def clear_sessions
+ define_method 'sessions:clear' do
Stealth.load_environment
- $redis.flushdb if ENV['STEALTH_ENV'] == 'development'
+ $redis.flushdb if Stealth.env == 'development'
end
+
end
end
|
Rename to sessions:clear
Pretty hacky way to get around Thor’s antiquated namespacing.
|
diff --git a/bin/prey.js b/bin/prey.js
index <HASH>..<HASH> 100755
--- a/bin/prey.js
+++ b/bin/prey.js
@@ -89,7 +89,9 @@ process.on('uncaughtException', function (err) {
// launcher
/////////////////////////////////////////////////////////////
-common.helpers.check_and_store_pid(pid_file, function(running_pid){
+common.helpers.check_and_store_pid(pid_file, function(err, running_pid){
+
+ if(err) throw(err);
if(running_pid){
var signal = process.env.TRIGGER ? 'SIGUSR2' : 'SIGUSR1';
|
Updated bin/prey with new (err, pid) callback from helpers.check_and_store_pid_file.
|
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index <HASH>..<HASH> 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -287,8 +287,8 @@ class icon_system_fontawesome extends icon_system_font {
'core:i/log' => 'fa-list-alt',
'core:i/mahara_host' => 'fa-id-badge',
'core:i/manual_item' => 'fa-square-o',
- 'core:i/marked' => 'fa-check-square',
- 'core:i/marker' => 'fa-user-o',
+ 'core:i/marked' => 'fa-circle',
+ 'core:i/marker' => 'fa-circle-o',
'core:i/mean' => 'fa-calculator',
'core:i/menu' => 'fa-ellipsis-v',
'core:i/mnethost' => 'fa-external-link',
|
MDL-<I> icons: Fix fontawesome for i/marker and i/marked icons
These combo icons are used to mark something the current element. They
are supposed to be used in places like the course outline to
mark/highlight a section as the current one. Also workshop uses them to
switch to a phase (mark it as the current one).
|
diff --git a/source/CAS/Client.php b/source/CAS/Client.php
index <HASH>..<HASH> 100755
--- a/source/CAS/Client.php
+++ b/source/CAS/Client.php
@@ -1202,6 +1202,9 @@ class CAS_Client
flush();
phpCAS::traceExit();
throw new CAS_GracefullTerminationException();
+ } else {
+ phpCAS::trace('Already authenticated, but skipping ticket clearing since setNoClearTicketsFromUrl() was used.');
+ $res = true;
}
} else {
// the user has already (previously during the session) been
|
#<I> Fix for case where already authenticated, but given new proxy ticket.
When a proxied service receives a second request with a valid session cookie
the authentication is still valid. If a proxy ticket is also included it
is superfluous and can be ignored while using the existing authenticated
session.
This change ensures that isAuthenticated() continues to return true based on
the valid session cookie, ignoring the extra proxy ticket.
|
diff --git a/lib/rb/lib/thrift/server/tserver.rb b/lib/rb/lib/thrift/server/tserver.rb
index <HASH>..<HASH> 100644
--- a/lib/rb/lib/thrift/server/tserver.rb
+++ b/lib/rb/lib/thrift/server/tserver.rb
@@ -32,23 +32,26 @@ class TSimpleServer < TServer
end
def serve()
- @serverTransport.listen()
- while (true)
- client = @serverTransport.accept()
- trans = @transportFactory.getTransport(client)
- prot = @protocolFactory.getProtocol(trans)
- begin
- while (true)
- @processor.process(prot, prot)
+ begin
+ @serverTransport.listen()
+ while (true)
+ client = @serverTransport.accept()
+ trans = @transportFactory.getTransport(client)
+ prot = @protocolFactory.getProtocol(trans)
+ begin
+ while (true)
+ @processor.process(prot, prot)
+ end
+ rescue TTransportException, TProtocolException => ttx
+ #print ttx,"\n"
+ ensure
+ trans.close()
end
- rescue TTransportException, TProtocolException => ttx
- #print ttx,"\n"
- ensure
- trans.close()
end
+ ensure
+ @serverTransport.close()
end
end
-
end
begin
|
Thrift/Ruby: TSimpleServer closes its listen socket on an uncaught exception.
Submitted by William Morgan.
Approved by Kevin Clark.
git-svn-id: <URL>
|
diff --git a/server.go b/server.go
index <HASH>..<HASH> 100644
--- a/server.go
+++ b/server.go
@@ -495,7 +495,9 @@ func (s *Server) Do(command Command) (interface{}, error) {
select {
case <-entry.commit:
debugln("[Do] finish!")
- return entry.result, nil
+ result := entry.result
+ entry.result = nil
+ return result, nil
case <-time.After(time.Second):
debugln("[Do] fail!")
return nil, errors.New("Command commit fails")
|
Clear reference to LogEntry.result after return.
|
diff --git a/gtfspy/gtfs.py b/gtfspy/gtfs.py
index <HASH>..<HASH> 100644
--- a/gtfspy/gtfs.py
+++ b/gtfspy/gtfs.py
@@ -39,7 +39,7 @@ class GTFS(object):
# page cache size, in negative KiB.
self.conn.execute('PRAGMA cache_size = -2000000;')
else:
- raise EnvironmentError("File " + fname_or_conn + " missing")
+ raise FileNotFoundError("File " + fname_or_conn + " missing")
elif isinstance(fname_or_conn, sqlite3.Connection):
self.conn = fname_or_conn
self._dont_close = True
@@ -57,7 +57,7 @@ class GTFS(object):
self._timezone = pytz.timezone(self.get_timezone_name())
def __del__(self):
- if not getattr(self, '_dont_close', False):
+ if not getattr(self, '_dont_close', False) and hasattr(self, "conn"):
self.conn.close()
@classmethod
|
Make the __del__ of GTFS object to not raise an error, if the path given to the database is not correct
|
diff --git a/workflow/controller/controller_test.go b/workflow/controller/controller_test.go
index <HASH>..<HASH> 100644
--- a/workflow/controller/controller_test.go
+++ b/workflow/controller/controller_test.go
@@ -281,9 +281,7 @@ func withAnnotation(key, val string) with {
// createRunningPods creates the pods that are marked as running in a given test so that they can be accessed by the
// pod assessor
-// This function is called `createRunningPods`, but since it is currently not used and should not be removed it has been
-// renamed to `_` until a use is found.
-func _(ctx context.Context, woc *wfOperationCtx) {
+func createRunningPods(ctx context.Context, woc *wfOperationCtx) {
podcs := woc.controller.kubeclientset.CoreV1().Pods(woc.wf.GetNamespace())
for _, node := range woc.wf.Status.Nodes {
if node.Type == wfv1.NodeTypePod && node.Phase == wfv1.NodeRunning {
|
fix: Fix unit test with missing createRunningPods() (#<I>)
|
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidWorker.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidWorker.java
index <HASH>..<HASH> 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidWorker.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidWorker.java
@@ -134,9 +134,9 @@ public class RapidoidWorker extends AbstractEventLoop<RapidoidWorker> {
connecting.add(target);
if (target.socketChannel.connect(target.addr)) {
- Log.debug("Opened socket, connected", "address", target.addr);
+ Log.info("Opened socket, connected", "address", target.addr);
} else {
- Log.debug("Opened socket, connecting...", "address", target.addr);
+ Log.info("Opened socket, connecting...", "address", target.addr);
}
selector.wakeup();
@@ -168,6 +168,9 @@ public class RapidoidWorker extends AbstractEventLoop<RapidoidWorker> {
try {
ready = socketChannel.finishConnect();
U.rteIf(!ready, "Expected an established connection!");
+
+ Log.info("Connected", "address", target.addr);
+
connected.add(new RapidoidChannel(socketChannel, true, target.protocol, target.holder,
target.autoreconnecting, target.state));
} catch (ConnectException e) {
|
Logging info about the client connection lifecycle.
|
diff --git a/src/main/java/eu/project/ttc/models/scored/ScoredTermOrVariant.java b/src/main/java/eu/project/ttc/models/scored/ScoredTermOrVariant.java
index <HASH>..<HASH> 100644
--- a/src/main/java/eu/project/ttc/models/scored/ScoredTermOrVariant.java
+++ b/src/main/java/eu/project/ttc/models/scored/ScoredTermOrVariant.java
@@ -84,5 +84,21 @@ public abstract class ScoredTermOrVariant {
public double getOrthographicScore() {
return StringUtils.getOrthographicScore(getTerm().getLemma());
}
-
+
+ public boolean isScoredTerm() {
+ return this instanceof ScoredTerm;
+ }
+
+ public ScoredTerm asScoredTerm() {
+ return (ScoredTerm)this;
+ }
+
+ public boolean isScoredVariation() {
+ return this instanceof ScoredVariation;
+ }
+
+ public ScoredVariation asScoredVariation() {
+ return (ScoredVariation)this;
+ }
+
}
|
Added utility methods to ScoredTermOrVariant.java
|
diff --git a/src/com/google/javascript/jscomp/TranspilationPasses.java b/src/com/google/javascript/jscomp/TranspilationPasses.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/TranspilationPasses.java
+++ b/src/com/google/javascript/jscomp/TranspilationPasses.java
@@ -122,12 +122,12 @@ public class TranspilationPasses {
passes.add(es6ExtractClasses);
passes.add(es6RewriteClass);
passes.add(es6RewriteRestAndSpread);
+ passes.add(es6ConvertSuperConstructorCalls);
passes.add(lateConvertEs6ToEs3);
passes.add(es6ForOf);
passes.add(rewriteBlockScopedFunctionDeclaration);
passes.add(rewriteBlockScopedDeclaration);
passes.add(rewriteGenerators);
- passes.add(es6ConvertSuperConstructorCalls);
} else if (options.needsTranspilationOf(Feature.OBJECT_PATTERN_REST)) {
passes.add(es6RenameVariablesInParamLists);
passes.add(es6SplitVariableDeclarations);
|
Move Es6ConvertSuperConstructorCalls just after Es6RewriteRestAndSpread
This is a step toward merging Es6ConvertSuperConstructorCalls into Es6RewriteClass.
It was run very late, because it ran after type checking before any of the other
ES6 transpilation passes did, but now they all run after type checking.
-------------
Created by MOE: <URL>
|
diff --git a/foolbox/attacks/ead.py b/foolbox/attacks/ead.py
index <HASH>..<HASH> 100644
--- a/foolbox/attacks/ead.py
+++ b/foolbox/attacks/ead.py
@@ -177,7 +177,7 @@ class EADAttack(MinimizationAttack):
break # stop optimization if there has been no progress
loss_at_previous_check = loss.item()
- found_advs_iter = is_adversarial(x_k, logits)
+ found_advs_iter = is_adversarial(x_k, model(x_k))
best_advs, best_advs_norms = _apply_decision_rule(
self.decision_rule,
|
Fix bug when adversarial check is performed at y_k (#<I>)
|
diff --git a/features/support/pass_fail.rb b/features/support/pass_fail.rb
index <HASH>..<HASH> 100644
--- a/features/support/pass_fail.rb
+++ b/features/support/pass_fail.rb
@@ -3,22 +3,24 @@ require 'io/console'
module PassFail
def pass?
+ state = 'stty -g'
begin
- system("stty raw -echo -icanon isig")
+ system("stty raw -echo isig")
str = STDIN.getc.chr
- if str.chr == "p"
+ case
+ when str.chr == "p"
true
- elsif str.chr =="\r"
+ when str.chr =="\r"
true
- elsif str.chr == "f"
+ when str.chr == "f"
false
- elsif str.chr == "x"
+ when str.chr == "x"
false
else
- # Need this to return to the start if any other key
+ # something
end
ensure
- system("stty -raw echo icanon")
+ system("stty -raw echo")
end
end
|
Fix issue with terminal not reverting to normal after running
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.