diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/utils/copyEvents.js b/lib/utils/copyEvents.js
index <HASH>..<HASH> 100644
--- a/lib/utils/copyEvents.js
+++ b/lib/utils/copyEvents.js
@@ -6,6 +6,7 @@ const _ = require('lodash');
module.exports = function copyEvents(from, to) {
// Clone all events
_.each(from._events, function(events, eventName) {
+ events = Array.isArray(events) ? events : [events];
_.each(events, function(event) {
to.on(eventName, event);
});
|
fix events will not be copied when there is only one
|
diff --git a/ftfy/fixes.py b/ftfy/fixes.py
index <HASH>..<HASH> 100644
--- a/ftfy/fixes.py
+++ b/ftfy/fixes.py
@@ -210,11 +210,13 @@ def fix_text_and_explain(text):
steps = [('encode', 'latin-1'), ('decode', 'windows-1252')]
return fixed, steps
except UnicodeDecodeError:
- # Well, never mind.
+ # This text contained characters that don't even make sense
+ # if you assume they were supposed to be Windows-1252. In
+ # that case, let's not assume anything.
pass
# The cases that remain are mixups between two different single-byte
- # encodings, neither of which is Latin-1.
+ # encodings, and not the common case of Latin-1 vs. Windows-1252.
#
# Those cases are somewhat rare, and impossible to solve without false
# positives. If you're in one of these situations, you don't need an
|
Document the case where we give up on decoding text as Windows-<I>.
This includes fixing an inaccurate comment that appeared after it.
|
diff --git a/fireplace/card.py b/fireplace/card.py
index <HASH>..<HASH> 100644
--- a/fireplace/card.py
+++ b/fireplace/card.py
@@ -91,7 +91,6 @@ class BaseCard(Entity):
type = _TAG(GameTag.CARDTYPE, CardType.INVALID)
aura = _TAG(GameTag.AURA, False)
controller = _TAG(GameTag.CONTROLLER, None)
- exhausted = _TAG(GameTag.EXHAUSTED, False)
hasDeathrattle = _PROPERTY(GameTag.DEATHRATTLE, False)
isValidTarget = targeting.isValidTarget
@@ -200,6 +199,7 @@ class BaseCard(Entity):
class PlayableCard(BaseCard):
+ exhausted = _TAG(GameTag.EXHAUSTED, False)
freeze = _TAG(GameTag.FREEZE, False)
hasBattlecry = _TAG(GameTag.BATTLECRY, False)
hasCombo = _TAG(GameTag.COMBO, False)
|
Move exhausted tag to PlayableCard
|
diff --git a/hazelcast-wm/src/main/java/com/hazelcast/web/WebFilter.java b/hazelcast-wm/src/main/java/com/hazelcast/web/WebFilter.java
index <HASH>..<HASH> 100644
--- a/hazelcast-wm/src/main/java/com/hazelcast/web/WebFilter.java
+++ b/hazelcast-wm/src/main/java/com/hazelcast/web/WebFilter.java
@@ -535,7 +535,8 @@ public class WebFilter implements Filter {
throw new NullPointerException("name must not be null");
}
if (value == null) {
- throw new IllegalArgumentException("value must not be null");
+ removeAttribute(name);
+ return;
}
if (deferredWrite) {
LocalCacheEntry entry = localCache.get(name);
|
backport for issue #<I>
|
diff --git a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
index <HASH>..<HASH> 100644
--- a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
+++ b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
@@ -170,8 +170,8 @@ class CalligraphyFactory {
mToolbarReference = new WeakReference<>(toolbar);
orignalTitle = toolbar.getTitle();
orignalSubTitle = toolbar.getSubtitle();
- toolbar.setTitle("Title");
- toolbar.setSubtitle("SubTitle");
+ toolbar.setTitle(" ");
+ toolbar.setSubtitle(" ");
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
|
use whitespace just incase the user does something weird
|
diff --git a/src/BotApi.php b/src/BotApi.php
index <HASH>..<HASH> 100644
--- a/src/BotApi.php
+++ b/src/BotApi.php
@@ -277,7 +277,7 @@ class BotApi
/**
* Use this method to send text messages. On success, the sent \TelegramBot\Api\Types\Message is returned.
*
- * @param int $chatId
+ * @param int|string $chatId
* @param string $text
* @param string|null $parseMode
* @param bool $disablePreview
@@ -297,7 +297,7 @@ class BotApi
$replyMarkup = null
) {
return Message::fromResponse($this->call('sendMessage', [
- 'chat_id' => (int) $chatId,
+ 'chat_id' => $chatId,
'text' => $text,
'parse_mode' => $parseMode,
'disable_web_page_preview' => $disablePreview,
|
fixes for issues #<I> and #<I>
|
diff --git a/src/Commands/PackageClone.php b/src/Commands/PackageClone.php
index <HASH>..<HASH> 100644
--- a/src/Commands/PackageClone.php
+++ b/src/Commands/PackageClone.php
@@ -91,7 +91,12 @@ class PackageClone extends Command
if (Str::contains($url, '@')) {
$vendorAndPackage = explode(':', $url);
- return explode('/', $vendorAndPackage[1]);
+ $vendorAndPackage = explode('/', $vendorAndPackage[1]);
+
+ return [
+ $vendorAndPackage[0],
+ Str::replaceLast('.git', '', $vendorAndPackage[1]),
+ ];
}
$urlParts = explode('/', $url);
|
fix bug with clone url with .git on the end
|
diff --git a/lib/discordrb/gateway.rb b/lib/discordrb/gateway.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/gateway.rb
+++ b/lib/discordrb/gateway.rb
@@ -278,5 +278,17 @@ module Discordrb
def handle_message(msg)
end
+
+ def send(data, opt = { type: :text })
+ return if !@handshaked || @closed
+ type = opt[:type]
+ frame = ::WebSocket::Frame::Outgoing::Client.new(data: data, type: type, version: @handshake.version)
+ begin
+ @socket.write frame.to_s
+ rescue Errno::EPIPE => e
+ @pipe_broken = true
+ emit :__close, e
+ end
+ end
end
end
|
Copy over WSCS' send method
|
diff --git a/test/legacy/node-8/main.js b/test/legacy/node-8/main.js
index <HASH>..<HASH> 100644
--- a/test/legacy/node-8/main.js
+++ b/test/legacy/node-8/main.js
@@ -67,6 +67,11 @@ testArbitrary(fc.float({ next: true, noNaN: true })); // NaN is not properly rec
testArbitrary(fc.double({ next: true, noNaN: true }));
testArbitrary(fc.emailAddress());
testArbitrary(fc.webUrl());
+testArbitrary(fc.int8Array());
+testArbitrary(fc.int16Array());
+testArbitrary(fc.int32Array());
+testArbitrary(fc.float32Array());
+testArbitrary(fc.float64Array());
testArbitrary(
fc.mapToConstant(
{
|
✅ Add legacy tests for typed arrays (#<I>)
|
diff --git a/jsoup/src/main/java/org/hobsoft/microbrowser/jsoup/JsoupForm.java b/jsoup/src/main/java/org/hobsoft/microbrowser/jsoup/JsoupForm.java
index <HASH>..<HASH> 100644
--- a/jsoup/src/main/java/org/hobsoft/microbrowser/jsoup/JsoupForm.java
+++ b/jsoup/src/main/java/org/hobsoft/microbrowser/jsoup/JsoupForm.java
@@ -165,7 +165,7 @@ class JsoupForm implements Form
}
else
{
- action = element.ownerDocument().baseUri();
+ action = element.baseUri();
}
return newUrlOrNull(action);
|
Simplify obtaining form's base URI
|
diff --git a/sesame/test_backends.py b/sesame/test_backends.py
index <HASH>..<HASH> 100644
--- a/sesame/test_backends.py
+++ b/sesame/test_backends.py
@@ -75,15 +75,6 @@ class TestModelBackend(TestCase):
self.assertEqual(user, None)
self.assertIn("Invalid token", self.get_log())
- def test_type_error_is_logged(self):
- def raise_type_error(*args):
- raise TypeError
-
- self.backend.parse_token = raise_type_error
- with self.assertRaises(TypeError):
- self.backend.authenticate(request=None, url_auth_token=None)
- self.assertIn("TypeError", self.get_log())
-
def test_naive_token_hijacking_fails(self):
# Tokens contain the PK of the user, the hash of the revocation key,
# and a signature. The revocation key may be identical for two users:
|
Remove test forgotten in <I>dd<I>.
|
diff --git a/src/main/java/io/appium/java_client/MobileBy.java b/src/main/java/io/appium/java_client/MobileBy.java
index <HASH>..<HASH> 100644
--- a/src/main/java/io/appium/java_client/MobileBy.java
+++ b/src/main/java/io/appium/java_client/MobileBy.java
@@ -102,9 +102,13 @@ public abstract class MobileBy extends By {
* @param iOSNsPredicateString is an an iOS NsPredicate String
* @return an instance of {@link io.appium.java_client.MobileBy.ByIosNsPredicate}
*/
- public static By IosNsPredicateString(final String iOSNsPredicateString) {
+ public static By iOSNsPredicateString(final String iOSNsPredicateString) {
return new ByIosNsPredicate(iOSNsPredicateString);
}
+
+ public static By windowsAutomation(final String windowsAutomation) {
+ return new ByWindowsAutomation(windowsAutomation);
+ }
public static class ByIosUIAutomation extends MobileBy implements Serializable {
|
#<I> fix. Issues that found by Codecy were fixed
|
diff --git a/pipenv/environments.py b/pipenv/environments.py
index <HASH>..<HASH> 100644
--- a/pipenv/environments.py
+++ b/pipenv/environments.py
@@ -25,12 +25,6 @@ Some people don't like colors in their terminals, for some reason. Default is
to show colors.
"""
-PIPENV_VERBOSITY = int(os.environ.get("PIPENV_VERBOSITY", "0"))
-"""Verbosity setting for pipenv. Higher values make pipenv less verbose.
-
-Default is 0, for maximum verbosity.
-"""
-
# Tells Pipenv which Python to default to, when none is provided.
PIPENV_DEFAULT_PYTHON_VERSION = os.environ.get("PIPENV_DEFAULT_PYTHON_VERSION")
"""Use this Python version when creating new virtual environments by default.
@@ -180,6 +174,12 @@ PIPENV_VENV_IN_PROJECT = bool(os.environ.get("PIPENV_VENV_IN_PROJECT"))
Default is to create new virtual environments in a global location.
"""
+PIPENV_VERBOSITY = int(os.environ.get("PIPENV_VERBOSITY", "0"))
+"""Verbosity setting for pipenv. Higher values make pipenv less verbose.
+
+Default is 0, for maximum verbosity.
+"""
+
PIPENV_YES = bool(os.environ.get("PIPENV_YES"))
"""If set, Pipenv automatically assumes "yes" at all prompts.
|
Move PIPENV_VERBOSITY to correct place in alphabet
Oops.
|
diff --git a/core-bundle/contao/library/Contao/Model/QueryBuilder.php b/core-bundle/contao/library/Contao/Model/QueryBuilder.php
index <HASH>..<HASH> 100644
--- a/core-bundle/contao/library/Contao/Model/QueryBuilder.php
+++ b/core-bundle/contao/library/Contao/Model/QueryBuilder.php
@@ -83,6 +83,12 @@ class QueryBuilder
$strQuery .= " GROUP BY " . $arrOptions['group'];
}
+ // Having (see #6446)
+ if ($arrOptions['having'] !== null)
+ {
+ $strQuery .= " HAVING " . $arrOptions['having'];
+ }
+
// Order by
if ($arrOptions['order'] !== null)
{
|
[Core] Support the "HAVING" command in the `Model\QueryBuilder` class (see #<I>)
|
diff --git a/api/src/main/java/org/telegram/botapi/api/chat/Chat.java b/api/src/main/java/org/telegram/botapi/api/chat/Chat.java
index <HASH>..<HASH> 100644
--- a/api/src/main/java/org/telegram/botapi/api/chat/Chat.java
+++ b/api/src/main/java/org/telegram/botapi/api/chat/Chat.java
@@ -1,5 +1,6 @@
package org.telegram.botapi.api.chat;
+import org.telegram.botapi.api.TelegramBot;
import org.telegram.botapi.api.chat.message.Message;
import org.telegram.botapi.api.chat.message.send.SendableMessage;
import org.telegram.botapi.api.chat.message.send.SendableTextMessage;
@@ -11,10 +12,10 @@ public interface Chat {
int getId();
- default Message sendMessage(String message) {
+ default Message sendMessage(String message, TelegramBot telegramBot) {
- return this.sendMessage(SendableTextMessage.builder().message(message).build());
+ return this.sendMessage(SendableTextMessage.builder().message(message).build(), telegramBot);
}
- Message sendMessage(SendableMessage message);
+ Message sendMessage(SendableMessage message, TelegramBot telegramBot);
}
\ No newline at end of file
|
Changed Chat#sendMessage(String) and Chat#sendMessage(SendableMessage) to include a TelegramBot argument in order to support multiple bots in one program
|
diff --git a/src/libs/customelement.js b/src/libs/customelement.js
index <HASH>..<HASH> 100644
--- a/src/libs/customelement.js
+++ b/src/libs/customelement.js
@@ -29,14 +29,6 @@ export default class CustomElement {
// create static factory method for creating dominstance
ComponentClass.create = function($create_vars = null){
- // override constructor
- /**
- * Nativ CustomElements doesnt allow to use a constructor
- * therefore if constructor is added by the user we override that
- * otherwise an error could be thrown.
- *
- */
- this.constructor = function(){};
// extract and assign instance properties
/**
|
customelement.js: removed unnecessary code
|
diff --git a/src/canari/unittests/maltego/entities.py b/src/canari/unittests/maltego/entities.py
index <HASH>..<HASH> 100644
--- a/src/canari/unittests/maltego/entities.py
+++ b/src/canari/unittests/maltego/entities.py
@@ -1,6 +1,6 @@
from datetime import date, datetime, timedelta
from canari.maltego.message import Entity, Field, StringEntityField, IntegerEntityField, FloatEntityField, \
- BooleanEntityField, EnumEntityField, LongEntityField, DateTimeEntityField, DateEntityField, timespan, \
+ BooleanEntityField, EnumEntityField, LongEntityField, DateTimeEntityField, DateEntityField, TimeSpan, \
TimeSpanEntityField, RegexEntityField, ColorEntityField
from unittest import TestCase
|
Old entities unittests need to update
|
diff --git a/core/Common.php b/core/Common.php
index <HASH>..<HASH> 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -471,7 +471,13 @@ class Common
$ok = false;
if ($varType === 'string') {
- if (is_string($value)) $ok = true;
+ if (is_string($value) || is_int($value)) {
+ $ok = true;
+ } else if (is_float($value)) {
+ $value = Common::forceDotAsSeparatorForDecimalPoint($value);
+ $ok = true;
+ }
+
} elseif ($varType === 'integer') {
if ($value == (string)(int)$value) $ok = true;
} elseif ($varType === 'float') {
|
do not lose value in case it is an integer or a float. Instead convert it to a string.
Eg this returned the default value in the past: `Common::getRequestVar('param', 'string', 'default', array('param' => 5))` which can happen eg in BulkTracking etc. causing many values not to be tracked. Wondering if it breaks anything.
|
diff --git a/lib/cucumber/cli/options.rb b/lib/cucumber/cli/options.rb
index <HASH>..<HASH> 100644
--- a/lib/cucumber/cli/options.rb
+++ b/lib/cucumber/cli/options.rb
@@ -27,7 +27,7 @@ module Cucumber
max = BUILTIN_FORMATS.keys.map{|s| s.length}.max
FORMAT_HELP = (BUILTIN_FORMATS.keys.sort.map do |key|
" #{key}#{' ' * (max - key.length)} : #{BUILTIN_FORMATS[key][1]}"
- end) + ["Use --format rerun --out features.txt to write out failing",
+ end) + ["Use --format rerun --out rerun.txt to write out failing",
"features. You can rerun them with cucumber @rerun.txt.",
"FORMAT can also be the fully qualified class name of",
"your own custom formatter. If the class isn't loaded,",
|
Incorrect help text was bothering me.
|
diff --git a/quarkc/command.py b/quarkc/command.py
index <HASH>..<HASH> 100644
--- a/quarkc/command.py
+++ b/quarkc/command.py
@@ -219,6 +219,7 @@ def main(args):
else:
assert False
except compiler.QuarkError as err:
+ command_log.warn("")
return err
command_log.warn("Done")
|
Flush progress bar in case of compile errors
|
diff --git a/src/eth/NonceService.js b/src/eth/NonceService.js
index <HASH>..<HASH> 100644
--- a/src/eth/NonceService.js
+++ b/src/eth/NonceService.js
@@ -26,7 +26,8 @@ export default class NonceService extends PublicService {
getNonce() {
return this.get('web3')._web3.eth.getTransactionCount(
- this.get('web3').defaultAccount()
+ this.get('web3').defaultAccount(),
+ 'pending'
);
}
}
|
Include pending transactions in web3 count query
|
diff --git a/test_load_paul_pubring.py b/test_load_paul_pubring.py
index <HASH>..<HASH> 100644
--- a/test_load_paul_pubring.py
+++ b/test_load_paul_pubring.py
@@ -72,7 +72,12 @@ pb3w = [PacketCounter(packets), '|', Timer("%s"), '|', Percentage(), Bar()]
pbar3 = ProgressBar(maxval=_mv, widgets=pb3w).start()
while len(_b) > 0:
- packets.append(Packet(_b))
+ olen = len(_b)
+ pkt = Packet(_b)
+ if (olen - len(_b)) != len(pkt.header) + pkt.header.length:
+ print("Incorrect number of bytes consumed. Got: {:,}. Expected: {:,}".format((olen - len(_b)), (len(pkt.header) + pkt.header.length)))
+ print("Bad packet was: {cls:s}, {id:d}, {ver:s}".format(cls=pkt.__class__.__name__, id=pkt.header.typeid, ver=str(pkt.header.version) if hasattr(pkt.header, 'version') else ''))
+ packets.append(pkt)
pbar3.update(_mv - len(_b))
pbar3.finish()
|
added some helpful error output to benchmark script
|
diff --git a/src/test/java/com/suse/salt/netapi/examples/GitModule.java b/src/test/java/com/suse/salt/netapi/examples/GitModule.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/suse/salt/netapi/examples/GitModule.java
+++ b/src/test/java/com/suse/salt/netapi/examples/GitModule.java
@@ -30,8 +30,8 @@ public class GitModule {
private static final String HTTPS_PASS = "saltgit";
public static void main(String[] args) {
- // Init the client
- SaltClient client =
+ // the client
+ SaltClient client =
new SaltClient(URI.create(SALT_API_URL),
new HttpAsyncClientImpl(HttpClientUtils.defaultClient()));
Token token = client.login(USER, PASSWORD, AuthModule.PAM).toCompletableFuture().join();
@@ -48,7 +48,7 @@ public class GitModule {
// substitute above line for the below line of no user and password
// Optional.empty(), Optional.empty(), Optional.empty());
- Map<String, Result<Boolean>> results =
+ Map<String, Result<Boolean>> results =
call.callSync(client, new MinionList(MINION_ID), tokenAuth).toCompletableFuture().join();
System.out.println("Response from minions:");
|
Remove tabs at the beguinning of the line.
|
diff --git a/lib/flapjack/processor.rb b/lib/flapjack/processor.rb
index <HASH>..<HASH> 100755
--- a/lib/flapjack/processor.rb
+++ b/lib/flapjack/processor.rb
@@ -86,7 +86,7 @@ module Flapjack
redis_version = Flapjack.redis.info['redis_version']
required_version = '2.6.12'
- raise "Redis too old - Flapjack requires #{required_version} but #{redis_version} is running" if Gem::Version.new(redis_version) < Gem::Version.new(required_version)
+ raise "Redis too old - Flapjack requires #{required_version} but #{redis_version} is running" if redis_version && Gem::Version.new(redis_version) < Gem::Version.new(required_version)
# FIXME: add an administrative function to reset all event counters
|
Only exit if we were able to detect redis' current version
|
diff --git a/bucket/option/put.go b/bucket/option/put.go
index <HASH>..<HASH> 100644
--- a/bucket/option/put.go
+++ b/bucket/option/put.go
@@ -13,6 +13,7 @@ type PutObjectInput func(req *s3.PutObjectInput)
func SSEKMSKeyID(keyID string) PutObjectInput {
return func(req *s3.PutObjectInput) {
req.SSEKMSKeyId = aws.String(keyID)
+ req.ServerSideEncryption = aws.String("aws:kms")
}
}
|
bucket: Set ServerSideEncryption = "aws:kms"
|
diff --git a/definitions/npm/koa_v2.x.x/flow_v0.94.x-/koa_v2.x.x.js b/definitions/npm/koa_v2.x.x/flow_v0.94.x-/koa_v2.x.x.js
index <HASH>..<HASH> 100644
--- a/definitions/npm/koa_v2.x.x/flow_v0.94.x-/koa_v2.x.x.js
+++ b/definitions/npm/koa_v2.x.x/flow_v0.94.x-/koa_v2.x.x.js
@@ -8,7 +8,7 @@
* breaking: ctx.throw([status], [msg], [properties]) (caused by http-errors (#957) )
**/
declare module 'koa' {
- declare type JSON = | string | number | boolean | null | JSONObject | JSONArray;
+ declare type JSON = | string | number | boolean | null | void | JSONObject | JSONArray;
declare type JSONObject = { [key: string]: JSON };
declare type JSONArray = Array<JSON>;
@@ -209,7 +209,7 @@ declare module 'koa' {
res: http$ServerResponse,
respond?: boolean, // should not be used, allow bypassing koa application.js#L193
response: Response,
- state: {},
+ state: {[string]: any},
// context.js#L55
assert: (test: mixed, status: number, message?: string, opts?: mixed) => void,
|
[koa_v2.x.x.js] Update object types (#<I>)
* Update koa types
* Change undefined to void
|
diff --git a/faker/providers/person/en_GB/__init__.py b/faker/providers/person/en_GB/__init__.py
index <HASH>..<HASH> 100644
--- a/faker/providers/person/en_GB/__init__.py
+++ b/faker/providers/person/en_GB/__init__.py
@@ -588,5 +588,5 @@ class Provider(PersonProvider):
('Watkins', 0.06),
))
- prefixes_female = ('Mrs.', 'Ms.', 'Miss', 'Dr.')
- prefixes_male = ('Mr.', 'Dr.')
+ prefixes_female = ('Mrs', 'Ms', 'Miss', 'Dr')
+ prefixes_male = ('Mr', 'Dr')
|
Remove period/fullstop from en_GB prefixes (#<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
long_description=_get_description(),
long_description_content_type="text/markdown",
install_requires=["Django>=1.11,<2.3", "psycopg2-binary"],
- extras_require={"development": ["python-coveralls", "mkdocs"]},
+ extras_require={"development": ["coveralls", "mkdocs"]},
classifiers=[
"Framework :: Django",
"Framework :: Django :: 1.11",
|
python-coveralls --> coveralls
|
diff --git a/pycbc/libutils.py b/pycbc/libutils.py
index <HASH>..<HASH> 100644
--- a/pycbc/libutils.py
+++ b/pycbc/libutils.py
@@ -39,7 +39,7 @@ def pkg_config_libdirs(packages):
raise ValueError("Package {0} cannot be found on the pkg-config search path".format(pkg))
libdirs = []
- for token in commands.getoutput("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 pkg-config --libs-only-L {0}".format(' '.join(packages))).split():
+ for token in commands.getoutput("PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 pkg-config --libs-only-L {0}".format(' '.join(packages))).split():
if token.startswith("-L"):
libdirs.append(token[2:])
return libdirs
|
Fix pycbc.libutils.pkg_config_libdirs to properly include system installs
|
diff --git a/lib/yard/server/commands/frames_command.rb b/lib/yard/server/commands/frames_command.rb
index <HASH>..<HASH> 100644
--- a/lib/yard/server/commands/frames_command.rb
+++ b/lib/yard/server/commands/frames_command.rb
@@ -6,7 +6,9 @@ module YARD
def run
main_url = request.path.gsub(/^(.+)?\/frames\/(#{path})$/, '\1/\2')
- if path && !path.empty?
+ if path =~ %r{^file/}
+ page_title = "File: #{$'}"
+ elsif !path.empty?
page_title = "Object: #{object_path}"
elsif options[:files] && options[:files].size > 0
page_title = "File: #{options[:files].first.sub(/^#{library.source_path}\/?/, '')}"
|
Fix titles for File urls in frames
|
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
index <HASH>..<HASH> 100755
--- a/DependencyInjection/DoctrineExtension.php
+++ b/DependencyInjection/DoctrineExtension.php
@@ -154,7 +154,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
{
$containerDef = new Definition($container->getParameter('doctrine.dbal.configuration_class'));
$containerDef->setPublic(false);
- if (isset($connection['logging']) && $connection['logging']) {
+ if (isset($connection['container']['logging']) && $connection['container']['logging']) {
$containerDef->addMethodCall('setSQLLogger', array(new Reference('doctrine.dbal.logger')));
}
$container->setDefinition(sprintf('doctrine.dbal.%s_connection.configuration', $connection['name']), $containerDef);
|
[DoctrineBundle] Fixed loggin in DoctrineExtension not being taken into account
|
diff --git a/tests/rackspace/models/compute_v2/servers_tests.rb b/tests/rackspace/models/compute_v2/servers_tests.rb
index <HASH>..<HASH> 100644
--- a/tests/rackspace/models/compute_v2/servers_tests.rb
+++ b/tests/rackspace/models/compute_v2/servers_tests.rb
@@ -11,4 +11,10 @@ Shindo.tests('Fog::Compute::RackspaceV2 | servers', ['rackspace']) do
collection_tests(service.servers, options, false) do
@instance.wait_for { ready? }
end
+
+ tests("#bootstrap").succeeds do
+ @server = service.servers.bootstrap(options)
+ end
+ @server.destroy
+
end
|
[rackspace|computev2] aded test for bootstrap
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,6 @@ setup(
packages=["geojson"],
package_dir={"geojson": "geojson"},
package_data={"geojson": ["*.rst"]},
- setup_requires=["nose==1.3.0"],
tests_require=["nose==1.3.0", "coverage==3.6"],
install_requires=["setuptools"],
test_suite="nose.collector",
|
Remove nose from setup_requires. Fixes #<I>
|
diff --git a/sphinx-prompt/__init__.py b/sphinx-prompt/__init__.py
index <HASH>..<HASH> 100644
--- a/sphinx-prompt/__init__.py
+++ b/sphinx-prompt/__init__.py
@@ -103,7 +103,7 @@ class PromptDirective(rst.Directive):
).strip('\r\n')
)
statement = []
- line = line[len(prompt):].strip()
+ line = line[len(prompt):].rstrip()
prompt_class = cache.get_prompt_class(prompt)
break
|
Only strip trailing whitespace from lines to preserve indentation.
|
diff --git a/lib/schema/schema/compare/comparison.rb b/lib/schema/schema/compare/comparison.rb
index <HASH>..<HASH> 100644
--- a/lib/schema/schema/compare/comparison.rb
+++ b/lib/schema/schema/compare/comparison.rb
@@ -28,11 +28,11 @@ module Schema
def self.assure_schemas(control, compare)
if not control.is_a?(Schema)
- raise Error, 'Control object is not an implementation of Schema'
+ raise Error, 'Control object is not an implementation of Schema (Control Class: #{control.class.name})'
end
if not compare.is_a?(Schema)
- raise Error, 'Compare object is not an implementation of Schema'
+ raise Error, 'Compare object is not an implementation of Schema (Compare Class: #{compare.class.name})'
end
end
|
Control and compare classes are printed in the error message when inputs aren't Schema instances
|
diff --git a/examples/run_swag.py b/examples/run_swag.py
index <HASH>..<HASH> 100644
--- a/examples/run_swag.py
+++ b/examples/run_swag.py
@@ -509,7 +509,7 @@ def main():
model.eval()
eval_loss, eval_accuracy = 0, 0
nb_eval_steps, nb_eval_examples = 0, 0
- for input_ids, input_mask, segment_ids, label_ids in eval_dataloader:
+ for input_ids, input_mask, segment_ids, label_ids in tqdm(eval_dataloader, desc="Evaluating"):
input_ids = input_ids.to(device)
input_mask = input_mask.to(device)
segment_ids = segment_ids.to(device)
|
add tqdm to the process of eval
Maybe better.
|
diff --git a/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsRepoResolver.java b/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsRepoResolver.java
index <HASH>..<HASH> 100644
--- a/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsRepoResolver.java
+++ b/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsRepoResolver.java
@@ -74,7 +74,7 @@ public class GrailsRepoResolver extends URLResolver{
public String transformGrailsRepositoryPattern(ModuleRevisionId mrid, String pattern) {
final String revision = mrid.getRevision();
String versionTag;
- if (revision.equals("latest.integration") || revision.equals("latest")) {
+ if (revision.equals("latest.integration") || revision.equals("latest")|| revision.equals("latest.release")) {
versionTag = "LATEST_RELEASE";
}
else {
|
fix for GRAILS-<I> "latest.release in plugin does not work in <I> RC2 against main grails repo"
|
diff --git a/lib/generators/engine_cart/install_generator.rb b/lib/generators/engine_cart/install_generator.rb
index <HASH>..<HASH> 100644
--- a/lib/generators/engine_cart/install_generator.rb
+++ b/lib/generators/engine_cart/install_generator.rb
@@ -41,7 +41,7 @@ module EngineCart
return if (system('git', 'check-ignore', TEST_APP, '-q') rescue false)
append_file File.expand_path('.gitignore', git_root) do
- "#{EngineCart.destination}\n"
+ "\n#{EngineCart.destination}\n"
end
end
|
Handling entry into .gitignore
In cases where the last line of the .gitignore is a non-empty line,
this patch ensures that the injected entry isn't concatonated with the
non-empty line.
|
diff --git a/werkzeug/wsgi.py b/werkzeug/wsgi.py
index <HASH>..<HASH> 100644
--- a/werkzeug/wsgi.py
+++ b/werkzeug/wsgi.py
@@ -691,8 +691,8 @@ def make_line_iter(stream, limit=None, buffer_size=10 * 1024):
new_buf = []
for item in chain(buffer, new_data.splitlines(True)):
new_buf.append(item)
- if item and item[-1:] in b'\r\n':
- yield b''.join(new_buf)
+ if item and item[-1:] in '\r\n':
+ yield ''.join(new_buf)
new_buf = []
buffer = new_buf
if buffer:
|
Make make_line_iter operate on native strings
Previously it was inconsistently broken, now it is consistently broken
and produces more errors. That's not as bad as it sounds.
|
diff --git a/networkzero/core.py b/networkzero/core.py
index <HASH>..<HASH> 100644
--- a/networkzero/core.py
+++ b/networkzero/core.py
@@ -267,6 +267,7 @@ def address(address=None):
except socket.gaierror as exc:
raise InvalidAddressError(host_or_ip, exc.errno)
+ _logger.debug("About to return %s:%s", ip, port)
return "%s:%s" % (ip, port)
split_command = shlex.split
\ No newline at end of file
diff --git a/networkzero/sockets.py b/networkzero/sockets.py
index <HASH>..<HASH> 100644
--- a/networkzero/sockets.py
+++ b/networkzero/sockets.py
@@ -144,7 +144,10 @@ class Sockets:
def send_reply(self, address, reply):
socket = self.get_socket(address, zmq.REP)
- return socket.send(_serialise(reply))
+ _logger.debug("Got socket for reply: %s", socket)
+ reply = _serialise(reply)
+ _logger.debug("Reply is: %r", reply)
+ return socket.send(reply)
def send_notification(self, address, topic, data):
socket = self.get_socket(address, zmq.PUB)
|
Put a bit of extra tracing in
|
diff --git a/test/test_ops.py b/test/test_ops.py
index <HASH>..<HASH> 100644
--- a/test/test_ops.py
+++ b/test/test_ops.py
@@ -46,9 +46,11 @@ class RoIOpTester(ABC):
tol = 1e-3 if (x_dtype is torch.half or rois_dtype is torch.half) else 1e-5
torch.testing.assert_close(gt_y.to(y), y, rtol=tol, atol=tol)
+ @pytest.mark.parametrize("seed", range(10))
@pytest.mark.parametrize("device", cpu_and_gpu())
@pytest.mark.parametrize("contiguous", (True, False))
- def test_backward(self, device, contiguous):
+ def test_backward(self, seed, device, contiguous):
+ torch.random.manual_seed(seed)
pool_size = 2
x = torch.rand(1, 2 * (pool_size ** 2), 5, 5, dtype=self.dtype, device=device, requires_grad=True)
if not contiguous:
|
Setting seeds for TestRoiPool backward. (#<I>)
|
diff --git a/openquake/engine/db/models.py b/openquake/engine/db/models.py
index <HASH>..<HASH> 100644
--- a/openquake/engine/db/models.py
+++ b/openquake/engine/db/models.py
@@ -97,7 +97,7 @@ LOSS_TYPES = ["structural", "nonstructural", "fatalities", "contents"]
#: relative tolerance to consider two risk outputs (almost) equal
-RISK_RTOL = 0.05
+RISK_RTOL = 0.08
#: absolute tolerance to consider two risk outputs (almost) equal
|
increased tolerance to 8%
Former-commit-id: c<I>e7d4f<I>bdfc7a6ae2ec8d<I>dc9cf<I>c<I>
|
diff --git a/openid/consumer/discover.py b/openid/consumer/discover.py
index <HASH>..<HASH> 100644
--- a/openid/consumer/discover.py
+++ b/openid/consumer/discover.py
@@ -433,7 +433,7 @@ def discoverXRI(iname):
def discoverNoYadis(uri):
http_resp = fetchers.fetch(uri)
- if http_resp.status != 200:
+ if http_resp.status not in (200, 206):
raise DiscoveryFailure(
'HTTP Response status from identity URL host is not 200. '
'Got status %r' % (http_resp.status,), http_resp)
|
[project @ Add <I> status check to openid.consumer.discover]
|
diff --git a/BimServer/src/org/bimserver/geometry/GeometryGenerationReport.java b/BimServer/src/org/bimserver/geometry/GeometryGenerationReport.java
index <HASH>..<HASH> 100644
--- a/BimServer/src/org/bimserver/geometry/GeometryGenerationReport.java
+++ b/BimServer/src/org/bimserver/geometry/GeometryGenerationReport.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.bimserver.emf.Schema;
@@ -59,7 +59,7 @@ public class GeometryGenerationReport {
private int numberOfTriangles;
private int numberOfTrianglesIncludingReuse;
private boolean reuseGeometry;
- private Map<Integer, String> debugFiles = new TreeMap<>();
+ private final Map<Integer, String> debugFiles = new ConcurrentSkipListMap<>();
public synchronized void incrementTriangles(int triangles) {
this.numberOfTriangles += triangles;
|
Fixed concurrency issue when writing debug files (endless loop...)
|
diff --git a/libraries/joomla/application/categories.php b/libraries/joomla/application/categories.php
index <HASH>..<HASH> 100644
--- a/libraries/joomla/application/categories.php
+++ b/libraries/joomla/application/categories.php
@@ -281,7 +281,7 @@ class JCategories
$this->_nodes[$result->id] = new JCategoryNode($result, $this);
// If this is not root and if the current node's parent is in the list or the current node parent is 0
- if ($result->id != 'root' && (isset($this->_nodes[$result->parent_id]) || $result->parent_id == 0)) {
+ if ($result->id != 'root' && (isset($this->_nodes[$result->parent_id]) || $result->parent_id == 1)) {
// Compute relationship between node and its parent - set the parent in the _nodes field
$this->_nodes[$result->id]->setParent($this->_nodes[$result->parent_id]);
}
@@ -648,7 +648,9 @@ class JCategoryNode extends JObject
$this->_parent = & $parent;
if ($this->id != 'root') {
- $this->_path = $parent->getPath();
+ if ($this->parent_id != 1 ) {
+ $this->_path = $parent->getPath();
+ }
$this->_path[] = $this->id.':'.$this->alias;
}
|
Correct fatal error when a category id of 0 is passed in; this was
exposed as a problem with system test failurs on the CMS whem there
was a failure to get the module params correctly. With this hange fall
back to default works.
|
diff --git a/src/client/index.js b/src/client/index.js
index <HASH>..<HASH> 100644
--- a/src/client/index.js
+++ b/src/client/index.js
@@ -115,7 +115,7 @@ const setOptions = ({
}
// Universal method (client + server)
-const getSession = async ({ req, ctx, triggerEvent = true } = {}) => {
+export const getSession = async ({ req, ctx, triggerEvent = true } = {}) => {
// If passed 'appContext' via getInitialProps() in _app.js then get the req
// object from ctx and use that for the req value to allow getSession() to
// work seemlessly in getInitialProps() on server side pages *and* in _app.js.
|
fix: export getSession [skip release]
somehow the default export does not work in the dev app
|
diff --git a/auth/db/auth.php b/auth/db/auth.php
index <HASH>..<HASH> 100644
--- a/auth/db/auth.php
+++ b/auth/db/auth.php
@@ -334,10 +334,12 @@ class auth_plugin_db extends auth_plugin_base {
// simplify down to usernames
$usernames = array();
- foreach ($users as $user) {
- array_push($usernames, $user->username);
+ if (!empty($users)) {
+ foreach ($users as $user) {
+ array_push($usernames, $user->username);
+ }
+ unset($users);
}
- unset($users);
$add_users = array_diff($userlist, $usernames);
unset($usernames);
|
Merged from MOODLE_<I>_STABLE: MDL-<I> - auth/db - suppress php warning when there are no users using db auth
|
diff --git a/sim_access.py b/sim_access.py
index <HASH>..<HASH> 100644
--- a/sim_access.py
+++ b/sim_access.py
@@ -6,9 +6,9 @@ import difflib
# read the contents of /etc/authorization
with open('/etc/authorization','r') as file:
content = file.read()
-match = re.search('<key>system.privilege.taskport.debug</key>\s*\n\s*<dict>\n\s*<key>allow-root</key>\n\s*(<[^>]+>)',content)
+match = re.search('<key>system.privilege.taskport</key>\s*\n\s*<dict>\n\s*<key>allow-root</key>\n\s*(<[^>]+>)',content)
if match is None:
- raise Exception('Could not find the system.privilege.taskport.debug key in /etc/authorization')
+ raise Exception('Could not find the system.privilege.taskport key in /etc/authorization')
elif re.search('<false/>', match.group(0)) is None:
print '/etc/authorization has already been modified'
exit(0)
|
removing the debug key - this is not the cause of the issue. Travis have opened a bug to resolve this on their VMs
|
diff --git a/code/transform/QueuedExternalContentImporter.php b/code/transform/QueuedExternalContentImporter.php
index <HASH>..<HASH> 100644
--- a/code/transform/QueuedExternalContentImporter.php
+++ b/code/transform/QueuedExternalContentImporter.php
@@ -61,8 +61,8 @@ abstract class QueuedExternalContentImporter extends AbstractQueuedJob {
foreach ($children as $child) {
$count++;
if ($count > 20) {
- $this->totalSteps = 20;
- return QueuedJob::LARGE;
+ $this->totalSteps = $count;
+ return QueuedJob::QUEUED;
}
$subChildren = $child->stageChildren();
@@ -70,8 +70,8 @@ abstract class QueuedExternalContentImporter extends AbstractQueuedJob {
foreach ($subChildren as $sub) {
$count++;
if ($count > 20) {
- $this->totalSteps = 20;
- return QueuedJob::LARGE;
+ $this->totalSteps = $count;
+ return QueuedJob::QUEUED;
}
}
}
|
Changed queued external importer to use the normal queue
|
diff --git a/src/components/container_factory/container_factory.js b/src/components/container_factory/container_factory.js
index <HASH>..<HASH> 100644
--- a/src/components/container_factory/container_factory.js
+++ b/src/components/container_factory/container_factory.js
@@ -24,7 +24,7 @@ var ContainerFactory = BaseObject.extend({
}.bind(this));
},
findPlaybackPlugin: function(source) {
- return _.find(this.loader.playbackPlugins, function(p) { return p.canPlay(source) }, this);
+ return _.find(this.loader.playbackPlugins, function(p) { return p.canPlay("" + source) }, this);
},
createContainer: function(source) {
var playbackPlugin = this.findPlaybackPlugin(source);
|
container factory: change source type to string to ensure that canplay works correctly
|
diff --git a/jsonschema/cli.py b/jsonschema/cli.py
index <HASH>..<HASH> 100644
--- a/jsonschema/cli.py
+++ b/jsonschema/cli.py
@@ -22,10 +22,6 @@ def _json_file(path):
return json.load(file)
-def _read_from_stdin(stdin):
- return json.loads(stdin.read())
-
-
parser = argparse.ArgumentParser(
description="JSON Schema Validation CLI",
)
@@ -87,7 +83,7 @@ def run(arguments, stdout=sys.stdout, stderr=sys.stderr, stdin=sys.stdin):
validator.check_schema(arguments["schema"])
errored = False
- for instance in arguments["instances"] or (_read_from_stdin(stdin),):
+ for instance in arguments["instances"] or [json.load(stdin)]:
for error in validator.iter_errors(instance):
stderr.write(error_format.format(error=error))
errored = True
|
Might as well just inline it.
|
diff --git a/lib/shellter.rb b/lib/shellter.rb
index <HASH>..<HASH> 100644
--- a/lib/shellter.rb
+++ b/lib/shellter.rb
@@ -1,5 +1,4 @@
require 'escape'
-require 'popen4'
require 'shellter/core_ext'
diff --git a/lib/shellter/version.rb b/lib/shellter/version.rb
index <HASH>..<HASH> 100644
--- a/lib/shellter/version.rb
+++ b/lib/shellter/version.rb
@@ -1,3 +1,3 @@
module Shellter
- VERSION = "0.9.2"
+ VERSION = "0.9.3"
end
|
got rid of explicit popen4 requirement
|
diff --git a/test/Liip/RMT/Tests/Functional/TestsCheckTest.php b/test/Liip/RMT/Tests/Functional/TestsCheckTest.php
index <HASH>..<HASH> 100644
--- a/test/Liip/RMT/Tests/Functional/TestsCheckTest.php
+++ b/test/Liip/RMT/Tests/Functional/TestsCheckTest.php
@@ -10,10 +10,10 @@ class TestsCheckTest extends \PHPUnit_Framework_TestCase
{
protected function setUp()
{
- $informationCollector = $this->createMock('Liip\RMT\Information\InformationCollector');
+ $informationCollector = $this->getMock('Liip\RMT\Information\InformationCollector');
$informationCollector->method('getValueFor')->with(TestsCheck::SKIP_OPTION)->willReturn(false);
- $output = $this->createMock('Symfony\Component\Console\Output\OutputInterface');
+ $output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
$output->method('write');
$context = Context::getInstance();
|
Make mocks added in test-check timeout tests PHPUnit <I>-compatible
|
diff --git a/lib/wally/application.rb b/lib/wally/application.rb
index <HASH>..<HASH> 100644
--- a/lib/wally/application.rb
+++ b/lib/wally/application.rb
@@ -11,7 +11,7 @@ end
if ENV["MONGOHQ_URL"]
Mongoid.configure do |config|
- config.master = Mongo::Connection.from_uri(ENV["MONGOHQ_URL"]).db
+ config.master = Mongo::Connection.from_uri(ENV["MONGOHQ_URL"]).db("wally")
end
else
Mongoid.configure do |config|
|
Mongohq url still failing
|
diff --git a/poetry/console/commands/remove.py b/poetry/console/commands/remove.py
index <HASH>..<HASH> 100644
--- a/poetry/console/commands/remove.py
+++ b/poetry/console/commands/remove.py
@@ -39,7 +39,7 @@ list of installed packages
for key in poetry_content[section]:
if key.lower() == name.lower():
found = True
- requirements[name] = poetry_content[section][name]
+ requirements[key] = poetry_content[section][key]
break
if not found:
|
Fix remove's case insensitivity (#<I>)
|
diff --git a/src/main/java/com/github/greengerong/PrerenderSeoService.java b/src/main/java/com/github/greengerong/PrerenderSeoService.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/github/greengerong/PrerenderSeoService.java
+++ b/src/main/java/com/github/greengerong/PrerenderSeoService.java
@@ -262,7 +262,8 @@ public class PrerenderSeoService {
return from(prerenderConfig.getExtensionsToIgnore()).anyMatch(new Predicate<String>() {
@Override
public boolean apply(String item) {
- return url.contains(item.toLowerCase());
+ return (url.indexOf('?') >= 0 ? url.substring(0, url.indexOf('?')) : url)
+ .toLowerCase().endsWith(item);
}
});
}
|
Improved file extension checking.
Updated logic to look for file extensions at the end of the URL, or just before the first question mark if one is present. This should prevent matching on subdomains or URL parameter values.
|
diff --git a/hcl/structure.go b/hcl/structure.go
index <HASH>..<HASH> 100644
--- a/hcl/structure.go
+++ b/hcl/structure.go
@@ -33,9 +33,9 @@ type Blocks []*Block
type Attributes map[string]*Attribute
// Body is a container for attributes and blocks. It serves as the primary
-// unit of heirarchical structure within configuration.
+// unit of hierarchical structure within configuration.
//
-// The content of a body cannot be meaningfully intepreted without a schema,
+// The content of a body cannot be meaningfully interpreted without a schema,
// so Body represents the raw body content and has methods that allow the
// content to be extracted in terms of a given schema.
type Body interface {
|
hcl: fix minor typos in docs (#<I>)
|
diff --git a/src/frontend/org/voltdb/AdmissionControlGroup.java b/src/frontend/org/voltdb/AdmissionControlGroup.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/AdmissionControlGroup.java
+++ b/src/frontend/org/voltdb/AdmissionControlGroup.java
@@ -290,7 +290,11 @@ public class AdmissionControlGroup implements org.voltcore.network.QueueMonitor
procInfoMap.put(procedureName, info);
}
info.processInvocation((int)TimeUnit.NANOSECONDS.toMillis(deltaNanos), status);
- m_latencyInfo.recordValue(Math.max(1, Math.min(TimeUnit.NANOSECONDS.toMicros(deltaNanos), m_latencyInfo.getHighestTrackableValue())));
+ // ENG-7209 This is to not log the latency value for a snapshot restore, as this just creates
+ // a large initial value in the graph which is not actually relevant to the user.
+ if (!procedureName.equals("@SnapshotRestore")) {
+ m_latencyInfo.recordValue(Math.max(1, Math.min(TimeUnit.NANOSECONDS.toMicros(deltaNanos), m_latencyInfo.getHighestTrackableValue())));
+ }
if (needToInsert) {
m_connectionStates.put(connectionId, procInfoMap);
}
|
ENG-<I> removed @SnapshotRestore from latency stats
|
diff --git a/shared/util.go b/shared/util.go
index <HASH>..<HASH> 100644
--- a/shared/util.go
+++ b/shared/util.go
@@ -385,7 +385,7 @@ func isSharedMount(file *os.File, pathName string) int {
for scanner.Scan() {
line := scanner.Text()
rows := strings.Fields(line)
- if !strings.HasSuffix(pathName, rows[3]) || rows[4] != pathName {
+ if !strings.HasSuffix(pathName, rows[3]) && rows[4] != pathName {
continue
}
if strings.HasPrefix(rows[6], "shared:") {
|
Fix logic for sharedmount check. Fixes #<I>
|
diff --git a/ayrton/tests/test_castt.py b/ayrton/tests/test_castt.py
index <HASH>..<HASH> 100644
--- a/ayrton/tests/test_castt.py
+++ b/ayrton/tests/test_castt.py
@@ -48,6 +48,16 @@ class TestBinding (unittest.TestCase):
self.assertTrue ('os' in self.c.seen_names)
+ def testTryExcept (self):
+ t= ast.parse ("""try:
+ foo()
+except Exception as e:
+ pass""")
+
+ t= self.c.modify (t)
+
+ self.assertTrue ('e' in self.c.seen_names)
+
def parse_expression (s):
# Module(body=[Expr(value=...)])
return ast.parse (s).body[0].value
|
[+] test handling names defined in except: clauses.
|
diff --git a/reana_commons/models.py b/reana_commons/models.py
index <HASH>..<HASH> 100644
--- a/reana_commons/models.py
+++ b/reana_commons/models.py
@@ -90,7 +90,7 @@ class Workflow(Base, Timestamp):
id_ = Column(UUIDType, primary_key=True)
name = Column(String(255))
run_number = Column(Integer)
- workspace_path = Column(String(255))
+ workspace_path = Column(String(2048))
status = Column(Enum(WorkflowStatus), default=WorkflowStatus.created)
owner_id = Column(UUIDType, ForeignKey('user_.id_'))
specification = Column(JSONType)
@@ -196,8 +196,8 @@ class Job(Base, Timestamp):
shared_file_system = Column(Boolean)
docker_img = Column(String(256))
experiment = Column(String(256))
- cmd = Column(String(1024))
- env_vars = Column(String(1024))
+ cmd = Column(String(10000))
+ env_vars = Column(String(10000))
restart_count = Column(Integer)
max_restart_count = Column(Integer)
deleted = Column(Boolean)
|
models: increase string sizes
* Increases the sizes of string fields that could
grow large.
|
diff --git a/map/__init__.py b/map/__init__.py
index <HASH>..<HASH> 100644
--- a/map/__init__.py
+++ b/map/__init__.py
@@ -1 +1 @@
-__all__ = ['MapArgumentParser', 'MapConstants', 'mapper', 'version']
+__all__ = ['map_argument_parser', 'map_constants', 'mapper', 'version']
|
Updated due to the renaming of modules.
|
diff --git a/src/PeskyCMF/Db/Traits/ResetsPasswordsViaAccessKey.php b/src/PeskyCMF/Db/Traits/ResetsPasswordsViaAccessKey.php
index <HASH>..<HASH> 100644
--- a/src/PeskyCMF/Db/Traits/ResetsPasswordsViaAccessKey.php
+++ b/src/PeskyCMF/Db/Traits/ResetsPasswordsViaAccessKey.php
@@ -19,6 +19,7 @@ trait ResetsPasswordsViaAccessKey {
'account_id' => $this->_getPkValue(),
'expires_at' => time() + config('auth.passwords.' . \Auth::getDefaultDriver() . 'expire', 60) * 60,
];
+ $this->reload(); //< needed to exclude situation with outdated data
foreach ($this->getAdditionalFieldsForPasswordRecoveryAccessKey() as $fieldName) {
$data[$fieldName] = $this->_getFieldValue($fieldName);
}
|
ResetsPasswordsViaAccessKey->getPasswordRecoveryAccessKey() - added user data reloading to fix problems with outdated timestamps
|
diff --git a/lib/http/client.rb b/lib/http/client.rb
index <HASH>..<HASH> 100644
--- a/lib/http/client.rb
+++ b/lib/http/client.rb
@@ -3,13 +3,7 @@ module Http
class Client
# I swear I'll document that nebulous options hash
def initialize(uri, options = {})
- if uri.is_a? URI
- @uri = uri
- else
- # Why the FUCK can't Net::HTTP do this?
- @uri = URI(uri.to_s)
- end
-
+ @uri = uri
@options = {:response => :object}.merge(options)
end
@@ -88,8 +82,10 @@ module Http
private
def raw_http_call(method, uri, headers, form_data = nil)
- # Ensure uri and stringify keys :/
- uri = URI(uri.to_s) unless uri.is_a? URI
+ # Why the FUCK can't Net::HTTP do this?
+ uri = URI(uri.to_s) unless uri.is_a? URI
+
+ # Stringify keys :/
headers = Hash[headers.map{|k,v| [k.to_s, v]}]
http = Net::HTTP.new(uri.host, uri.port)
|
Last responsible moment for coercing URI
|
diff --git a/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java b/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java
index <HASH>..<HASH> 100644
--- a/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java
+++ b/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java
@@ -2140,7 +2140,7 @@ public abstract class WrappedConnection extends JBossWrapper implements Connecti
private void sqlConnectionNotifyRequestBegin()
{
- Optional<MethodHandle> mh = mc.getEndRequestNotify();
+ Optional<MethodHandle> mh = mc.getBeginRequestNotify();
if (mh == null)
{
mh = lookupNotifyMethod("beginRequest");
|
[JBJCA-<I>] JDBC adapter WrappedConnection: fix beginRequest lookup bug
|
diff --git a/bokeh/protocol.py b/bokeh/protocol.py
index <HASH>..<HASH> 100644
--- a/bokeh/protocol.py
+++ b/bokeh/protocol.py
@@ -108,7 +108,8 @@ class BokehJSONEncoder(json.JSONEncoder):
return self.transform_python_types(obj)
def serialize_json(obj, encoder=BokehJSONEncoder, **kwargs):
- return json.dumps(obj, cls=encoder, **kwargs)
+ rslt = json.dumps(obj, cls=encoder, **kwargs)
+ return rslt
deserialize_json = json.loads
|
Easier debugging.
|
diff --git a/cli.js b/cli.js
index <HASH>..<HASH> 100755
--- a/cli.js
+++ b/cli.js
@@ -23,6 +23,7 @@ var optimist = require('optimist')
var couchjs = require('./couchjs')
var console = require('./console')
+var LineStream = require('./stream')
var INPUT = { 'waiting': false
, 'queue' : []
@@ -54,11 +55,13 @@ function main() {
if(er)
throw er
+ var stdin = new LineStream
+ stdin.on('data', couchjs.stdin)
+
process.stdin.setEncoding('utf8')
- process.stdin.on('data', couchjs.stdin)
+ process.stdin.pipe(stdin)
process.stdin.resume()
-
; [Error, Function].forEach(function(type) {
type.prototype.toSource = type.prototype.toSource || toSource
type.prototype.toString = type.prototype.toString || toSource
|
Pipe stdin through the LineStream
|
diff --git a/src/RocknRoot/StrayFw/Database/Postgres/Schema.php b/src/RocknRoot/StrayFw/Database/Postgres/Schema.php
index <HASH>..<HASH> 100644
--- a/src/RocknRoot/StrayFw/Database/Postgres/Schema.php
+++ b/src/RocknRoot/StrayFw/Database/Postgres/Schema.php
@@ -71,6 +71,8 @@ class Schema extends ProviderSchema
*/
private function buildEnum($enumName, array $enumDefinition)
{
+ $mapping = Mapping::get($this->mapping);
+ $definition = $this->getDefinition();
$database = GlobalDatabase::get($mapping['config']['database']);
$enumRealName = null;
@@ -116,6 +118,8 @@ class Schema extends ProviderSchema
*/
private function buildModel($modelName, array $modelDefinition)
{
+ $mapping = Mapping::get($this->mapping);
+ $definition = $this->getDefinition();
$database = GlobalDatabase::get($mapping['config']['database']);
$tableName = null;
|
fix #<I> SQL data building
|
diff --git a/osbs/build/spec.py b/osbs/build/spec.py
index <HASH>..<HASH> 100644
--- a/osbs/build/spec.py
+++ b/osbs/build/spec.py
@@ -315,12 +315,13 @@ class BuildSpec(object):
self.name.value = make_name_from_git(self.git_uri.value, self.git_branch.value)
self.group_manifests.value = group_manifests or False
self.prefer_schema1_digest.value = prefer_schema1_digest
+ self.builder_build_json_dir.value = builder_build_json_dir
if not flatpak:
if not base_image:
raise OsbsValidationException("base_image must be provided")
self.trigger_imagestreamtag.value = get_imagestreamtag_from_image(base_image)
- self.builder_build_json_dir.value = builder_build_json_dir
+
if not name_label:
raise OsbsValidationException("name_label must be provided")
self.imagestream_name.value = name_label.replace('/', '-')
|
spec.py: set builder_build_json_dir value for flatpaks too
|
diff --git a/cmd/broker.go b/cmd/broker.go
index <HASH>..<HASH> 100644
--- a/cmd/broker.go
+++ b/cmd/broker.go
@@ -50,6 +50,7 @@ and personalized devices (with their network session keys) with the router.
}
hdlAdapter.Bind(handlers.Collect{})
hdlAdapter.Bind(handlers.PubSub{})
+ hdlAdapter.Bind(handlers.Applications{})
hdlAdapter.Bind(handlers.StatusPage{})
// Instantiate Storage
|
[issue#<I>] Add Applications handler to broker cli
|
diff --git a/api/client.js b/api/client.js
index <HASH>..<HASH> 100644
--- a/api/client.js
+++ b/api/client.js
@@ -57,7 +57,7 @@ module.exports = new (function(){
*/
this.observe = function(itemID, propName, callback) {
if (typeof itemID != 'number' || !propName || !callback) { log("observe requires three arguments", itemId, propName, callback); }
- var propertyChain = propName.split('.')
+ var propertyChain = (typeof propName == 'string' ? string.split('.') : propName
return this._observeChain(itemID, propertyChain, 0, callback, {})
}
|
Allow for a subscription chain to be passed in as an array, in addition to as a period "." seperated string
|
diff --git a/src/main/java/hex/glm/GLM2.java b/src/main/java/hex/glm/GLM2.java
index <HASH>..<HASH> 100644
--- a/src/main/java/hex/glm/GLM2.java
+++ b/src/main/java/hex/glm/GLM2.java
@@ -562,7 +562,7 @@ public class GLM2 extends ModelJob {
callback.addToPendingCount(n_folds-1);
double proximal_penalty = 0;
for(int i = 0; i < n_folds; ++i)
- new GLM2(this.description + "xval " + i, self(), keys[i] = Key.make(destination_key + "_" + _lambdaIdx + "_xval" + i), _dinfo.getFold(i, n_folds),_glm,new double[]{lambda[_lambdaIdx]},model.alpha,0, model.beta_eps,self(),model.norm_beta(lambdaIxd),proximal_penalty).
+ new GLM2(this.description + "xval " + i, self(), keys[i] = Key.make(destination_key + "_" + _lambdaIdx + "_xval" + i), _dinfo.getFold(i, n_folds),_glm,new double[]{lambda[_lambdaIdx]},model.alpha,0, model.beta_eps,self(),model.norm_beta(lambdaIxd),higher_accuracy, proximal_penalty).
run(callback);
}
|
GLM2 update. added missing change from my previous commit.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -153,7 +153,8 @@ Keeper.prototype._doPut = function (key, value) {
.then(function (exists) {
if (exists) {
debug('put aborted, value exists', key)
- throw new Error('value for this key already exists in Keeper')
+ return exists
+ // throw new Error('value for this key already exists in Keeper')
}
return self._save(key, value)
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -25,6 +25,22 @@ test('test invalid keys', function (t) {
.done()
})
+test('put same data twice', function (t) {
+ t.plan(1)
+
+ var keeper = new Keeper({
+ storage: testDir
+ })
+
+ put()
+ .then(put)
+ .done(t.pass)
+
+ function put () {
+ return keeper.put('64fe16cc8a0c61c06bc403e02f515ce5614a35f1', new Buffer('1'))
+ }
+})
+
test('put, get', function (t) {
var keeper = new Keeper({
storage: testDir
|
don't throw err on put for existing key/val
|
diff --git a/tasks/lib/uglify.js b/tasks/lib/uglify.js
index <HASH>..<HASH> 100644
--- a/tasks/lib/uglify.js
+++ b/tasks/lib/uglify.js
@@ -152,7 +152,7 @@ exports.init = function(grunt) {
}
if (options.indentLevel !== undefined) {
- outputOptions.indent_level = options.indentLevel
+ outputOptions.indent_level = options.indentLevel;
}
return outputOptions;
|
Add missing semicolon in `tasks/lib/uglify.js`
JSHint didn't like it not being there.
|
diff --git a/eZ/Publish/Core/REST/Server/Input/Parser/Query.php b/eZ/Publish/Core/REST/Server/Input/Parser/Query.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/REST/Server/Input/Parser/Query.php
+++ b/eZ/Publish/Core/REST/Server/Input/Parser/Query.php
@@ -29,10 +29,10 @@ abstract class Query extends CriterionParser
{
$query = $this->buildQuery();
- // Criteria
+ // @deprecated Criteria
// -- FullTextCriterion
if (array_key_exists('Criteria', $data) && is_array($data['Criteria'])) {
- $message = 'The Criteria element is deprecated since ezpublish-kernel 6.6.0, and will be removed in 7.0. Use Filter instead.';
+ $message = 'The Criteria element is deprecated since ezpublish-kernel 6.6, and will be removed in 8.0. Use Filter instead, or Query for criteria that should affect scoring.';
if (array_key_exists('Filter', $data) && is_array($data['Filter'])) {
$message .= ' The Criteria element will be merged into Filter.';
$data['Filter'] = array_merge($data['Filter'], $data['Criteria']);
|
Add mention of scoring in deprecation message for REST Criteria
|
diff --git a/salt/state.py b/salt/state.py
index <HASH>..<HASH> 100644
--- a/salt/state.py
+++ b/salt/state.py
@@ -966,7 +966,7 @@ class HighState(object):
errors.append(err)
else:
for sub_sls in state.pop('include'):
- if not list(mods).count(sub_sls):
+ if sub_sls not in mods:
nstate, mods, err = self.render_state(
sub_sls,
env,
|
Use in operator to check for existence in set.
|
diff --git a/sample/src/main/java/com/github/pedrovgs/sample/MainActivity.java b/sample/src/main/java/com/github/pedrovgs/sample/MainActivity.java
index <HASH>..<HASH> 100644
--- a/sample/src/main/java/com/github/pedrovgs/sample/MainActivity.java
+++ b/sample/src/main/java/com/github/pedrovgs/sample/MainActivity.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2014 Pedro Vicente Gomez Sanchez.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.github.pedrovgs.sample;
import android.os.Bundle;
|
Add copyright to the first project java file
|
diff --git a/jumper_logging_agent/agent.py b/jumper_logging_agent/agent.py
index <HASH>..<HASH> 100644
--- a/jumper_logging_agent/agent.py
+++ b/jumper_logging_agent/agent.py
@@ -12,14 +12,14 @@ import logging
import errno
import threading
from importlib import import_module
-import itertools
-import keen
import time
import signal
from future import standard_library
# noinspection PyUnresolvedReferences
from future.builtins import *
+from keen import KeenClient
+
standard_library.install_aliases()
DEFAULT_INPUT_FILENAME = '/var/run/jumper_logging_agent/events'
@@ -67,6 +67,15 @@ class RecurringTimer(threading.Thread):
self.stop_event.set()
+def keen_event_store(project_id, write_key):
+ return KeenClient(
+ project_id=project_id,
+ write_key=write_key,
+ read_key='',
+ base_url='https://eventsapi.jumper.io'
+ )
+
+
class Agent(object):
EVENT_TYPE_PROPERTY = 'type'
@@ -81,7 +90,7 @@ class Agent(object):
self.flush_interval = flush_interval
self.event_count = 0
self.pending_events = []
- self.event_store = event_store or keen
+ self.event_store = event_store or keen_event_store(project_id, write_key)
self.default_event_type = default_event_type
self.on_listening = on_listening
|
changed keen event store to log to jumper's url
|
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -31,8 +31,6 @@ module.exports = function (config) {
{pattern: 'node_modules/@angular/**/*.js', included: false, watched: false},
{pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false},
- {pattern: 'systemjs.config.js', included: false, watched: false},
-
'karma-test-shim.js',
{ pattern: 'lib/**/*.js', included: false },
|
fix(build): removed unneeded path
|
diff --git a/pydoop/hdfs/fs.py b/pydoop/hdfs/fs.py
index <HASH>..<HASH> 100644
--- a/pydoop/hdfs/fs.py
+++ b/pydoop/hdfs/fs.py
@@ -627,6 +627,8 @@ class hdfs(object):
def _walk(self, top):
""
+ if isinstance(top, basestring):
+ top = self.get_path_info(top)
yield top
if top['kind'] == 'directory':
for info in self.list_directory(top['name']):
@@ -650,6 +652,4 @@ class hdfs(object):
"""
if not top:
raise ValueError("Empty path")
- if isinstance(top, basestring):
- top = self.get_path_info(top)
return _walker_wrapper(self._walk(top))
|
fs.walk now fails only if iterated.
Back to its previous behavior.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ from setuptools import setup
setup(
name='xdot',
- version='1.0',
+ version='1.1',
author='Jose Fonseca',
author_email='[email protected]',
url='https://github.com/jrfonseca/xdot.py',
|
Bump to version <I>.
|
diff --git a/WrightTools/kit.py b/WrightTools/kit.py
index <HASH>..<HASH> 100644
--- a/WrightTools/kit.py
+++ b/WrightTools/kit.py
@@ -853,7 +853,7 @@ def diff(xi, yi, order=1):
def fft(xi, yi, axis=0):
- """Take the 1D FFT of an N-dimensional array and return "sensible" arrays which are shifted properly.
+ """Take the 1D FFT of an N-dimensional array and return "sensible" properly shifted arrays.
Parameters
----------
|
Reword fft docstring to adhere to line length convention
|
diff --git a/host.go b/host.go
index <HASH>..<HASH> 100644
--- a/host.go
+++ b/host.go
@@ -206,9 +206,26 @@ func (h *Host) ConfigureAuth() error {
return nil
}
- ip, err := h.Driver.GetIP()
- if err != nil {
- return err
+ var (
+ ip = ""
+ ipErr error
+ maxRetries = 4
+ )
+
+ for i := 0; i < maxRetries; i++ {
+ ip, ipErr = h.Driver.GetIP()
+ if ip != "" {
+ break
+ }
+ time.Sleep(5 * time.Second)
+ }
+
+ if ipErr != nil {
+ return ipErr
+ }
+
+ if ip == "" {
+ return fmt.Errorf("unable to get machine IP")
}
serverCertPath := filepath.Join(h.storePath, "server.pem")
|
allow retries for getIp when issuing cert
|
diff --git a/main/core/Manager/ResourceManager.php b/main/core/Manager/ResourceManager.php
index <HASH>..<HASH> 100644
--- a/main/core/Manager/ResourceManager.php
+++ b/main/core/Manager/ResourceManager.php
@@ -1152,12 +1152,12 @@ class ResourceManager
$obj = $event->getItem();
if ($obj !== null) {
- $archive->addFile($obj, iconv(mb_detect_encoding($filename), $this->getEncoding(), $filename));
+ $archive->addFile($obj, iconv($this->ut->detectEncoding($filename), $this->getEncoding(), $filename));
} else {
- $archive->addFromString(iconv(mb_detect_encoding($filename), $this->getEncoding(), $filename), '');
+ $archive->addFromString(iconv($this->ut->detectEncoding($filename), $this->getEncoding(), $filename), '');
}
} else {
- $archive->addEmptyDir(iconv(mb_detect_encoding($filename), $this->getEncoding(), $filename));
+ $archive->addEmptyDir(iconv($this->ut->detectEncoding($filename), $this->getEncoding(), $filename));
}
$this->dispatcher->dispatch('log', 'Log\LogResourceExport', [$node]);
@@ -1571,7 +1571,7 @@ class ResourceManager
private function getEncoding()
{
- return $this->ut->getDefaultEncoding();
+ return 'UTF-8//TRANSLIT';
}
/**
|
[CoreBundle] Uses utf-8 string with ZiPArchive and #<I> detection. (#<I>)
|
diff --git a/src/Psalm/Checker/FunctionLikeChecker.php b/src/Psalm/Checker/FunctionLikeChecker.php
index <HASH>..<HASH> 100644
--- a/src/Psalm/Checker/FunctionLikeChecker.php
+++ b/src/Psalm/Checker/FunctionLikeChecker.php
@@ -853,6 +853,16 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
if (!$return_type) {
if ($inferred_return_type && !$inferred_return_type->isMixed()) {
+ $inferred_return_type = TypeChecker::simplifyUnionType(
+ ExpressionChecker::fleshOutTypes(
+ $inferred_return_type,
+ [],
+ $this->source->getFQCLN(),
+ ''
+ ),
+ $this->getFileChecker()
+ );
+
FileChecker::addDocblockReturnType(
$this->source->getFileName(),
$this->function->getLine(),
@@ -935,6 +945,8 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
$this->getFileChecker()
);
+ var_dump($inferred_return_type);
+
$return_types_different = false;
if (!TypeChecker::isContainedBy($inferred_return_type, $declared_return_type, $this->getFileChecker())) {
|
Make brand-new return types more accurate
|
diff --git a/src/support/shotgun_toolkit/rez_app_launch.py b/src/support/shotgun_toolkit/rez_app_launch.py
index <HASH>..<HASH> 100755
--- a/src/support/shotgun_toolkit/rez_app_launch.py
+++ b/src/support/shotgun_toolkit/rez_app_launch.py
@@ -54,8 +54,14 @@ class AppLaunch(tank.Hook):
from rez.resolved_context import ResolvedContext
from rez.config import config
+ # Define variables used to bootstrap tank from overwrite on first reference
+ # PYTHONPATH is used by tk-maya
+ # NUKE_PATH is used by tk-nuke
+ # HIERO_PLUGIN_PATH is used by tk-nuke (nukestudio)
+ # KATANA_RESOURCES is used by tk-katana
+ config.parent_variables = ["PYTHONPATH", "HOUDINI_PATH", "NUKE_PATH", "HIERO_PLUGIN_PATH", "KATANA_RESOURCES"]
+
rez_packages = extra["rez_packages"]
- config.parent_variables = ["PYTHONPATH"]
context = ResolvedContext(rez_packages)
use_rez = True
|
add shotgun toolkit support for nuke, houdini and katana
|
diff --git a/xclim/ensembles/_reduce.py b/xclim/ensembles/_reduce.py
index <HASH>..<HASH> 100644
--- a/xclim/ensembles/_reduce.py
+++ b/xclim/ensembles/_reduce.py
@@ -190,6 +190,7 @@ def kmeans_reduce_ensemble(
--------
>>> import xclim
>>> from xclim.ensembles import create_ensemble, kmeans_reduce_ensemble
+ >>> from xclim.indices import hot_spell_frequency
Start with ensemble datasets for temperature:
@@ -205,7 +206,7 @@ def kmeans_reduce_ensemble(
Then, Hotspell frequency as second indicator:
- >>> hs = xclim.atmos.hot_spell_frequency(tasmax=ensTas.tas, window=2, thresh_tasmax='10 degC')
+ >>> hs = hot_spell_frequency(tasmax=ensTas.tas, window=2, thresh_tasmax='10 degC')
>>> his_hs = hs.sel(time=slice('1990','2019')).mean(dim='time')
>>> fut_hs = hs.sel(time=slice('2020','2050')).mean(dim='time')
>>> dhs = fut_hs - his_hs
|
Use indices to bypass metadata checks
|
diff --git a/config/karma.conf-ci.js b/config/karma.conf-ci.js
index <HASH>..<HASH> 100644
--- a/config/karma.conf-ci.js
+++ b/config/karma.conf-ci.js
@@ -117,7 +117,7 @@ module.exports = function (config) {
* possible values: 'dots', 'progress'
* available reporters: https://npmjs.org/browse/keyword/karma-reporter
*/
- reporters: ['mocha', 'dots', 'coverage'],
+ reporters: ['mocha', 'coverage'],
// web server port
port: 9876,
|
Removed dots reporter (#<I>)
|
diff --git a/cmd/burrow/commands/deploy.go b/cmd/burrow/commands/deploy.go
index <HASH>..<HASH> 100644
--- a/cmd/burrow/commands/deploy.go
+++ b/cmd/burrow/commands/deploy.go
@@ -39,7 +39,7 @@ func Deploy(output Output) func(cmd *cli.Cmd) {
defaultGasOpt := cmd.StringOpt("g gas", "1111111111",
"default gas to use; can be overridden for any single job")
- jobsOpt := cmd.IntOpt("j jobs", 8,
+ jobsOpt := cmd.IntOpt("j jobs", 2,
"default number of concurrent solidity compilers to run")
addressOpt := cmd.StringOpt("a address", "",
|
Reduce the number of concurrent solc's we run
This is causing file systems errors on Mac.
|
diff --git a/configs/tslint-vscode.js b/configs/tslint-vscode.js
index <HASH>..<HASH> 100644
--- a/configs/tslint-vscode.js
+++ b/configs/tslint-vscode.js
@@ -9,7 +9,6 @@ const PICKING_RULE_NAMES = [
'import-groups',
'scoped-modules',
'import-path-base-url',
- 'explicit-return-type',
];
const {rules, rulesDirectory} = TSLint.Configuration.loadConfigurationFromPath(
|
Remove explicit-return-type from vscode lint config
|
diff --git a/specs-go/version.go b/specs-go/version.go
index <HASH>..<HASH> 100644
--- a/specs-go/version.go
+++ b/specs-go/version.go
@@ -11,7 +11,7 @@ const (
VersionPatch = 0
// VersionDev indicates development branch. Releases will be empty string.
- VersionDev = "-rc3-dev"
+ VersionDev = "-rc4"
)
// Version is the specification version that the package types support.
|
version: release <I>-rc4
|
diff --git a/qgispluginreleaser/entry_point.py b/qgispluginreleaser/entry_point.py
index <HASH>..<HASH> 100644
--- a/qgispluginreleaser/entry_point.py
+++ b/qgispluginreleaser/entry_point.py
@@ -5,11 +5,12 @@ import os
import shutil
import subprocess
import time
-
+import codecs
def prerequisites_ok():
if os.path.exists('metadata.txt'):
- if 'qgisMinimumVersion' in open('metadata.txt').read():
+ if 'qgisMinimumVersion' in codecs.open(
+ 'metadata.txt', 'r', 'utf-8').read():
return True
@@ -53,10 +54,10 @@ def fix_version(context):
"""
if not prerequisites_ok():
return
- lines = open('metadata.txt', 'rU').readlines()
+ lines = codecs.open('metadata.txt', 'rU', 'utf-8').readlines()
for index, line in enumerate(lines):
if line.startswith('version'):
new_line = 'version=%s\n' % context['new_version']
lines[index] = new_line
time.sleep(1)
- open('metadata.txt', 'w').writelines(lines)
+ codecs.open('metadata.txt', 'w', 'utf-8').writelines(lines)
|
use codec in conjunction with "utf8" to read and write files
|
diff --git a/app/code/community/Aoe/Scheduler/Model/Observer.php b/app/code/community/Aoe/Scheduler/Model/Observer.php
index <HASH>..<HASH> 100644
--- a/app/code/community/Aoe/Scheduler/Model/Observer.php
+++ b/app/code/community/Aoe/Scheduler/Model/Observer.php
@@ -259,13 +259,14 @@ class Aoe_Scheduler_Model_Observer extends Mage_Cron_Model_Observer {
$tmp[$schedule->getJobCode()][$schedule->getScheduledAt()] = array('key' => $key, 'schedule' => $schedule);
}
- foreach ($tmp as $schedules) {
+ foreach ($tmp as $jobCode => $schedules) {
ksort($schedules);
array_pop($schedules); // we remove the newest one
foreach ($schedules as $data) { /* @var $data array */
$this->_pendingSchedules->removeItemByKey($data['key']);
$schedule = $data['schedule']; /* @var $schedule Aoe_Scheduler_Model_Schedule */
$schedule
+ ->setMessages('Mulitple tasks with the same job code were piling up. Skipping execution of duplicates.')
->setStatus(Mage_Cron_Model_Schedule::STATUS_MISSED)
->save();
}
|
Added message to skipped tasks because of piles
|
diff --git a/fermipy/diffuse/gt_merge_srcmaps.py b/fermipy/diffuse/gt_merge_srcmaps.py
index <HASH>..<HASH> 100755
--- a/fermipy/diffuse/gt_merge_srcmaps.py
+++ b/fermipy/diffuse/gt_merge_srcmaps.py
@@ -102,7 +102,8 @@ class GtMergeSourceMaps(object):
for source_name in source_names:
try:
source = source_factory.releaseSource(source_name)
- like.addSource(source)
+ # EAC, add the source directly to the model
+ like.logLike.addSource(source)
srcs_to_merge.append(source_name)
except KeyError:
missing_sources.append(source_name)
|
Speed up gt_merge_srcmaps.py by adding source directly to c++ likelihood object
|
diff --git a/jgrassgears/src/main/java/eu/hydrologis/jgrass/jgrassgears/i18n/MessageHandler.java b/jgrassgears/src/main/java/eu/hydrologis/jgrass/jgrassgears/i18n/MessageHandler.java
index <HASH>..<HASH> 100644
--- a/jgrassgears/src/main/java/eu/hydrologis/jgrass/jgrassgears/i18n/MessageHandler.java
+++ b/jgrassgears/src/main/java/eu/hydrologis/jgrass/jgrassgears/i18n/MessageHandler.java
@@ -37,7 +37,7 @@ public class MessageHandler {
private MessageHandler() {
}
- public static MessageHandler getInstance() {
+ public synchronized static MessageHandler getInstance() {
if (messageHandler == null) {
messageHandler = new MessageHandler();
messageHandler.initResourceBundle();
|
fixes for: Bug: Incorrect lazy initialization and update of static field
|
diff --git a/environs/jujutest/livetests.go b/environs/jujutest/livetests.go
index <HASH>..<HASH> 100644
--- a/environs/jujutest/livetests.go
+++ b/environs/jujutest/livetests.go
@@ -224,7 +224,10 @@ func (t *LiveTests) checkUpgradeMachineAgent(c *C, st *state.State, m *state.Mac
}
tools, err := m.AgentTools()
c.Assert(err, IsNil)
- c.Assert(tools, DeepEquals, upgradeTools)
+ // N.B. We can't test that the URL is the same because there's
+ // no guarantee that it is, even though it might be referring to
+ // the same thing.
+ c.Assert(tools.Binary, DeepEquals, upgradeTools.Binary)
c.Logf("upgrade successful!")
}
|
environs/jujutest: fix tools comparison
|
diff --git a/test/integration/contract-aci.js b/test/integration/contract-aci.js
index <HASH>..<HASH> 100644
--- a/test/integration/contract-aci.js
+++ b/test/integration/contract-aci.js
@@ -395,6 +395,17 @@ describe('Contract instance', function () {
}
}])
})
+
+ it('calls a contract that emits events with no defined events', async () => {
+ const contract = await sdk.getContractInstance({
+ source:
+ 'contract FooContract =\n' +
+ ' entrypoint emitEvents(f: bool) = ()',
+ contractAddress: remoteContract.deployInfo.address
+ })
+ const result = await contract.methods.emitEvents(false, { omitUnknown: true })
+ expect(result.decodedEvents).to.be.eql([])
+ })
})
describe('Arguments Validation and Casting', function () {
|
fix(contract events): don't throw error if events emitted by remote
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-# coding=utf-8
"""
GitHub-Flask
------------
@@ -29,7 +28,7 @@ setup(
version=get_version(),
url='http://github.com/cenkalti/github-flask',
license='MIT',
- author=u'Cenk Altı',
+ author='Cenk Alti',
author_email='[email protected]',
description='Adds support for authorizing users with GitHub to Flask.',
long_description=__doc__,
|
workaround for python3 install bug
|
diff --git a/lib/frameit/offsets.rb b/lib/frameit/offsets.rb
index <HASH>..<HASH> 100644
--- a/lib/frameit/offsets.rb
+++ b/lib/frameit/offsets.rb
@@ -9,13 +9,13 @@ module Frameit
case screenshot.screen_size
when size::IOS_55
return {
- 'offset' => '+42+147',
- 'width' => 539
+ 'offset' => '+41+146',
+ 'width' => 541
}
when size::IOS_47
return {
- 'offset' => '+41+154',
- 'width' => 530
+ 'offset' => '+40+153',
+ 'width' => 532
}
when size::IOS_40
return {
@@ -64,4 +64,4 @@ module Frameit
end
end
end
-end
\ No newline at end of file
+end
|
Fix little offset on iPhone 6 and iPhone 6 Plus
|
diff --git a/src/core/vr-scene.js b/src/core/vr-scene.js
index <HASH>..<HASH> 100644
--- a/src/core/vr-scene.js
+++ b/src/core/vr-scene.js
@@ -127,7 +127,7 @@ var VRScene = module.exports = registerElement(
},
elementLoaded: {
- value: function (node) {
+ value: function () {
this.pendingElements--;
// If we still need to wait for more elements.
if (this.pendingElements > 0) { return; }
@@ -252,6 +252,8 @@ var VRScene = module.exports = registerElement(
// We create a default camera
defaultCamera = document.createElement('vr-object');
defaultCamera.setAttribute('camera', {fov: 45});
+ defaultCamera.setAttribute('position', {x: 0, y: 0, z: 20});
+ this.pendingElements++;
defaultCamera.addEventListener('loaded', this.elementLoaded.bind(this));
this.appendChild(defaultCamera);
}
|
It accounts for the default camera in the pending elements. This ensures that rendering triggers only when the camera is ready
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.