diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/configure.js b/src/configure.js
index <HASH>..<HASH> 100644
--- a/src/configure.js
+++ b/src/configure.js
@@ -23,11 +23,11 @@ export class Configure {
.then(data => this.obj = data);
}
- directory(path) {
+ setDirectory(path) {
this.directory = path;
}
- file(name) {
+ setConfig(name) {
this.config = name;
}
|
Renamed methods that were clashing with class variables.
|
diff --git a/src/main/java/org/redisson/command/CommandAsyncService.java b/src/main/java/org/redisson/command/CommandAsyncService.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/redisson/command/CommandAsyncService.java
+++ b/src/main/java/org/redisson/command/CommandAsyncService.java
@@ -511,15 +511,14 @@ public class CommandAsyncService implements CommandAsyncExecutor {
int timeoutTime = connectionManager.getConfig().getTimeout();
if (QueueCommand.TIMEOUTLESS_COMMANDS.contains(details.getCommand().getName())) {
- // add 1.5 second due to issue https://github.com/antirez/redis/issues/874
- timeoutTime += Math.max(0, 1500 - timeoutTime);
-
Integer popTimeout = Integer.valueOf(details.getParams()[details.getParams().length - 1].toString());
handleBlockingOperations(details, connection, popTimeout);
if (popTimeout == 0) {
return;
}
timeoutTime += popTimeout*1000;
+ // add 1 second due to issue https://github.com/antirez/redis/issues/874
+ timeoutTime += 1000;
}
final int timeoutAmount = timeoutTime;
|
Add exactly 1 second to blpop timeout. #<I>
|
diff --git a/definitions/npm/express_v4.x.x/flow_v0.32.x-/express_v4.x.x.js b/definitions/npm/express_v4.x.x/flow_v0.32.x-/express_v4.x.x.js
index <HASH>..<HASH> 100644
--- a/definitions/npm/express_v4.x.x/flow_v0.32.x-/express_v4.x.x.js
+++ b/definitions/npm/express_v4.x.x/flow_v0.32.x-/express_v4.x.x.js
@@ -13,7 +13,7 @@ declare class express$RequestResponseBase {
declare class express$Request extends http$IncomingMessage mixins express$RequestResponseBase {
baseUrl: string;
- body: mixed;
+ body: any;
cookies: {[cookie: string]: string};
fresh: boolean;
hostname: string;
|
change req.body to any (#<I>)
|
diff --git a/library/CM/Usertext/Filter/Striptags.php b/library/CM/Usertext/Filter/Striptags.php
index <HASH>..<HASH> 100644
--- a/library/CM/Usertext/Filter/Striptags.php
+++ b/library/CM/Usertext/Filter/Striptags.php
@@ -2,20 +2,22 @@
class CM_Usertext_Filter_Striptags extends CM_Usertext_Filter_Abstract {
- private $_preserveParagraph;
+ private $_allowedTags;
/**
- * @param boolean $preserveParagraph
+ * @param array $allowedTags
*/
- function __construct($preserveParagraph = null) {
- $this->_preserveParagraph = (boolean) $preserveParagraph;
+ function __construct($allowedTags = null) {
+ $this->_allowedTags = (array) $allowedTags;
}
public function transform($text) {
$text = (string) $text;
- $allowedTags = null;
- if ($this->_preserveParagraph) {
- $allowedTags = '<p>';
+ $allowedTags = '';
+ if ($this->_allowedTags){
+ foreach($this->_allowedTags as $tag){
+ $allowedTags .= '<'.$tag.'>';
+ }
}
return strip_tags($text, $allowedTags);
}
|
CM_Usertext_Filter_Striptags: configurable as array of tags
|
diff --git a/para-server/src/main/java/com/erudika/para/security/JWTRestfulAuthFilter.java b/para-server/src/main/java/com/erudika/para/security/JWTRestfulAuthFilter.java
index <HASH>..<HASH> 100644
--- a/para-server/src/main/java/com/erudika/para/security/JWTRestfulAuthFilter.java
+++ b/para-server/src/main/java/com/erudika/para/security/JWTRestfulAuthFilter.java
@@ -167,7 +167,8 @@ public class JWTRestfulAuthFilter extends GenericFilterBean {
}
} else {
RestUtils.returnStatusResponse(response, HttpServletResponse.SC_BAD_REQUEST,
- "User belongs to an app that does not exist.");
+ "User belongs to app '" + appid + "' which does not exist. " +
+ (App.isRoot(appid) ? "Make sure you have initialized Para." : ""));
return false;
}
} else {
|
added more verbose log message for when a user belongs to an app that doesn't exist
|
diff --git a/guake/customcommands.py b/guake/customcommands.py
index <HASH>..<HASH> 100644
--- a/guake/customcommands.py
+++ b/guake/customcommands.py
@@ -49,6 +49,9 @@ class CustomCommands():
return os.path.expanduser(self.settings.general.get_string('custom-command-file'))
def _load_json(self, file_name):
+ if not os.path.exists(file_name):
+ log.error("Custom file does not exit: %s", file_name)
+ return None
try:
with open(file_name) as f:
data_file = f.read()
|
error on non existing custom file
instead of exception in logs
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -53,7 +53,7 @@ module.exports = function(grunt) {
mochacli: {
options: {
require: ['should'],
- reporter: 'nyan',
+ reporter: 'spec',
bail: true
},
all: ['test/**/*.js']
|
test: remove ASCII art (#<I>)
Closes #<I>
|
diff --git a/corelib/kernel.rb b/corelib/kernel.rb
index <HASH>..<HASH> 100644
--- a/corelib/kernel.rb
+++ b/corelib/kernel.rb
@@ -439,6 +439,7 @@ module Kernel
meta._proto = #{self}.constructor.prototype;
meta._isSingleton = true;
meta.__inc__ = [];
+ meta._methods = [];
meta._scope = #{self}._scope;
|
meta classes need _methods property to allow singleton def methods
|
diff --git a/lib/jwt/decode.rb b/lib/jwt/decode.rb
index <HASH>..<HASH> 100644
--- a/lib/jwt/decode.rb
+++ b/lib/jwt/decode.rb
@@ -22,7 +22,7 @@ module JWT
end
def decode_segments
- header_segment, payload_segment, crypto_segment = raw_segments(@jwt, @verify)
+ header_segment, payload_segment, crypto_segment = raw_segments
@header, @payload = decode_header_and_payload(header_segment, payload_segment)
@signature = Decode.base64url_decode(crypto_segment.to_s) if @verify
signing_input = [header_segment, payload_segment].join('.')
@@ -31,9 +31,9 @@ module JWT
private
- def raw_segments(jwt, verify)
- segments = jwt.split('.')
- required_num_segments = verify ? [3] : [2, 3]
+ def raw_segments
+ segments = @jwt.split('.')
+ required_num_segments = @verify ? [3] : [2, 3]
raise(JWT::DecodeError, 'Not enough or too many segments') unless required_num_segments.include? segments.length
segments
end
|
Refactor raw_segments.raw_segments
Remove parameters as they are already instance vars.
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,7 +37,7 @@
};
v.prototype.for = (iterator, func)=>{
for (let i = iterator.length - 1; i >= 0; i--) {
- func.apply(this, [iterator[i], arguments]);
+ func.apply(this, [iterator[i], i, arguments]);
}
};
v.prototype.forIn = (props, func)=>{
|
Add the index itself to the for method arguments
|
diff --git a/config-templates/authsources.php b/config-templates/authsources.php
index <HASH>..<HASH> 100644
--- a/config-templates/authsources.php
+++ b/config-templates/authsources.php
@@ -74,7 +74,7 @@ $config = array(
* An authentication source which can authenticate against both SAML 2.0
* and Shibboleth 1.3 IdPs.
*/
- 'example-saml' => array(
+ 'saml' => array(
'saml:SP',
/*
|
Renaming SAML auth source to be saml and not saml-example
|
diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index <HASH>..<HASH> 100644
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -39,7 +39,7 @@
* The chart canvas has already been created by the Dygraph object. The
* renderer simply gets a drawing context.
*
- * @param {Dyraph} dygraph The chart to which this renderer belongs.
+ * @param {Dygraph} dygraph The chart to which this renderer belongs.
* @param {Canvas} element The <canvas> DOM element on which to draw.
* @param {CanvasRenderingContext2D} elementContext The drawing context.
* @param {DygraphLayout} layout The chart's DygraphLayout object.
|
Closure fix type Dyraph->Dygraph.
|
diff --git a/Facades/Route.php b/Facades/Route.php
index <HASH>..<HASH> 100755
--- a/Facades/Route.php
+++ b/Facades/Route.php
@@ -5,7 +5,6 @@ namespace Illuminate\Support\Facades;
/**
* @method static \Illuminate\Routing\Route fallback(\Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route get(string $uri, \Closure|array|string|callable|null $action = null)
- * @method static \Illuminate\Routing\Route head(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route post(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route put(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route delete(string $uri, \Closure|array|string|callable|null $action = null)
|
Revert adding head method to router (#<I>)
This reverts <URL>
|
diff --git a/formats/cql.py b/formats/cql.py
index <HASH>..<HASH> 100644
--- a/formats/cql.py
+++ b/formats/cql.py
@@ -108,6 +108,8 @@ class TokenExpression(object):
attribexprs.append(attribexpr)
else:
raise SyntaxError("Unexpected char whilst parsing token expression, position " + str(i) + ": " + s[i])
+ else:
+ raise SyntaxError("Expected token expression starting with either \" or [, got: " + s[i])
if i == len(s):
interval = None #end of query!
diff --git a/formats/folia.py b/formats/folia.py
index <HASH>..<HASH> 100644
--- a/formats/folia.py
+++ b/formats/folia.py
@@ -600,7 +600,7 @@ class AbstractElement(object):
return self.text(cls,retaintokenisation=True)
def text(self, cls='current', retaintokenisation=False, previousdelimiter="",strict=False):
- """Get the text associated with this element (of the specified class), will always be a unicode instance.
+ """Get the text associated with this element (of the specified class) (will always be a unicode instance in python 2)
The text will be constructed from child-elements whereever possible, as they are more specific.
If no text can be obtained from the children and the element has itself text associated with
|
Fixed major CQL parse bug that caused and infinite loop and memory drain on invalid input
|
diff --git a/searchtweets/result_stream.py b/searchtweets/result_stream.py
index <HASH>..<HASH> 100644
--- a/searchtweets/result_stream.py
+++ b/searchtweets/result_stream.py
@@ -155,7 +155,7 @@ class ResultStream:
session_request_counter = 0
def __init__(self, endpoint, rule_payload, username=None, password=None,
- bearer_token=None, max_results=1000,
+ bearer_token=None, max_results=500,
tweetify=True, max_requests=None, **kwargs):
self.username = username
|
chagned max_results default value for ResultStream object to be inline with elsewhere in the library
|
diff --git a/examples/qidle/qidle/main_window.py b/examples/qidle/qidle/main_window.py
index <HASH>..<HASH> 100644
--- a/examples/qidle/qidle/main_window.py
+++ b/examples/qidle/qidle/main_window.py
@@ -150,7 +150,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
"""
editor = PyCodeEdit(self)
self.setup_editor(editor)
- self.tabWidget.add_code_edit(editor, 'New document')
+ self.tabWidget.add_code_edit(editor, 'New document.py')
self.actionRun.setDisabled(True)
self.actionConfigure_run.setDisabled(True)
|
QIdle: Use "New document.py" (so that mimetype and tab icon are properly detected)
|
diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index <HASH>..<HASH> 100644
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -1331,7 +1331,7 @@ class grade_item extends grade_object {
if ($grade_category->aggregatesubcats) {
// return all children excluding category items
- $params[] = $grade_category->id;
+ $params[] = '%/' . $grade_category->id . '/%';
$sql = "SELECT gi.id
FROM {grade_items} gi
WHERE $gtypes
@@ -1339,8 +1339,7 @@ class grade_item extends grade_object {
AND gi.categoryid IN (
SELECT gc.id
FROM {grade_categories} gc
- WHERE gc.path LIKE '%/?/%')";
-
+ WHERE gc.path LIKE ?)";
} else {
$params[] = $grade_category->id;
$params[] = $grade_category->id;
|
MDL-<I> Re-fixing a regression in dependency calculation
Sorry for the last commit. This should be the proper way. The problem
was with the question mark within quotes - it was not considered as a
placeholder.
|
diff --git a/lib/manager.js b/lib/manager.js
index <HASH>..<HASH> 100644
--- a/lib/manager.js
+++ b/lib/manager.js
@@ -82,6 +82,8 @@ function Manager (server) {
, 'browser client handler': false
};
+ this.initStore();
+
// reset listeners
this.oldListeners = server.listeners('request');
server.removeAllListeners('request');
|
Added call to `initStore` to initialize subscriptions.
|
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Routing/RouteCollection.php
+++ b/src/Symfony/Component/Routing/RouteCollection.php
@@ -95,7 +95,7 @@ class RouteCollection implements \IteratorAggregate
public function add($name, Route $route)
{
if (!preg_match('/^[a-z0-9A-Z_.]+$/', $name)) {
- throw new \InvalidArgumentException(sprintf('Name "%s" contains non valid characters for a route name.', $name));
+ throw new \InvalidArgumentException(sprintf('The provided route name "%s" contains non valid characters. A route name must only contain digits (0-9), letters (A-Z), underscores (_) and dots (.).', $name));
}
$parent = $this;
|
[Routing] improved exception message when giving an invalid route name.
|
diff --git a/shared/reducers/chat2.js b/shared/reducers/chat2.js
index <HASH>..<HASH> 100644
--- a/shared/reducers/chat2.js
+++ b/shared/reducers/chat2.js
@@ -462,14 +462,17 @@ const rootReducer = (state: Types.State = initialState, action: Chat2Gen.Actions
} else if (message.type === 'placeholder') {
// sometimes we send then get a placeholder for that send. Lets see if we already have the message id for the sent
// and ignore the placeholder in that instance
+ logger.info(`Got placeholder message with id: ${message.id}`)
const existingOrdinal = messageIDToOrdinal(
- messageMap,
+ state.messageMap,
pendingOutboxToOrdinal,
conversationIDKey,
message.id
)
if (!existingOrdinal) {
arr.push(message.ordinal)
+ } else {
+ logger.info(`Skipping placeholder for message with id ${message.id} because already exists`)
}
} else {
arr.push(message.ordinal)
|
fix undefined var (#<I>)
|
diff --git a/gnsq/stream/stream.py b/gnsq/stream/stream.py
index <HASH>..<HASH> 100644
--- a/gnsq/stream/stream.py
+++ b/gnsq/stream/stream.py
@@ -104,7 +104,6 @@ class Stream(object):
self.state = DISCONNECTED
self.queue.put(StopIteration)
- self.socket.close()
def send_loop(self):
for data, result in self.queue:
@@ -122,6 +121,8 @@ class Stream(object):
except Exception as error:
result.set_exception(error)
+ self.socket.close()
+
def upgrade_to_tls(
self,
keyfile=None,
|
Close socket only after all the messages have been sent.
|
diff --git a/testutil/wait.go b/testutil/wait.go
index <HASH>..<HASH> 100644
--- a/testutil/wait.go
+++ b/testutil/wait.go
@@ -11,7 +11,7 @@ type testFn func() (bool, error)
type errorFn func(error)
func WaitForResult(test testFn, error errorFn) {
- retries := 100
+ retries := 200
for retries > 0 {
time.Sleep(100 * time.Millisecond)
|
Adds more time to WaitForResult.
The last change here made the time overall theoretically the same, but the overhead of running so quickly before probably meant that we were spending longer. Tests seemed marginal in Travis so doubling this to see how things go.
|
diff --git a/owslib/swe/common.py b/owslib/swe/common.py
index <HASH>..<HASH> 100644
--- a/owslib/swe/common.py
+++ b/owslib/swe/common.py
@@ -109,7 +109,7 @@ class AbstractSimpleComponent(AbstractDataComponent):
self.axisID = testXMLAttribute(element,"axisID") # string, optional
# Elements
- self.quality = filter(None, [Quality(e) for e in element.findall(nspv("swe20:quality"))])
+ self.quality = filter(None, [Quality(q) for q in [e.find('*') for e in element.findall(nspv("swe20:quality"))] if q is not None])
try:
self.nilValues = NilValues(element.find(nspv("swe20:nilValues")))
except:
@@ -119,13 +119,13 @@ class Quality(object):
def __new__(cls, element):
t = element.tag.split("}")[-1]
if t == "Quantity":
- return Quantity.__new__(element)
+ return Quantity(element)
elif t == "QuantityRange":
- return QuantityRange.__new__(element)
+ return QuantityRange(element)
elif t == "Category":
- return Category.__new__(element)
+ return Category(element)
elif t == "Text":
- return Text.__new__(element)
+ return Text(element)
else:
return None
|
Fix Quality factory
The factory was incorrectly defined, but masked by the fact it was never getting the correct elements anyway.
|
diff --git a/emma2/msm/analysis/dense/fingerprints.py b/emma2/msm/analysis/dense/fingerprints.py
index <HASH>..<HASH> 100644
--- a/emma2/msm/analysis/dense/fingerprints.py
+++ b/emma2/msm/analysis/dense/fingerprints.py
@@ -32,7 +32,6 @@ def fingerprint_correlation(P, obs1, obs2=None, tau=1):
Returns
-------
- (timescales, amplitudes)
timescales : ndarray, shape=(n-1)
timescales of the relaxation processes of P
amplitudes : ndarray, shape=(n-1)
|
[msm/analysis/dense] Slight modifications to the fingerprint_correlation and fingerprint_relaxation functions
|
diff --git a/select2.js b/select2.js
index <HASH>..<HASH> 100644
--- a/select2.js
+++ b/select2.js
@@ -1714,7 +1714,7 @@ the specific language governing permissions and limitations under the Apache Lic
self.liveRegion.text(results.text());
}
else {
- self.liveRegion.text(self.opts.formatMatches(results.find('.select2-result-selectable').length));
+ self.liveRegion.text(self.opts.formatMatches(results.find('.select2-result-selectable:not(".select2-selected")').length));
}
}
|
Fixes results count in accessible text
Only counts the selectable items in the list. (filter out selected item)
|
diff --git a/test/run_all.rb b/test/run_all.rb
index <HASH>..<HASH> 100644
--- a/test/run_all.rb
+++ b/test/run_all.rb
@@ -1,3 +1,15 @@
-Dir.glob("#{__dir__}/*_spec.rb").each do |spec_file|
- require_relative spec_file
+# Because of needing to isolate processes, I can't run all tests in one call.
+# This means that I have multiple sets of results which isn't nice, but the
+# tests are largely for the sake of TDD anyway.
+
+def run_test(component)
+ test_path = File.expand_path __dir__
+ IO.popen("ruby #{test_path}/#{component}_spec.rb") do |data|
+ while line = data.gets
+ puts line
+ end
+ end
end
+
+run_test 'input'
+run_test 'conveyor'
|
Committed to never running the tests together due to process initialization
|
diff --git a/jre_emul/android/platform/libcore/ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java b/jre_emul/android/platform/libcore/ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
index <HASH>..<HASH> 100644
--- a/jre_emul/android/platform/libcore/ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
+++ b/jre_emul/android/platform/libcore/ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
@@ -979,7 +979,7 @@ public class TestDateTimeFormatterBuilder {
public void test_getLocalizedDateTimePattern(FormatStyle dateStyle, FormatStyle timeStyle,
Chronology chrono, Locale locale, String expected) {
String actual = DateTimeFormatterBuilder.getLocalizedDateTimePattern(dateStyle, timeStyle, chrono, locale);
- assertEquals(actual, expected, "Pattern " + convertNonAscii(actual));
+ assertEquals("Pattern " + convertNonAscii(actual), actual, expected);
}
@Test(expected=java.lang.IllegalArgumentException.class)
|
java.time: fix order of arguments after converting from testng to junit.
|
diff --git a/src/Console/Commands/DebugBarAssetsCommand.php b/src/Console/Commands/DebugBarAssetsCommand.php
index <HASH>..<HASH> 100644
--- a/src/Console/Commands/DebugBarAssetsCommand.php
+++ b/src/Console/Commands/DebugBarAssetsCommand.php
@@ -80,8 +80,9 @@ class DebugBarAssetsCommand extends QtCommand
}
}
}
+
+ closedir($dir);
}
- closedir($dir);
}
}
|
Checking the directory for closedir() funcntion
|
diff --git a/wandb/board/ui/src/util/query.js b/wandb/board/ui/src/util/query.js
index <HASH>..<HASH> 100644
--- a/wandb/board/ui/src/util/query.js
+++ b/wandb/board/ui/src/util/query.js
@@ -53,9 +53,22 @@ export function merge(base, apply) {
result.strategy = apply.strategy;
result.entity = apply.entity || base.entity;
result.model = apply.model || base.model;
- result.filters = {...base.filters, ...apply.filters};
+
+ // base and apply may share keys, so we rekey
+ result.filters = {};
+ let filterIndex = 0;
+ for (var key of _.keys(base.filters)) {
+ result.filters[filterIndex] = base.filters[key];
+ filterIndex++;
+ }
+ for (var key of _.keys(apply.filters)) {
+ result.filters[filterIndex] = apply.filters[key];
+ filterIndex++;
+ }
+
// TODO: probably not the right thing to do
result.selections = {...base.selections};
+
result.sort = apply.sort || base.sort;
result.num_histories = apply.num_histories || base.num_histories;
return result;
|
Fix incorrect filter merge from page to panel
|
diff --git a/entity-store/src/main/java/jetbrains/exodus/entitystore/iterate/binop/BinaryOperatorEntityIterable.java b/entity-store/src/main/java/jetbrains/exodus/entitystore/iterate/binop/BinaryOperatorEntityIterable.java
index <HASH>..<HASH> 100644
--- a/entity-store/src/main/java/jetbrains/exodus/entitystore/iterate/binop/BinaryOperatorEntityIterable.java
+++ b/entity-store/src/main/java/jetbrains/exodus/entitystore/iterate/binop/BinaryOperatorEntityIterable.java
@@ -251,8 +251,8 @@ abstract class BinaryOperatorEntityIterable extends EntityIterableBase {
}
private static boolean shouldBinaryOperationBeCached(@NotNull EntityIterableBase iterable1, @NotNull EntityIterableBase iterable2) {
- return (iterable1.canBeCached() || iterable1.getHandle().getType().isPropertyIndex()) &&
- (iterable2.canBeCached() || iterable2.getHandle().getType().isPropertyIndex());
+ return (iterable1.getHandle().getType().isPropertyIndex() || iterable1.canBeCached()) &&
+ (iterable2.getHandle().getType().isPropertyIndex() || iterable2.canBeCached());
}
private static boolean isOrderOk(@NotNull final EntityIterableHandle handle1,
|
canBeCached() is too heavy for PropertyRangeOrValueIterableBase
|
diff --git a/src/info/eboost.js b/src/info/eboost.js
index <HASH>..<HASH> 100644
--- a/src/info/eboost.js
+++ b/src/info/eboost.js
@@ -74,7 +74,7 @@ const currencyInfo: EdgeCurrencyInfo = {
'electrums://electrum3.eboost.fun:50002',
'electrum://electrum1.eboost.fun:50001',
'electrum://electrum2.eboost.fun:50001',
- 'electrum://electrum3.eboost.fun:50001',
+ 'electrum://electrum3.eboost.fun:50001'
],
disableFetchingServers: true
},
|
[EBoost] Fix Trailing Comma on servers
|
diff --git a/src/Vectorface/SnappyRouter/Handler/AbstractHandler.php b/src/Vectorface/SnappyRouter/Handler/AbstractHandler.php
index <HASH>..<HASH> 100644
--- a/src/Vectorface/SnappyRouter/Handler/AbstractHandler.php
+++ b/src/Vectorface/SnappyRouter/Handler/AbstractHandler.php
@@ -3,7 +3,7 @@
namespace Vectorface\SnappyRouter\Handler;
use \Exception;
-use VectorFace\SnappyRouter\Config\Config;
+use Vectorface\SnappyRouter\Config\Config;
use Vectorface\SnappyRouter\Di\Di;
use Vectorface\SnappyRouter\Di\DiProviderInterface;
use Vectorface\SnappyRouter\Di\ServiceProvider;
|
Bug fix for case sensitive vendor name.
|
diff --git a/src/js/tempusdominus-bootstrap-4.js b/src/js/tempusdominus-bootstrap-4.js
index <HASH>..<HASH> 100644
--- a/src/js/tempusdominus-bootstrap-4.js
+++ b/src/js/tempusdominus-bootstrap-4.js
@@ -278,15 +278,15 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
self.widget.removeClass('float-right');
}
- // find the first parent element that has a static css positioning
- if (parent.css('position') !== 'static') {
+ // find the first parent element that has a relative css positioning
+ if (parent.css('position') !== 'relative') {
parent = parent.parents().filter(function () {
- return $(this).css('position') === 'static';
+ return $(this).css('position') === 'relative';
}).first();
}
if (parent.length === 0) {
- throw new Error('datetimepicker component should be placed within a static positioned container');
+ throw new Error('datetimepicker component should be placed within a relative positioned container');
}
self.widget.css({
|
datetimepicker component should be placed within a relative positioned container
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(
author_email="me@syrusakbary.com",
license="MIT",
classifiers=[
- "Development Status :: 4 - Beta",
+ "Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Topic :: Software Development :: Libraries",
"Programming Language :: Python :: 3",
|
setup.py upgrade development status to production/stable
|
diff --git a/django_markdown/static/django_markdown/markdown.js b/django_markdown/static/django_markdown/markdown.js
index <HASH>..<HASH> 100644
--- a/django_markdown/static/django_markdown/markdown.js
+++ b/django_markdown/static/django_markdown/markdown.js
@@ -101,6 +101,16 @@ miu = (function($){
* Editor instance: default mIu settings extended with what you passed to miu.init(..., extraSettings)
* */
var editorSettings = $.extend(settings, extraSettings);
+
+ /*
+ * Initialize/re-initialize the editor
+ * */
+ function init(){
+ with($('#' + textareaId)){
+ markItUpRemove();
+ markItUp(editorSettings);
+ }
+ }
/*
* Dynamicaly adds button to the editor at index position
@@ -128,20 +138,11 @@ miu = (function($){
function config(newSettings){
if(newSettings){
editorSettings = newSettings;
+ init();
}
return editorSettings;
}
- /*
- * Initialize/re-initialize the editor
- * */
- function init(){
- with($('#' + textareaId)){
- markItUpRemove();
- markItUp(editorSettings);
- }
- }
-
/* ----- initializing ------ */
this.addButton = addButton;
|
Reinit JS editor after new settings set
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index <HASH>..<HASH> 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.0
+
+- breaking change: the key "id" is not required anymore in the loaded data and
+ as such has been removed from the geojson Feature root.
+
## 1.0.0-rc.4
- housenumbers are not indexed anymore (to gain RAM), they are only matched in
@@ -37,6 +42,8 @@ and reindex everything.
`index` and `deindex` methods
- endpoints API changed
- by default, documents are now stored in a separate Redis database
+- the key "id" is not required anymore in the loaded data and as such has been
+ removed from the geojson Feature root.
### Minor changes
diff --git a/addok/helpers/formatters.py b/addok/helpers/formatters.py
index <HASH>..<HASH> 100644
--- a/addok/helpers/formatters.py
+++ b/addok/helpers/formatters.py
@@ -25,5 +25,4 @@ def geojson(result):
"coordinates": [float(result.lon), float(result.lat)]
},
"properties": properties,
- "id": result.id
}
diff --git a/tests/test_search.py b/tests/test_search.py
index <HASH>..<HASH> 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -1,5 +1,3 @@
-import pytest
-
from addok.core import Result, search
|
BREAKING: remove "id" from the geojson Feature root
|
diff --git a/workflow/executor/executor.go b/workflow/executor/executor.go
index <HASH>..<HASH> 100644
--- a/workflow/executor/executor.go
+++ b/workflow/executor/executor.go
@@ -40,6 +40,13 @@ import (
os_specific "github.com/argoproj/argo/workflow/executor/os-specific"
)
+var MainContainerStartRetry = wait.Backoff{
+ Steps: 8,
+ Duration: 1 * time.Second,
+ Factor: 1.0,
+ Jitter: 0.1,
+}
+
const (
// This directory temporarily stores the tarballs of the artifacts before uploading
tempOutArtDir = "/tmp/argo/outputs/artifacts"
@@ -936,7 +943,18 @@ func (we *WorkflowExecutor) waitMainContainerStart() (string, error) {
opts := metav1.ListOptions{
FieldSelector: fieldSelector.String(),
}
- watchIf, err := podsIf.Watch(opts)
+
+ var err error
+ var watchIf watch.Interface
+
+ err = wait.ExponentialBackoff(MainContainerStartRetry, func() (bool, error) {
+ watchIf, err = podsIf.Watch(opts)
+ if err != nil {
+ log.Debugf("Failed to establish watch, retrying: %v", err)
+ return false, nil
+ }
+ return true, nil
+ })
if err != nil {
return "", errors.InternalWrapErrorf(err, "Failed to establish pod watch: %v", err)
}
|
fix(executor): Add retry on pods watch to handle timeout. (#<I>)
|
diff --git a/sentry_hipchat_ac/cards.py b/sentry_hipchat_ac/cards.py
index <HASH>..<HASH> 100644
--- a/sentry_hipchat_ac/cards.py
+++ b/sentry_hipchat_ac/cards.py
@@ -4,9 +4,9 @@ from django.utils.html import escape
from sentry.models import Activity, User, Event
-ICON = 'https://s3.amazonaws.com/f.cl.ly/items/0X2q0W011B1i1m2D140m/sentry-icon.png'
-ICON2X = 'https://s3.amazonaws.com/f.cl.ly/items/0X2q0W011B1i1m2D140m/sentry-icon.png'
-ICON_SM = 'https://app.getsentry.com/_static/sentry/images/favicon.ico'
+ICON = 'https://sentry-hipchat-ac-assets.s3.amazonaws.com/sentry-icon.png'
+ICON2X = 'https://sentry-hipchat-ac-assets.s3.amazonaws.com/sentry-icon.png'
+ICON_SM = 'https://sentry-hipchat-ac-assets.s3.amazonaws.com/favicon.ico'
COLORS = {
'ALERT': 'red',
|
Pin image urls to static location
Fixes #<I>
|
diff --git a/pogobuf/pogobuf.client.js b/pogobuf/pogobuf.client.js
index <HASH>..<HASH> 100755
--- a/pogobuf/pogobuf.client.js
+++ b/pogobuf/pogobuf.client.js
@@ -828,7 +828,6 @@ function Client(options) {
this.authTicket = null;
this.rpcId = 2;
this.lastHashingKeyIndex = 0;
- this.firstGetMapObjects = true;
this.lehmer = new Lehmer(1);
/**
|
:lipstick: Remove inadvertently added variable
|
diff --git a/tests/YoutubeDlTest.php b/tests/YoutubeDlTest.php
index <HASH>..<HASH> 100644
--- a/tests/YoutubeDlTest.php
+++ b/tests/YoutubeDlTest.php
@@ -367,7 +367,7 @@ class YoutubeDlTest extends TestCase
$collection = $yt->download(Options::create()->cleanupMetadata(true)->downloadPath($this->tmpDir)->url($url));
foreach ($collection->getVideos() as $video) {
- self::assertFileNotExists($video->getMetadataFile()->getPathname());
+ self::assertFileDoesNotExist($video->getMetadataFile()->getPathname());
}
}
|
Don't use deprecated method in test
|
diff --git a/src/cli.js b/src/cli.js
index <HASH>..<HASH> 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -45,8 +45,8 @@ const entries = getEntries(command)
const outputFileMatrix = getOutputMatrix(command, PKG_CONFIG)
async function bundleAll() {
- if (!outputFileMatrix.main) {
- console.warn(chalk.red.bold("Missing `main` entry in `package.json`!"))
+ if (!outputFileMatrix.main && !entries.binary) {
+ console.warn(chalk.red.bold("Missing `main` or `bin` entry in `package.json`!"))
}
if (entries.node) {
|
Improved feedback when bundling plain cli apps.
|
diff --git a/client/html/src/Client/Html/Catalog/Base.php b/client/html/src/Client/Html/Catalog/Base.php
index <HASH>..<HASH> 100644
--- a/client/html/src/Client/Html/Catalog/Base.php
+++ b/client/html/src/Client/Html/Catalog/Base.php
@@ -34,11 +34,21 @@ abstract class Base
*/
protected function addAttributeFilterByParam( array $params, \Aimeos\MW\Criteria\Iface $filter )
{
- $attrids = ( isset( $params['f_attrid'] ) ? (array) $params['f_attrid'] : array() );
+ $attrids = array();
+
+ if( isset( $params['f_attrid'] ) )
+ {
+ foreach( (array) $params['f_attrid'] as $attrid )
+ {
+ if( $attrid != '' ) {
+ $attrids[] = (int) $attrid;
+ }
+ }
+ }
if( !empty( $attrids ) )
{
- $func = $filter->createFunction( 'index.attributeaggregate', array( array_keys( $attrids ) ) );
+ $func = $filter->createFunction( 'index.attributeaggregate', array( $attrids ) );
$expr = array(
$filter->getConditions(),
$filter->compare( '==', $func, count( $attrids ) ),
|
Allow attribute facets sent via form select
|
diff --git a/lib/collection/url.js b/lib/collection/url.js
index <HASH>..<HASH> 100644
--- a/lib/collection/url.js
+++ b/lib/collection/url.js
@@ -287,9 +287,12 @@ _.extend(Url, /** @lends Url */ {
_.isString(p.port) && (url = url.substr(p.port.length + 1));
// extract the path
- p.path = url.match(/.*?(?=\?|#|$)/);
- p.path = _.get(p.path, '[0]');
- _.isString(p.path) && ((url = url.substr(p.path.length)), (p.path = p.path.split('/')));
+ p.path = _.get(url.match(/.*?(?=\?|#|$)/), '[0]');
+ if (_.isString(p.path)) {
+ url = url.substr(p.path.length);
+ // if path is blank string, we set it to undefined, if '/' then single blank string array
+ p.path = !p.path ? undefined : (p.path === '/' ? [''] : p.path.split('/'));
+ }
// extract the query string
p.query = url.match(/^\?([^#$]+)/);
|
Fixed path parsing where path splitting was not being done correctly
|
diff --git a/scripts/install-dependencies.py b/scripts/install-dependencies.py
index <HASH>..<HASH> 100644
--- a/scripts/install-dependencies.py
+++ b/scripts/install-dependencies.py
@@ -13,7 +13,7 @@ home = os.path.expanduser('~')
dot_learnuv = os.path.join(home, '.learnuv')
def log_info(msg):
- print '\033[0;32mlearnuv\033[0m ' + msg
+ print('\033[0;32mlearnuv\033[0m ' + msg)
def mkdirp(dir):
try:
|
Fix install-dependencies.py
`npm install` does not fork on python ><I>
```File "scripts/install-dependencies.py", line <I>
print '\<I>[0;<I>mlearnuv\<I>[0m ' + msg```
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
setup(
name='slacker',
- version='0.8.6',
+ version='0.8.6.2',
packages=['slacker'],
description='Slack API client',
author='Oktay Sancak',
|
Set version number to <I>.
|
diff --git a/lib/version.js b/lib/version.js
index <HASH>..<HASH> 100644
--- a/lib/version.js
+++ b/lib/version.js
@@ -652,8 +652,34 @@ program
print("Current version of " + configuration.name + ": " + configuration.currentVersion, "completed", "spaced22");
}
+ var textLength;
+ var spaces;
+ var spacesLength;
+
configuration.filesList.forEach(function(file, index) {
- print((index + 1) + " - " + file, "important", "spaced22");
+ var fileData = file.split(':');
+ var fileName = fileData[0];
+ var fileType = fileData[1];
+
+ if (!fileType) {
+ fileType = 'normal';
+ }
+
+ spaces = "";
+ textLength = (index + 1).toString().length + fileName.length;
+ spacesLength = 50 - textLength;
+
+ if (spacesLength > 0) {
+ while (spacesLength > 0) {
+ spaces = spaces + " ";
+ spacesLength--;
+ }
+ }
+ else {
+ spaces = " ";
+ }
+
+ print((index + 1) + " - " + fileName + spaces + '[' + fileType + ']', "important", "spaced22");
filesCounter++;
});
|
support for file listing with versioning type
|
diff --git a/lib/how_is/report.rb b/lib/how_is/report.rb
index <HASH>..<HASH> 100644
--- a/lib/how_is/report.rb
+++ b/lib/how_is/report.rb
@@ -18,7 +18,6 @@ module HowIs
@travis = HowIs::Sources::Travis.new(repository, end_date)
end
-
def to_h(frontmatter_data = nil)
@report_hash ||= {
title: "How is #{@repository}?",
|
use only one blank line between methods.
|
diff --git a/src/tr/passwords.php b/src/tr/passwords.php
index <HASH>..<HASH> 100644
--- a/src/tr/passwords.php
+++ b/src/tr/passwords.php
@@ -15,7 +15,7 @@ return [
'password' => 'Parolanız en az altı karakter olmalı ve doğrulama ile eşleşmelidir.',
'reset' => 'Parolanız sıfırlandı!',
'sent' => 'Parola sıfırlama bağlantınız e-posta ile gönderildi!',
- 'throttled' => 'Please wait before retrying.',
+ 'throttled' => 'Lütfen tekrar denemeden önce bekleyiniz.',
'token' => 'Parola sıfırlama adresi/kodu geçersiz.',
'user' => 'Bu e-posta adresi ile kayıtlı bir üye bulunmuyor.',
];
|
[tr] Updated passwords.php
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -24,13 +24,14 @@ function HTMLScreenshotReporter(options) {
self.specStarted = function (spec) {
var featureName = spec.fullName.replace(spec.description, '');
spec.description = __featureDenominator + featureName + __scenarioDenominator + spec.description;
+ browser.currentTest = spec.description;
if(browser.browserName){
spec.description += '|' + browser.browserName;
+ browser.currentTest += '|' + browser.browserName;
if(browser.browserVersion){
spec.description += '-' + browser.version;
}
}
- browser.currentTest = spec.description;
};
self.specDone = function (spec) {
|
Now the browser.currentTest does not care about the browser version
|
diff --git a/src/Illuminate/Session/SessionManager.php b/src/Illuminate/Session/SessionManager.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Session/SessionManager.php
+++ b/src/Illuminate/Session/SessionManager.php
@@ -70,7 +70,7 @@ class SessionManager extends Manager {
{
$connection = $this->getDatabaseConnection();
- $table = $connection->getTablePrefix().$this->app['config']['session.table'];
+ $table = $this->app['config']['session.table'];
return $this->buildSession(new DatabaseSessionHandler($connection, $table));
}
|
Table prefix was added twice
If a table prefix was set in the database config, this code caused the prefix to be added twice: once here and once in the call to the database engine inside `DatabaseSessionHandler`. refs #<I> on the correct branch.
|
diff --git a/commands/new_theme.go b/commands/new_theme.go
index <HASH>..<HASH> 100644
--- a/commands/new_theme.go
+++ b/commands/new_theme.go
@@ -38,7 +38,7 @@ func (b *commandsBuilder) newNewThemeCmd() *newThemeCmd {
cmd := &cobra.Command{
Use: "theme [name]",
Short: "Create a new theme",
- Long: `Create a new theme (skeleton) called [name] in the current directory.
+ Long: `Create a new theme (skeleton) called [name] in ./themes.
New theme is a skeleton. Please add content to the touched files. Add your
name to the copyright line in the license and adjust the theme.toml file
as you see fit.`,
|
Fix `new theme` command description
`hugo new theme foo` creates theme `foo` in `./themes` and not in current directory.
|
diff --git a/cache/stores/file/lib.php b/cache/stores/file/lib.php
index <HASH>..<HASH> 100644
--- a/cache/stores/file/lib.php
+++ b/cache/stores/file/lib.php
@@ -308,9 +308,13 @@ class cachestore_file implements cache_store, cache_is_key_aware {
public function delete($key) {
$filename = $key.'.cache';
$file = $this->path.'/'.$filename;
- $result = @unlink($file);
- unset($this->keys[$filename]);
- return $result;
+
+ if (@unlink($file)) {
+ unset($this->keys[$filename]);
+ return true;
+ }
+
+ return false;
}
/**
|
MDL-<I> Improved the deletion logic to preserve the 'prescan' setting
|
diff --git a/lib/classes/command-bus.js b/lib/classes/command-bus.js
index <HASH>..<HASH> 100644
--- a/lib/classes/command-bus.js
+++ b/lib/classes/command-bus.js
@@ -1,7 +1,6 @@
'use strict';
const Promise = require(`bluebird`);
-const EventEmitter = require(`events`);
const StackedError = require(`./stacked-error`);
const ProgrammerError = require(`./programmer-error`);
@@ -13,9 +12,6 @@ class CommandBus {
Object.defineProperties(this, {
_commandRoutes: {
value: []
- },
- _emitter: {
- value: new EventEmitter()
}
});
}
@@ -40,8 +36,8 @@ class CommandBus {
if (!isNonEmptyString(type)) {
throw new ProgrammerError(`CommandBus#command() requires an type String`);
}
- if (!isNonEmptyString(pattern)) {
- throw new ProgrammerError(`CommandBus#command() requires an pattern String`);
+ if (!isNonEmptyString(patternString)) {
+ throw new ProgrammerError(`CommandBus#command() requires a patternString`);
}
patternString = `${type}:${patternString}`;
@@ -49,7 +45,7 @@ class CommandBus {
if (!match) {
return Promise.reject(new ProgrammerError(
- `CommandBus has no handler for ${pattern}`
+ `CommandBus has no handler for ${patternString}`
));
}
|
Remove unsued _emitter from CommandBus
Changes to be committed:
modified: lib/classes/command-bus.js
|
diff --git a/lib/csvconverter/strings2csv.rb b/lib/csvconverter/strings2csv.rb
index <HASH>..<HASH> 100644
--- a/lib/csvconverter/strings2csv.rb
+++ b/lib/csvconverter/strings2csv.rb
@@ -15,7 +15,8 @@ class Strings2CSV < Base2Csv
# Load all strings of a given file
def load_strings(strings_filename)
strings = ORDERED_HASH_CLASS.new
-
+
+ contents = File.open(strings_filename).read
contents.each_line do |line|
hash = self.parse_dotstrings_line(line)
strings.merge!(hash) if hash
|
Fixes error after deactivate utf8 fix
|
diff --git a/datasette/database.py b/datasette/database.py
index <HASH>..<HASH> 100644
--- a/datasette/database.py
+++ b/datasette/database.py
@@ -365,6 +365,9 @@ class Database:
"sqlite_sequence",
"views_geometry_columns",
"virts_geometry_columns",
+ "data_licenses",
+ "KNN",
+ "KNN2",
] + [
r[0]
for r in (
|
Hidden tables data_licenses, KNN, KNN2 for SpatiaLite, closes #<I>
|
diff --git a/basket.php b/basket.php
index <HASH>..<HASH> 100644
--- a/basket.php
+++ b/basket.php
@@ -229,7 +229,8 @@ class Basket extends Magic {
**/
function __construct($key='basket') {
$this->key=$key;
- @session_start();
+ if (session_status()!=PHP_SESSION_ACTIVE)
+ session_start();
Base::instance()->sync('SESSION');
$this->reset();
}
|
Avoid error suppression in all session_start directives
|
diff --git a/lib/rubocop/config.rb b/lib/rubocop/config.rb
index <HASH>..<HASH> 100644
--- a/lib/rubocop/config.rb
+++ b/lib/rubocop/config.rb
@@ -242,7 +242,7 @@ module RuboCop
return nil unless loaded_path
base_path = base_dir_for_path_parameters
- ['gems.locked', 'Gemfile.lock'].each do |file_name|
+ ['Gemfile.lock', 'gems.locked'].each do |file_name|
path = find_file_upwards(file_name, base_path)
return path if path
end
|
Find Gemfile.lock before gems.locked
Generally named Gemfile.lock instead of gems.locked. So finding in gems.locked
is redundant most of the time.
There was once a proposal to deprecate Gemfile and become gems.rb in
past Bundler 2 development, but that has been abandoned.
|
diff --git a/bigcommerce/connection.py b/bigcommerce/connection.py
index <HASH>..<HASH> 100644
--- a/bigcommerce/connection.py
+++ b/bigcommerce/connection.py
@@ -239,7 +239,9 @@ class OAuthConnection(Connection):
client_secret,
algorithms=["HS256"],
audience=client_id,
- verify_iss=False)
+ options={
+ 'verify_iss': False
+ })
def fetch_token(self, client_secret, code, context, scope, redirect_uri,
token_url='https://login.bigcommerce.com/oauth2/token'):
|
Fixed issue with the `verify_iss` argument passed to jwt.decode().
Error Occurred with jwt.decode() option `verify_iss=False` passed.
```
JWT verification failed: decode() got an unexpected keyword argument 'verify_iss'
Payload verification failed!
```
|
diff --git a/skflow/estimators/base.py b/skflow/estimators/base.py
index <HASH>..<HASH> 100644
--- a/skflow/estimators/base.py
+++ b/skflow/estimators/base.py
@@ -115,9 +115,11 @@ class TensorFlowEstimator(BaseEstimator):
tf.as_dtype(self._data_feeder.output_dtype), output_shape,
name="output")
- # Add histograms for X and y.
- tf.histogram_summary("X", self._inp)
- tf.histogram_summary("y", self._out)
+ # Add histograms for X and y if they are floats.
+ if self._data_feeder.input_dtype in (np.float32, np.float64):
+ tf.histogram_summary("X", self._inp)
+ if self._data_feeder.output_dtype in (np.float32, np.float64):
+ tf.histogram_summary("y", self._out)
# Create model's graph.
self._model_predictions, self._model_loss = self.model_fn(
|
Ref #<I>: Update histograms for X and y only if they are floats
|
diff --git a/lib/jekyll_pages_api_search/version.rb b/lib/jekyll_pages_api_search/version.rb
index <HASH>..<HASH> 100644
--- a/lib/jekyll_pages_api_search/version.rb
+++ b/lib/jekyll_pages_api_search/version.rb
@@ -1,5 +1,5 @@
# @author Mike Bland (michael.bland@gsa.gov)
module JekyllPagesApiSearch
- VERSION = '0.4.1'
+ VERSION = '0.4.2'
end
|
Bump to <I>
Enables the `placeholder` config feature to set the widget placeholder text.
|
diff --git a/src/core/AnimatedNode.js b/src/core/AnimatedNode.js
index <HASH>..<HASH> 100644
--- a/src/core/AnimatedNode.js
+++ b/src/core/AnimatedNode.js
@@ -179,7 +179,7 @@ export default class AnimatedNode {
if (ReanimatedModule.connectNodes) {
ReanimatedModule.connectNodes(this.__nodeID, child.__nodeID);
} else {
- this.__dangerouslyRescheduleEvaluate();
+ child.__dangerouslyRescheduleEvaluate();
}
}
@@ -189,7 +189,10 @@ export default class AnimatedNode {
console.warn("Trying to remove a child that doesn't exist");
return;
}
- ReanimatedModule.disconnectNodes(this.__nodeID, child.__nodeID);
+
+ if (ReanimatedModule.disconnectNodes) {
+ ReanimatedModule.disconnectNodes(this.__nodeID, child.__nodeID);
+ }
this.__children.splice(index, 1);
if (this.__children.length === 0) {
|
[web] Fix parity issue between native addChild and JS addChild (#<I>)
|
diff --git a/salt/states/file.py b/salt/states/file.py
index <HASH>..<HASH> 100644
--- a/salt/states/file.py
+++ b/salt/states/file.py
@@ -244,13 +244,18 @@ def symlink(name, target, force=False, makedirs=False):
'changes': {},
'result': True,
'comment': ''}
- if not os.path.isdir(os.path.dirname(name)):
+
+ pardir = os.path.abspath(os.path.join(name, os.pardir))
+
+ if not os.path.isdir(pardir):
if makedirs:
- _makedirs(name)
- ret['result'] = False
- ret['comment'] = ('Directory {0} for symlink is not present'
+ _makedirs(pardir)
+ else:
+ ret['result'] = False
+ ret['comment'] = ('Directory {0} for symlink is not present'
.format(os.path.dirname(name)))
- return ret
+ return ret
+
if os.path.islink(name):
# The link exists, verify that it matches the target
if not os.readlink(name) == target:
|
Fixed bug with the ``file.symlink`` state ``mkdirs`` option
I also replaced os.path.dirname() which give inconsistent results if the
path ends with a trailing slash.
|
diff --git a/imagen/image.py b/imagen/image.py
index <HASH>..<HASH> 100644
--- a/imagen/image.py
+++ b/imagen/image.py
@@ -404,10 +404,9 @@ class FileImage(GenericImage):
def __call__(self,**params_to_override):
# Cache image to avoid channel_data being deleted before channel-specific processing completes.
- params_to_override['cache_image']=True
p = param.ParamOverrides(self,params_to_override)
- if not ( p.cache_image and (p._image is not None) ):
+ if not (p.cache_image and (p._image is not None)):
self._cached_average = super(FileImage,self).__call__(**params_to_override)
self._channel_data = self._process_channels(p,**params_to_override)
@@ -422,6 +421,15 @@ class FileImage(GenericImage):
return self._cached_average
+ def set_matrix_dimensions(self, *args):
+ """
+ Subclassed to delete the cached image when matrix dimensions are
+ changed.
+ """
+ self._image = None
+ super(FileImage, self).set_matrix_dimensions(*args)
+
+
def _get_image(self,p):
file_, ext = splitext(p.filename)
npy = (ext.lower() == ".npy")
|
Fixed bug in FileImage caching, when matrix dimensions are changed
When a cached FileImage was first viewed using the default matrix
dimensions and then installed on a GeneratorSheet with different
dimensions, it would continue to present the cached image with
wrong dimensions.
|
diff --git a/aiohttp_apiset/swagger/router.py b/aiohttp_apiset/swagger/router.py
index <HASH>..<HASH> 100644
--- a/aiohttp_apiset/swagger/router.py
+++ b/aiohttp_apiset/swagger/router.py
@@ -74,6 +74,7 @@ class SwaggerRouter(dispatcher.TreeUrlDispatcher):
self._swagger_yaml[spec] = yaml.dump(data)
self.add_route('GET', spec, self._handler_swagger_spec)
self.add_route('GET', index, self._handler_swagger_ui)
+ self.add_route('GET', base_ui, self._handler_swagger_ui)
self.add_static(base_ui, ui.STATIC_UI)
ui.get_template() # warm up
|
swagger-ui on base_ui
|
diff --git a/achilles-cql/src/main/java/info/archinnov/achilles/entity/manager/CQLEntityManagerFactory.java b/achilles-cql/src/main/java/info/archinnov/achilles/entity/manager/CQLEntityManagerFactory.java
index <HASH>..<HASH> 100644
--- a/achilles-cql/src/main/java/info/archinnov/achilles/entity/manager/CQLEntityManagerFactory.java
+++ b/achilles-cql/src/main/java/info/archinnov/achilles/entity/manager/CQLEntityManagerFactory.java
@@ -50,6 +50,7 @@ public class CQLEntityManagerFactory extends EntityManagerFactory {
daoContext = CQLDaoContextBuilder.builder(session).build(entityMetaMap, hasSimpleCounter);
contextFactory = new CQLPersistenceContextFactory(daoContext, configContext, entityMetaMap);
+ registerShutdownHook(cluster);
}
/**
@@ -92,4 +93,16 @@ public class CQLEntityManagerFactory extends EntityManagerFactory {
return new CQLConsistencyLevelPolicy(defaultReadConsistencyLevel, defaultWriteConsistencyLevel,
readConsistencyMap, writeConsistencyMap);
}
+
+ private void registerShutdownHook(final Cluster cluster)
+ {
+ Runtime.getRuntime().addShutdownHook(new Thread()
+ {
+ @Override
+ public void run()
+ {
+ cluster.shutdown();
+ }
+ });
+ }
}
|
Add shutdown hook on Cluster of Java Driver core for gracefull stop
|
diff --git a/lib/ronin/database/database.rb b/lib/ronin/database/database.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/database/database.rb
+++ b/lib/ronin/database/database.rb
@@ -128,14 +128,6 @@ module Ronin
end
#
- # @return [DataMapper::Logger, nil]
- # The current Database log.
- #
- def Database.log
- @log
- end
-
- #
# Setup the Database log.
#
# @param [Hash] options
@@ -151,15 +143,16 @@ module Ronin
# The level of messages to log.
# May be either `:fatal`, `:error`, `:warn`, `:info` or `:debug`.
#
- # @return [DataMapper::Logger]
- # The new Database log.
+ # @return [true]
+ # Specifies that the log has been setup.
#
def Database.setup_log(options={})
path = (options[:path] || DEFAULT_LOG_PATH)
stream = (options[:stream] || File.new(path,'w+'))
level = (options[:level] || DEFAULT_LOG_LEVEL)
- return @log = DataMapper::Logger.new(stream,level)
+ @log = DataMapper::Logger.new(stream,level)
+ return true
end
#
@@ -204,7 +197,7 @@ module Ronin
#
def Database.setup(&block)
# setup the database log
- Database.setup_log unless Database.log
+ Database.setup_log unless @log
# setup the database repositories
Database.repositories.each do |name,uri|
|
Do not provide direct access to the DataMapper log.
|
diff --git a/backend.js b/backend.js
index <HASH>..<HASH> 100644
--- a/backend.js
+++ b/backend.js
@@ -128,6 +128,7 @@ Backend.prototype.buildVectorTile = function(z, x, y, callback) {
var buffer = image.getData(self.dataopts);
buffer.metatile = self.metatile;
+ buffer._vtile = image;
image.clear(function(err) {
callback(err, buffer);
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,3 +1,4 @@
+var mapnik = require('mapnik');
var tilestrata = require('tilestrata');
var assertVTile = require('./utils/assertVTile.js');
var TileServer = tilestrata.TileServer;
@@ -22,6 +23,8 @@ describe('Provider Implementation "vtile"', function() {
if (err) throw err;
assert.deepEqual(headers, {'Content-Type': 'application/x-protobuf'});
assert.instanceOf(buffer, Buffer);
+ assert.instanceOf(buffer._vtile, mapnik.VectorTile, 'buffer._vtile');
+ assert.equal(buffer.metatile, 1, 'buffer.metatile');
// fs.writeFileSync(__dirname + '/fixtures/world.pbf', buffer);
assertVTile(5, 5, 12, buffer, __dirname + '/fixtures/world.pbf');
done();
|
Attach mapnik VectorTile instance to buffer for downstream modules (to prevent re-parsing)
|
diff --git a/NEMbox/menu.py b/NEMbox/menu.py
index <HASH>..<HASH> 100644
--- a/NEMbox/menu.py
+++ b/NEMbox/menu.py
@@ -239,6 +239,10 @@ class Menu:
# 播放、暂停
elif key == ord(' '):
+ if self.datalist[idx] == self.storage.database["songs"][str(self.player.playing_id)]:
+ self.player.play_and_pause(self.storage.database['player_info']['idx'])
+ time.sleep(0.1)
+ continue
if datatype == 'songs':
self.resume_play = False
self.player.new_player_list('songs', self.title, self.datalist, -1)
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ from setuptools import setup, find_packages
setup(
name='NetEase-MusicBox',
- version='0.1.7.0',
+ version='0.1.7.1',
packages=find_packages(),
include_package_data=True,
|
Fix play/pause bug when press ' ' at the same song
|
diff --git a/main/core/API/Finder/ResourceNodeFinder.php b/main/core/API/Finder/ResourceNodeFinder.php
index <HASH>..<HASH> 100644
--- a/main/core/API/Finder/ResourceNodeFinder.php
+++ b/main/core/API/Finder/ResourceNodeFinder.php
@@ -200,4 +200,13 @@ class ResourceNodeFinder extends AbstractFinder
return $qb;
}
+
+ //required for the unions
+ public function getExtraFieldMapping()
+ {
+ return [
+ 'meta.updated' => 'creation_date',
+ 'meta.created' => 'modification_date',
+ ];
+ }
}
|
[CoreBundle] ResourceNode finder order by fix. (#<I>)
|
diff --git a/static/js/admin/pads.js b/static/js/admin/pads.js
index <HASH>..<HASH> 100644
--- a/static/js/admin/pads.js
+++ b/static/js/admin/pads.js
@@ -14,7 +14,7 @@ exports.documentReady=function(hooks, context, cb){
var room = url + "pluginfw/admin/pads";
//connect
- socket = io.connect(room, {resource : resource});
+ socket = io.connect(room, {path: baseURL + "socket.io", resource : resource});
$('.search-results').data('query', {
pattern: '',
|
made socket.io path relative to the base url
|
diff --git a/lib/websearchadminlib.py b/lib/websearchadminlib.py
index <HASH>..<HASH> 100644
--- a/lib/websearchadminlib.py
+++ b/lib/websearchadminlib.py
@@ -38,7 +38,8 @@ from invenio.config import \
CFG_SITE_URL,\
CFG_WEBCOMMENT_ALLOW_COMMENTS,\
CFG_WEBCOMMENT_ALLOW_REVIEWS,\
- CFG_INSPIRE_SITE
+ CFG_INSPIRE_SITE, \
+ CFG_CERN_SITE
from invenio.bibrankadminlib import \
write_outcome, \
modify_translations, \
@@ -3452,6 +3453,12 @@ def get_detailed_page_tabs(colID=None, recID=None, ln=CFG_SITE_LANG):
if len(brd.list_bibdocs('Plot')) == 0:
tabs['plots']['enabled'] = False
+ if CFG_CERN_SITE:
+ from invenio.search_engine import get_collection_reclist
+ if recID in get_collection_reclist("Books & Proceedings"):
+ tabs['holdings']['visible'] = True
+ tabs['holdings']['enabled'] = True
+
tabs[''] = tabs['metadata']
del tabs['metadata']
|
WebSearch: CERN-specific enabling of holdings tab
* Display "holdings" tab when viewing record belonging to "Books &
Proceedings" collection at CERN.
|
diff --git a/azurerm/internal/services/storage/tests/data_source_storage_container_test.go b/azurerm/internal/services/storage/tests/data_source_storage_container_test.go
index <HASH>..<HASH> 100644
--- a/azurerm/internal/services/storage/tests/data_source_storage_container_test.go
+++ b/azurerm/internal/services/storage/tests/data_source_storage_container_test.go
@@ -20,7 +20,6 @@ func TestAccDataSourceArmStorageContainer_basic(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(data.ResourceName, "container_access_type", "private"),
resource.TestCheckResourceAttr(data.ResourceName, "has_immutability_policy", "false"),
- resource.TestCheckResourceAttr(data.ResourceName, "storage_account_name", "acctestsadsc"+data.RandomString),
resource.TestCheckResourceAttr(data.ResourceName, "metadata.%", "2"),
resource.TestCheckResourceAttr(data.ResourceName, "metadata.k1", "v1"),
resource.TestCheckResourceAttr(data.ResourceName, "metadata.k2", "v2"),
|
removing the check for storage_account_name
this is required to lookup the data source, so if it's omited the test'll fail at another point
|
diff --git a/tests/test_webdriver_firefox.py b/tests/test_webdriver_firefox.py
index <HASH>..<HASH> 100644
--- a/tests/test_webdriver_firefox.py
+++ b/tests/test_webdriver_firefox.py
@@ -37,6 +37,13 @@ class FirefoxBrowserTest(WebDriverTests, unittest.TestCase):
assert_equals(alert.text, 'This is an alert example.')
alert.accept()
+ def test_acess_alerts_and_dismiss_them(self):
+ self.browser.visit(EXAMPLE_APP + 'alert')
+ self.browser.find_by_tag('h1').first.click()
+ alert = self.browser.get_alert()
+ assert_equals(alert.text, 'This is an alert example.')
+ alert.dismiss()
+
def test_access_prompts_and_be_able_to_fill_then(self):
self.browser.visit(EXAMPLE_APP + 'alert')
self.browser.find_by_tag('h2').first.click()
|
Missing test for "dismiss" feature on alert elements
|
diff --git a/lib/dynflow/web_console.rb b/lib/dynflow/web_console.rb
index <HASH>..<HASH> 100644
--- a/lib/dynflow/web_console.rb
+++ b/lib/dynflow/web_console.rb
@@ -213,7 +213,7 @@ module Dynflow
filters = params[:filters]
elsif supported_filter?('state')
- filters = { 'state' => ExecutionPlan.states.map(&:to_s) }
+ filters = { 'state' => ExecutionPlan.states.map(&:to_s) - ['stopped'] }
else
filters = {}
end
|
'stopped' should not be included in defaults
|
diff --git a/grunt/shell.js b/grunt/shell.js
index <HASH>..<HASH> 100644
--- a/grunt/shell.js
+++ b/grunt/shell.js
@@ -6,14 +6,14 @@ module.exports = function (grunt, options) {
stdout: true
},
selenium: {
- command: 'node_modules/protractor/bin/webdriver-manager start',
+ command: 'node node_modules/protractor/bin/webdriver-manager start',
options: {
stdout: false,
async: true
}
},
protractor_update: {
- command: 'node_modules/protractor/bin/webdriver-manager update'
+ command: 'node node_modules/protractor/bin/webdriver-manager update'
},
npm_install: {
command: 'npm install'
|
Fix errors launching protractor from Grunt on Windows.
|
diff --git a/src/Event/Http/FpmHandler.php b/src/Event/Http/FpmHandler.php
index <HASH>..<HASH> 100644
--- a/src/Event/Http/FpmHandler.php
+++ b/src/Event/Http/FpmHandler.php
@@ -32,6 +32,11 @@ final class FpmHandler extends HttpHandler
private const SOCKET = '/tmp/.bref/php-fpm.sock';
private const PID_FILE = '/tmp/.bref/php-fpm.pid';
private const CONFIG = '/opt/bref/etc/php-fpm.conf';
+ /**
+ * We define this constant instead of using the PHP one because that avoids
+ * depending on the pcntl extension.
+ */
+ private const SIGTERM = 15;
/** @var Client|null */
private $client;
@@ -243,7 +248,7 @@ final class FpmHandler extends HttpHandler
echo "PHP-FPM seems to be running already. This might be because Lambda stopped the bootstrap process but didn't leave us an opportunity to stop PHP-FPM (did Lambda timeout?). Stopping PHP-FPM now to restart from a blank slate.\n";
// The previous PHP-FPM process is running, let's try to kill it properly
- $result = posix_kill($pid, SIGTERM);
+ $result = posix_kill($pid, self::SIGTERM);
if ($result === false) {
echo "PHP-FPM's PID file contained a PID that doesn't exist, assuming PHP-FPM isn't running.\n";
unlink(self::SOCKET);
|
Remove a dependency to the pcntl extension
|
diff --git a/js/models/threads.js b/js/models/threads.js
index <HASH>..<HASH> 100644
--- a/js/models/threads.js
+++ b/js/models/threads.js
@@ -15,7 +15,7 @@ var Whisper = Whisper || {};
},
validate: function(attributes, options) {
- var required = ['id', 'type', 'timestamp', 'image', 'name'];
+ var required = ['type', 'timestamp', 'image', 'name'];
var missing = _.filter(required, function(attr) { return !attributes[attr]; });
if (missing.length) { return "Thread must have " + missing; }
},
|
Don't validate presence of thread id
It's undefined until the first save();
|
diff --git a/PHP/Reflect.php b/PHP/Reflect.php
index <HASH>..<HASH> 100644
--- a/PHP/Reflect.php
+++ b/PHP/Reflect.php
@@ -791,6 +791,7 @@ class PHP_Reflect implements ArrayAccess
$tokenName = 'T_TRAIT_C';
} elseif (strcasecmp($text, 'trait') == 0
&& $trait === false
+ && $this->tokens[$id - 1][0] != 'T_OBJECT_OPERATOR'
) {
$tokenName = 'T_TRAIT';
} elseif (strcasecmp($text, 'insteadof') == 0) {
|
avoid wrong trait detection if source code used a class property named trait
|
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index <HASH>..<HASH> 100755
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -236,25 +236,25 @@ function scorm_user_outline($course, $user, $mod, $scorm) {
}
}
switch ($scorm->grademethod) {
- case VALUEHIGHEST:
+ case GRADEHIGHEST:
if ($scores->values > 0) {
$return->info = get_string('score','scorm').': '.$scores->max;
$return->time = $scores->lastmodify;
}
break;
- case VALUEAVERAGE:
+ case GRADEAVERAGE:
if ($scores->values > 0) {
$return->info = get_string('score','scorm').': '.$scores->sum/$scores->values;
$return->time = $scores->lastmodify;
}
break;
- case VALUESUM:
+ case GRADESUM:
if ($scores->values > 0) {
$return->info = get_string('score','scorm').': '.$scores->sum;
$return->time = $scores->lastmodify;
}
break;
- case VALUESCOES:
+ case GRADESCOES:
$return->info = '';
$scores->notattempted = $scores->count;
if (isset($scores->completed)) {
|
Fixed modified names for some constants [Bug <I>]
|
diff --git a/persephone/run.py b/persephone/run.py
index <HASH>..<HASH> 100644
--- a/persephone/run.py
+++ b/persephone/run.py
@@ -236,7 +236,7 @@ def train_ready(corpus):
exp_dir = prep_exp_dir()
model = get_simple_model(exp_dir, corpus)
- model.train(min_epochs=10, early_stopping_steps=3)
+ model.train(min_epochs=20, early_stopping_steps=3)
def transcribe(model_path, corpus):
""" Applies a trained model to untranscribed data in a Corpus. """
|
Increased min_epochs to <I> for tutorial.
|
diff --git a/ginkgo/main.go b/ginkgo/main.go
index <HASH>..<HASH> 100644
--- a/ginkgo/main.go
+++ b/ginkgo/main.go
@@ -42,6 +42,7 @@ import (
"fmt"
"github.com/onsi/ginkgo/config"
"os"
+ "time"
)
var numCPU int
@@ -84,13 +85,16 @@ func main() {
os.Exit(1)
}
+ t := time.Now()
runner := newTestRunner(numCPU, recurse, runMagicI, race, cover)
passed := runner.run()
+ fmt.Printf("\nGinkgo ran in %s\n", time.Since(t))
if passed {
+ fmt.Printf("Test Suite Passed\n")
os.Exit(0)
} else {
- fmt.Printf("\nTest Suite Failed\n")
+ fmt.Printf("Test Suite Failed\n")
os.Exit(1)
}
}
|
added timing information to ginkgo runs
|
diff --git a/src/Gzero/Api/Validator/ContentValidator.php b/src/Gzero/Api/Validator/ContentValidator.php
index <HASH>..<HASH> 100644
--- a/src/Gzero/Api/Validator/ContentValidator.php
+++ b/src/Gzero/Api/Validator/ContentValidator.php
@@ -21,7 +21,7 @@ class ContentValidator extends AbstractValidator {
*/
protected $rules = [
'list' => [
- 'lang' => 'required_with:title|in:pl,en',
+ 'lang' => 'required_with:title,sort|in:pl,en',
'page' => 'numeric',
'perPage' => 'numeric',
'type' => 'in:content,category',
|
Content validator - lang field required with sort field
|
diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py
index <HASH>..<HASH> 100644
--- a/salt/client/ssh/__init__.py
+++ b/salt/client/ssh/__init__.py
@@ -56,11 +56,7 @@ try:
HAS_WINSHELL = True
except ImportError:
HAS_WINSHELL = False
-try:
- import zmq
- HAS_ZMQ = True
-except ImportError:
- HAS_ZMQ = False
+from salt.utils.zeromq import zmq
# The directory where salt thin is deployed
DEFAULT_THIN_DIR = '/var/tmp/.%%USER%%_%%FQDNUUID%%_salt'
@@ -207,7 +203,7 @@ class SSH(object):
'''
def __init__(self, opts):
pull_sock = os.path.join(opts['sock_dir'], 'master_event_pull.ipc')
- if os.path.isfile(pull_sock) and HAS_ZMQ:
+ if os.path.exists(pull_sock) and zmq:
self.event = salt.utils.event.get_event(
'master',
opts['sock_dir'],
|
Use utility for ZMQ import handling in SSH client
|
diff --git a/tornado/options.py b/tornado/options.py
index <HASH>..<HASH> 100644
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -100,10 +100,12 @@ def parse_command_line(args=None):
We return all command line arguments that are not options as a list.
"""
if args is None: args = sys.argv
+ remaining = []
for i in xrange(1, len(args)):
# All things after the last option are command line arguments
if not args[i].startswith("-"):
- return args[i:]
+ remaining = args[i:]
+ break
if args[i] == "--":
continue
arg = args[i].lstrip("-")
@@ -127,7 +129,7 @@ def parse_command_line(args=None):
logging.getLogger().setLevel(getattr(logging, options.logging.upper()))
enable_pretty_logging()
- return []
+ return remaining
def parse_config_file(path, overwrite=True):
@@ -307,7 +309,7 @@ def enable_pretty_logging():
return
channel = logging.StreamHandler()
channel.setFormatter(_ColorLogFormatter())
- logging.getLogger().addHandler(channel)
+ logging.getLogger().addHandler(channel)
class _ColorLogFormatter(logging.Formatter):
|
Make parse_command_line initialize logging even when there are non-option
arguments.
|
diff --git a/scripts/garp.php b/scripts/garp.php
index <HASH>..<HASH> 100755
--- a/scripts/garp.php
+++ b/scripts/garp.php
@@ -118,9 +118,12 @@ if (empty($args[0])) {
/**
* Read STDIN
*/
-stream_set_blocking(STDIN, false);
-$stdin = trim(stream_get_contents(STDIN));
-stream_set_blocking(STDIN, true);
+$stdin = '';
+if (!posix_isatty(STDIN)) {
+ stream_set_blocking(STDIN, true);
+ stream_set_timeout(STDIN, 1);
+ $stdin = trim(stream_get_contents(STDIN));
+}
/* Construct command classname */
$classArgument = ucfirst($args[0]);
|
Check for interactivity before reading STDIN
posix_isatty can be used to determine wether data is being piped into a
script.
Using this, we can revert stream_set_blocking() to true, in order to
make the script wait for all input.
Specifically fixes a case where remote data (which takes a while to be
downloaded) from <I>g was not being picked up by garp.php.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>
-from distutils.core import setup
+try:
+ from setuptools import setup
+except ImportError:
+ from distutils.core import setup
from sys import version
from os.path import expanduser
|
Ditch distutils in favor of setuptools
|
diff --git a/tpot/export_utils.py b/tpot/export_utils.py
index <HASH>..<HASH> 100644
--- a/tpot/export_utils.py
+++ b/tpot/export_utils.py
@@ -464,6 +464,22 @@ else:
{1} = {0}.copy()
'''.format(operator[2], result_name)
+ elif operator_name == '_binarizer':
+ threshold = float(operator[3])
+ operator_text += '''
+# Use Scikit-learn's Binarizer to scale the features
+training_features = {0}.loc[training_indices].drop('class', axis=1)
+
+if len(training_features.columns.values) > 0:
+ scaler = Binarizer(threshold={1})
+ scaler.fit(training_features.values.astype(np.float64))
+ scaled_features = scaler.transform({0}.drop('class', axis=1).values.astype(np.float64))
+ {2} = pd.DataFrame(data=scaled_features)
+ {2}['class'] = {0}['class'].values
+else:
+ {2} = {0}.copy()
+'''.format(operator[2], threshold, result_name)
+
elif operator_name == '_polynomial_features':
operator_text += '''
# Use Scikit-learn's PolynomialFeatures to construct new features from the existing feature set
|
Add export support for _binarizer
|
diff --git a/tests/test_ramon.py b/tests/test_ramon.py
index <HASH>..<HASH> 100644
--- a/tests/test_ramon.py
+++ b/tests/test_ramon.py
@@ -15,10 +15,10 @@ class TestRAMON(unittest.TestCase):
if os.path.exists("1.hdf5"):
os.remove("1.hdf5")
- def test_create_ramon_file(self):
- r = ramon.RAMONSegment(id=self.ramon_id)
- r.cutout = numpy.zeros((3, 3, 3))
- self.h = ramon.ramon_to_hdf5(r)
+ # def test_create_ramon_file(self):
+ # r = ramon.RAMONSegment(id=self.ramon_id)
+ # r.cutout = numpy.zeros((3, 3, 3))
+ # self.h = ramon.ramon_to_hdf5(r)
# self.assertEqual(type(self.h), h5py.File)
# Need to write to disk before this'll work
|
kill more tests to gruntle travis
|
diff --git a/paramiko/client.py b/paramiko/client.py
index <HASH>..<HASH> 100644
--- a/paramiko/client.py
+++ b/paramiko/client.py
@@ -455,6 +455,7 @@ class SSHClient (object):
if not remaining_auth_types:
return
two_factor = True
+ break
except SSHException, e:
saved_exception = e
else:
@@ -485,6 +486,7 @@ class SSHClient (object):
if not remaining_auth_types:
return
two_factor = True
+ break
except SSHException, e:
saved_exception = e
except IOError, e:
|
make sure to break out of key auth loop on success when doing 2-factor
(cherry picked from commit 0a4aa8a9d<I>adef3b8d<I>f<I>ea<I>fc1a)
|
diff --git a/spec/providers/coreIntegration/xhr.integration.src.js b/spec/providers/coreIntegration/xhr.integration.src.js
index <HASH>..<HASH> 100644
--- a/spec/providers/coreIntegration/xhr.integration.src.js
+++ b/spec/providers/coreIntegration/xhr.integration.src.js
@@ -76,15 +76,14 @@ module.exports = function (provider, setup) {
xhr.send(null);
});
- //@todo Pending a valid URL that we can upload things to
- xit("triggers upload events", function(done) {
- dispatch.gotMessageAsync("onuploadprogress", [], function(e) {
+ it("triggers upload events", function(done) {
+ dispatch.gotMessageAsync("onuploadloadstart", [], function(e) {
expect(e.lengthComputable).toEqual(jasmine.any(Boolean));
expect(e.loaded).toEqual(jasmine.any(Number));
expect(e.total).toEqual(jasmine.any(Number));;
done();
});
xhr.open("POST", "http://pastebin.com/api/api_post.php", true);
- xhr.send("POST");
+ xhr.send({ string: "POST" });
});
};
|
fixed integration test for upload events on core.xhr
|
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
@@ -16,7 +16,9 @@ use PHPUnit\Framework\TestCase;
// Auto-adapt to PHPUnit 8 that added a `void` return-type to the tearDown method
if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
-eval('
+ eval('
+ namespace Symfony\Bundle\FrameworkBundle\Test;
+
/**
* @internal
*/
|
bug #<I> fix lost namespace in eval (fizzka)
This PR was squashed before being merged into the <I> branch (closes #<I>).
Discussion
----------
fix lost namespace in eval
Bugfix:
phpunit8 tearDown() declaration
Commits
-------
<I>a1ada8 fix lost namespace in eval
|
diff --git a/modules/citrus-core/src/main/java/com/consol/citrus/validation/matcher/core/ContainsValidationMatcher.java b/modules/citrus-core/src/main/java/com/consol/citrus/validation/matcher/core/ContainsValidationMatcher.java
index <HASH>..<HASH> 100644
--- a/modules/citrus-core/src/main/java/com/consol/citrus/validation/matcher/core/ContainsValidationMatcher.java
+++ b/modules/citrus-core/src/main/java/com/consol/citrus/validation/matcher/core/ContainsValidationMatcher.java
@@ -31,8 +31,8 @@ public class ContainsValidationMatcher implements ValidationMatcher {
if (!value.contains(control)) {
throw new ValidationException(this.getClass().getSimpleName()
+ " failed for field '" + fieldName
- + "'. Received value is '" + value
- + "', control value is '" + control + "'.");
+ + "'. Received value '" + value
+ + "' must contain '" + control + "'");
}
}
}
|
Improved error message on contains validation matcher
|
diff --git a/src/Http/RedirectBinding.php b/src/Http/RedirectBinding.php
index <HASH>..<HASH> 100644
--- a/src/Http/RedirectBinding.php
+++ b/src/Http/RedirectBinding.php
@@ -37,11 +37,6 @@ use XMLSecurityKey;
class RedirectBinding
{
/**
- * @var \Surfnet\SamlBundle\Entity\ServiceProviderRepository
- */
- private $entityRepository;
-
- /**
* @var \Psr\Log\LoggerInterface
*/
private $logger;
@@ -51,14 +46,19 @@ class RedirectBinding
*/
private $signatureVerifier;
+ /**
+ * @var \Surfnet\SamlBundle\Entity\ServiceProviderRepository
+ */
+ private $entityRepository;
+
public function __construct(
LoggerInterface $logger,
SignatureVerifier $signatureVerifier,
ServiceProviderRepository $repository = null
) {
- $this->entityRepository = $repository;
$this->logger = $logger;
$this->signatureVerifier = $signatureVerifier;
+ $this->entityRepository = $repository;
}
/**
|
Minor reordering of private and assignments
|
diff --git a/lib/mongoose-intl.js b/lib/mongoose-intl.js
index <HASH>..<HASH> 100644
--- a/lib/mongoose-intl.js
+++ b/lib/mongoose-intl.js
@@ -57,7 +57,7 @@ module.exports = exports = function mongooseIntl(schema, options) {
// embedded and sub-documents will use language methods from the top level document
var owner = this.ownerDocument ? this.ownerDocument() : this,
lang = owner.getLanguage(),
- langSubDoc = this.getValue(path);
+ langSubDoc = (this.$__getValue || this.getValue).call(this, path);
if (langSubDoc === null || langSubDoc === void 0) {
return langSubDoc;
|
Support Mongoose >=<I>
The name of the internal Mongoose function `Document#getValue` changed
in <I>; adjust the plugin accordingly (maintaining compatibility
with earlier versions).
See: <URL>
|
diff --git a/src/gulpfile.js b/src/gulpfile.js
index <HASH>..<HASH> 100644
--- a/src/gulpfile.js
+++ b/src/gulpfile.js
@@ -4,17 +4,17 @@ elixir(function(mix) {
mix.copy(
'node_modules/bootstrap/dist/fonts',
- 'public/fonts'
+ 'public/build/fonts'
);
mix.copy(
'node_modules/font-awesome/fonts',
- 'public/fonts'
+ 'public/build/fonts'
);
mix.copy(
'node_modules/ionicons/dist/fonts',
- 'public/fonts'
+ 'public/build/fonts'
);
mix.scripts([
@@ -30,8 +30,8 @@ elixir(function(mix) {
'../../../node_modules/bootstrap/less/bootstrap.less',
'../../../node_modules/font-awesome/less/font-awesome.less',
'../../../node_modules/ionicons/dist/css/ionicons.min.css',
- 'admin-lte/AdminLTE.less',
- 'admin-lte/skins/_all-skins.less'
+ 'adminlte/AdminLTE.less',
+ 'adminlte/skins/_all-skins.less'
], 'public/css/vendor.css');
mix.less([
|
Change path tot adminlte less file
Copy the fonts to build folder because we will be using elixir
|
diff --git a/src/Content/ContentBlocksApiV1PutRequestHandler.php b/src/Content/ContentBlocksApiV1PutRequestHandler.php
index <HASH>..<HASH> 100644
--- a/src/Content/ContentBlocksApiV1PutRequestHandler.php
+++ b/src/Content/ContentBlocksApiV1PutRequestHandler.php
@@ -3,6 +3,7 @@
namespace LizardsAndPumpkins\Content;
use LizardsAndPumpkins\Api\ApiRequestHandler;
+use LizardsAndPumpkins\Content\Exception\ContentBlockContentIsMissingInRequestBodyException;
use LizardsAndPumpkins\Content\Exception\ContentBlockContextIsMissingInRequestBodyException;
use LizardsAndPumpkins\Http\HttpRequest;
use LizardsAndPumpkins\Queue\Queue;
@@ -63,7 +64,7 @@ class ContentBlocksApiV1PutRequestHandler extends ApiRequestHandler
protected function validateRequestBody(array $requestBody)
{
if (!isset($requestBody['content'])) {
- throw new ContentBlockContextIsMissingInRequestBodyException(
+ throw new ContentBlockContentIsMissingInRequestBodyException(
'Content block content is missing in request body.'
);
}
|
Issue #<I>: Fix missing exception issue
|
diff --git a/pkg/volume/gce_pd/gce_pd_test.go b/pkg/volume/gce_pd/gce_pd_test.go
index <HASH>..<HASH> 100644
--- a/pkg/volume/gce_pd/gce_pd_test.go
+++ b/pkg/volume/gce_pd/gce_pd_test.go
@@ -179,6 +179,9 @@ func TestPlugin(t *testing.T) {
PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
}
provisioner, err := plug.(*gcePersistentDiskPlugin).newProvisionerInternal(options, &fakePDManager{})
+ if err != nil {
+ t.Errorf("Error creating new provisioner:%v", err)
+ }
persistentSpec, err := provisioner.Provision()
if err != nil {
t.Errorf("Provision() failed: %v", err)
@@ -202,6 +205,9 @@ func TestPlugin(t *testing.T) {
PersistentVolume: persistentSpec,
}
deleter, err := plug.(*gcePersistentDiskPlugin).newDeleterInternal(volSpec, &fakePDManager{})
+ if err != nil {
+ t.Errorf("Error creating new deleter:%v", err)
+ }
err = deleter.Delete()
if err != nil {
t.Errorf("Deleter() failed: %v", err)
|
Fix swallowed errors in tests of gce_pd
|
diff --git a/aeron-client/src/main/java/io/aeron/BufferBuilder.java b/aeron-client/src/main/java/io/aeron/BufferBuilder.java
index <HASH>..<HASH> 100644
--- a/aeron-client/src/main/java/io/aeron/BufferBuilder.java
+++ b/aeron-client/src/main/java/io/aeron/BufferBuilder.java
@@ -195,6 +195,7 @@ public class BufferBuilder
if (isDirect)
{
final ByteBuffer byteBuffer = ByteBuffer.allocateDirect(newCapacity);
+ byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
buffer.getBytes(0, byteBuffer, 0, limit);
buffer.wrap(byteBuffer);
}
|
[Java] Set the byte order in ByteBuffers for the logs to be little endian for those who would expect this.
|
diff --git a/presto-main/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeSinkOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeSinkOperator.java
index <HASH>..<HASH> 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeSinkOperator.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/exchange/LocalExchangeSinkOperator.java
@@ -149,8 +149,8 @@ public class LocalExchangeSinkOperator
{
requireNonNull(page, "page is null");
page = pagePreprocessor.apply(page);
- sink.addPage(page);
operatorContext.recordOutput(page.getSizeInBytes(), page.getPositionCount());
+ sink.addPage(page);
}
@Override
|
Record operator output before addPage in LocalExchangeSink
This minor change ensures that any Page#getSizeInBytes calculation
work is done inside of LocalExchangeSinkOperator before passing the
page through to LocalExchangeSink, which can be relatively more
expensive to calculate from within the sink since most involve
critical sections and locking. This work would have been done anyway,
but doing it from within the sink operator makes it possible for
that work to be avoided while holding a lock in some contexts on
the other side.
|
diff --git a/src/googleclouddebugger/version.py b/src/googleclouddebugger/version.py
index <HASH>..<HASH> 100644
--- a/src/googleclouddebugger/version.py
+++ b/src/googleclouddebugger/version.py
@@ -4,4 +4,4 @@
# The major version should only change on breaking changes. Minor version
# changes go between regular updates. Instances running debuggers with
# different major versions will show up as two different debuggees.
-__version__ = '2.8'
+__version__ = '2.9'
|
Increment python debugger version in preparation for releasing <I>.
-------------
Created by MOE: <URL>
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.