diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -24,13 +24,16 @@ version = version_mod.version
qml_dir = os.path.abspath('pyblish_qml/qml')
qml_package_data = list()
for root, dirs, files in os.walk(qml_dir):
- for suffix in ("ttf", "qml", "js", "txt", "png", "py", "otf"):
+ for suffix in ("ttf", "qml", "js", "txt", "png", "py", "otf", "ico"):
relpath = os.path.relpath(root, qml_dir)
relpath = relpath.replace("\\", "/")
qml_package_data.append("qml/" + relpath.strip(".") + "/*." + suffix)
# qmldir file has no suffix
qml_package_data.append(os.path.join("qml", "Pyblish", "qmldir"))
+qml_package_data.append(os.path.join("qml", "Pyblish", "Graphs", "qmldir"))
+qml_package_data.append(os.path.join("qml", "Pyblish", "ListItems", "qmldir"))
+qml_package_data.append(os.path.join("qml", "Perspective", "qmldir"))
classifiers = [
"Development Status :: 5 - Production/Stable",
|
missing some qmldir files and ico file
|
diff --git a/src/main/java/skadistats/clarity/decoder/s2/prop/VectorDecoder.java b/src/main/java/skadistats/clarity/decoder/s2/prop/VectorDecoder.java
index <HASH>..<HASH> 100644
--- a/src/main/java/skadistats/clarity/decoder/s2/prop/VectorDecoder.java
+++ b/src/main/java/skadistats/clarity/decoder/s2/prop/VectorDecoder.java
@@ -13,6 +13,7 @@ public class VectorDecoder implements FieldDecoder<Vector> {
return new Vector(
new float[] {
fd.decode(bs, f),
+ fd.decode(bs, f),
fd.decode(bs, f)
}
);
|
Baseline decoding now finally works!
It WORKS!
|
diff --git a/jellyfish/_jellyfish.py b/jellyfish/_jellyfish.py
index <HASH>..<HASH> 100644
--- a/jellyfish/_jellyfish.py
+++ b/jellyfish/_jellyfish.py
@@ -466,7 +466,7 @@ def metaphone(s):
i += 1
if nextnext in 'aeiou' or nextnext == '*****':
result.append('w')
- elif next in 'aeiou' or next == '*****':
+ elif next in 'aeiou':
result.append('w')
elif c == 'x':
if i == 0:
|
fix trailing W in metaphone Python impl, ANDREW->ANTR
|
diff --git a/lib/infusionsoft/version.rb b/lib/infusionsoft/version.rb
index <HASH>..<HASH> 100644
--- a/lib/infusionsoft/version.rb
+++ b/lib/infusionsoft/version.rb
@@ -1,4 +1,4 @@
module Infusionsoft
# The version of the gem
- VERSION = '1.3.3d'.freeze unless defined?(::Infusionsoft::VERSION)
+ VERSION = '1.3.4a'.freeze unless defined?(::Infusionsoft::VERSION)
end
|
<I> is a bad version history so skipping to <I>
|
diff --git a/src/Services/FieldSetFieldFinder.php b/src/Services/FieldSetFieldFinder.php
index <HASH>..<HASH> 100644
--- a/src/Services/FieldSetFieldFinder.php
+++ b/src/Services/FieldSetFieldFinder.php
@@ -237,8 +237,12 @@ class FieldSetFieldFinder
}
elseif( $field instanceof HasOne )
{
- /** @var HasOne $field */
- return $field->getRelationFieldSet( $field->getValue() ?: $field->getRelatedModel() );
+ if( $field->getValue() )
+ {
+ return $field->getRelationFieldSet( $field->getValue() );
+ }
+
+ return new FieldSet( $field->getRelatedModel(), $field->getNameSpacedName() );
}
elseif( $field instanceof Translatable )
{
|
Fix issue with arbory image field validation in new nodes
|
diff --git a/npm/test-integration.js b/npm/test-integration.js
index <HASH>..<HASH> 100644
--- a/npm/test-integration.js
+++ b/npm/test-integration.js
@@ -23,7 +23,7 @@ module.exports = function (exit) {
recursive(SPEC_SOURCE_DIR, function (err, files) {
if (err) { console.error(err); return exit(1); }
- var mocha = new Mocha({timeout: 1000 * 60});
+ var mocha = new Mocha({ timeout: 1000 * 60 });
// specially load bootstrap file
mocha.addFile(path.join(SPEC_SOURCE_DIR, '_bootstrap.js'));
diff --git a/npm/test-system.js b/npm/test-system.js
index <HASH>..<HASH> 100644
--- a/npm/test-system.js
+++ b/npm/test-system.js
@@ -32,7 +32,10 @@ module.exports = function (exit) {
// run test specs using mocha
function (next) {
recursive(SPEC_SOURCE_DIR, function (err, files) {
- if (err) { console.error(err.stack || err); return next(1); }
+ if (err) {
+ console.error(err.stack || err);
+ return next(1);
+ }
var mocha = new Mocha();
@@ -47,7 +50,7 @@ module.exports = function (exit) {
});
},
- // packity
+ // packity
function (next) {
var packity = require('packity'),
options = {
|
Fixed lint errors in scripts
|
diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufOutputStream.java b/buffer/src/main/java/io/netty/buffer/ByteBufOutputStream.java
index <HASH>..<HASH> 100644
--- a/buffer/src/main/java/io/netty/buffer/ByteBufOutputStream.java
+++ b/buffer/src/main/java/io/netty/buffer/ByteBufOutputStream.java
@@ -40,7 +40,7 @@ public class ByteBufOutputStream extends OutputStream implements DataOutput {
private final ByteBuf buffer;
private final int startIndex;
- private final DataOutputStream utf8out = new DataOutputStream(this);
+ private DataOutputStream utf8out; // lazily-instantiated
/**
* Creates a new stream which writes data to the specified {@code buffer}.
@@ -131,7 +131,11 @@ public class ByteBufOutputStream extends OutputStream implements DataOutput {
@Override
public void writeUTF(String s) throws IOException {
- utf8out.writeUTF(s);
+ DataOutputStream out = utf8out;
+ if (out == null) {
+ utf8out = out = new DataOutputStream(this);
+ }
+ out.writeUTF(s);
}
/**
|
Lazily construct contained DataOutputStream in ByteBufOutputStream (#<I>)
Motivation
This is used solely for the DataOutput#writeUTF8() method, which may
often not be used.
Modifications
Lazily construct the contained DataOutputStream in ByteBufOutputStream.
Result
Saves an allocation in some common cases
|
diff --git a/packages/mobx-little-router-react/src/components/Link.js b/packages/mobx-little-router-react/src/components/Link.js
index <HASH>..<HASH> 100644
--- a/packages/mobx-little-router-react/src/components/Link.js
+++ b/packages/mobx-little-router-react/src/components/Link.js
@@ -16,12 +16,19 @@ class Link extends Component {
activeClassName?: string,
style?: Object,
children?: React.Element<*>,
- exact?: boolean
+ exact?: boolean,
+ reload?: boolean
}
onClick = (evt: Event) => {
+ const { to, reload } = this.props
+
+ if (reload) {
+ return
+ }
+
evt.preventDefault()
- this.context.router.history.push(this.props.to)
+ this.context.router.history.push(to)
}
render() {
|
Adding reload property to Link
|
diff --git a/query.go b/query.go
index <HASH>..<HASH> 100644
--- a/query.go
+++ b/query.go
@@ -217,11 +217,10 @@ func First(subject Enumerable) (retval interface{}, err error) {
var isOpen bool
- if retval, isOpen = <-subject.Enumerate(nil); isOpen {
+ if retval, isOpen = <-subject.Enumerate(done); isOpen {
err = nil
}
-
- subject.Enumerate(done)
+ close(done)
return
}
|
Fixing memory leak in `First(Enumerable)` impl.
|
diff --git a/lxd/storage/drivers/driver_btrfs_volumes.go b/lxd/storage/drivers/driver_btrfs_volumes.go
index <HASH>..<HASH> 100644
--- a/lxd/storage/drivers/driver_btrfs_volumes.go
+++ b/lxd/storage/drivers/driver_btrfs_volumes.go
@@ -507,7 +507,7 @@ func (d *btrfs) SetVolumeQuota(vol Volume, size string, op *operations.Operation
}
} else if qgroup != "" {
// Remove the limit.
- _, err := shared.RunCommand("btrfs", "qgroup", "destroy", qgroup, volPath)
+ _, err := shared.RunCommand("btrfs", "qgroup", "limit", "none", qgroup, volPath)
if err != nil {
return err
}
|
lxd/storage/drivers/btrfs: Don't destroy qgroups
When deleting a qgroup, it's not possible to get the usage of an
instance or volume anymore. Therefore, instead of deleting the qgroup,
we just don't set a limit.
|
diff --git a/app/angular.audio.js b/app/angular.audio.js
index <HASH>..<HASH> 100644
--- a/app/angular.audio.js
+++ b/app/angular.audio.js
@@ -150,6 +150,12 @@ angular.module('ngAudio', [])
.factory('NgAudioObject', ['cleverAudioFindingService', '$rootScope', '$interval', '$timeout', 'ngAudioGlobals', function(cleverAudioFindingService, $rootScope, $interval, $timeout, ngAudioGlobals) {
return function(id, scope) {
+ function twiddle(){
+ audio.play();
+ audio.pause();
+ window.removeEventListener("click",twiddle);
+ }
+
var $audioWatch,
$intervalWatch,
$willPlay = false,
@@ -287,9 +293,9 @@ angular.module('ngAudio', [])
audio = nativeAudio;
if (ngAudioGlobals.unlock) {
- window.addEventListener("click",function twiddle(){
- audio.play();
- audio.pause();
+ window.addEventListener("click", twiddle);
+
+ audio.addEventListener('playing', function() {
window.removeEventListener("click",twiddle);
});
|
Better fix for pr<I>, fix twiddle being called too early.
|
diff --git a/lib/fabrique/version.rb b/lib/fabrique/version.rb
index <HASH>..<HASH> 100644
--- a/lib/fabrique/version.rb
+++ b/lib/fabrique/version.rb
@@ -1,3 +1,3 @@
module Fabrique
- VERSION = "1.0.1"
+ VERSION = "1.0.2"
end
|
Release <I>
* Cope with bundler-<I>.
|
diff --git a/dom/statusclient/src/main/java/org/isisaddons/module/publishmq/dom/statusclient/StatusMessageClient.java b/dom/statusclient/src/main/java/org/isisaddons/module/publishmq/dom/statusclient/StatusMessageClient.java
index <HASH>..<HASH> 100644
--- a/dom/statusclient/src/main/java/org/isisaddons/module/publishmq/dom/statusclient/StatusMessageClient.java
+++ b/dom/statusclient/src/main/java/org/isisaddons/module/publishmq/dom/statusclient/StatusMessageClient.java
@@ -83,8 +83,10 @@ public class StatusMessageClient {
ensureInitialized();
- Client client = clientBuilder.build();
+ Client client = null;
try {
+ client = clientBuilder.build();
+
final WebTarget webTarget = client.target(uriBuilder.build());
final Invocation.Builder invocationBuilder = webTarget.request();
@@ -103,6 +105,8 @@ public class StatusMessageClient {
// if failed to log message via REST service, then fallback by logging to slf4j
LOG.warn(statusMessage.toString());
}
+ } catch(Exception ex) {
+ LOG.error(statusMessage.toString(), ex);
} finally {
closeQuietly(client);
}
|
Graciously handle errors of the statusmessage client
|
diff --git a/src/java/com/threerings/gwt/ui/Popups.java b/src/java/com/threerings/gwt/ui/Popups.java
index <HASH>..<HASH> 100644
--- a/src/java/com/threerings/gwt/ui/Popups.java
+++ b/src/java/com/threerings/gwt/ui/Popups.java
@@ -35,9 +35,9 @@ public class Popups
* Displays an info message centered horizontally on the page and centered vertically on the
* specified target widget.
*/
- public static void infoOver (String message, Widget target)
+ public static void infoOn (String message, Widget target)
{
- showOver(new InfoPopup(message), target);
+ centerOn(new InfoPopup(message), target);
}
/**
|
Actually infoOn() and centerOn() is what we wanted.
|
diff --git a/azurerm/import_arm_public_ip_test.go b/azurerm/import_arm_public_ip_test.go
index <HASH>..<HASH> 100644
--- a/azurerm/import_arm_public_ip_test.go
+++ b/azurerm/import_arm_public_ip_test.go
@@ -60,7 +60,8 @@ func TestAccAzureRMPublicIpStatic_importBasic_withDNSLabel(t *testing.T) {
resourceName := "azurerm_public_ip.test"
ri := acctest.RandInt()
- config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation())
+ dnl := fmt.Sprintf("tfacc%d", ri)
+ config := testAccAzureRMPublicIPStatic_basic_withDNSLabel(ri, testLocation(), dnl)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
|
Updated import test to handle additional parameter. (#<I>)
|
diff --git a/unit_lookup_table.py b/unit_lookup_table.py
index <HASH>..<HASH> 100644
--- a/unit_lookup_table.py
+++ b/unit_lookup_table.py
@@ -139,6 +139,7 @@ latex_symbol_lut = {
"code_temperature" : "\\rm{code}\/\\rm{temperature}",
"code_metallicity" : "\\rm{code}\/\\rm{metallicity}",
"code_velocity" : "\\rm{code}\/\\rm{velocity}",
+ "code_magnetic" : "\\rm{code}\/\\rm{magnetic}",
"Msun" : "\\rm{M}_\\odot",
"msun" : "\\rm{M}_\\odot",
"Rsun" : "\\rm{R}_\\odot",
|
fixing the pluto-specific field list in the docs
--HG--
branch : yt
|
diff --git a/picocli-examples/src/main/java/picocli/examples/subcommands/ParentCommandDemo.java b/picocli-examples/src/main/java/picocli/examples/subcommands/ParentCommandDemo.java
index <HASH>..<HASH> 100644
--- a/picocli-examples/src/main/java/picocli/examples/subcommands/ParentCommandDemo.java
+++ b/picocli-examples/src/main/java/picocli/examples/subcommands/ParentCommandDemo.java
@@ -42,7 +42,6 @@ public class ParentCommandDemo {
@Option(names = {"-r", "--recursive"}, description = "Recursively list subdirectories")
private boolean recursive;
- @Override
public void run() {
list(new File(parent.baseDirectory, "."));
}
|
fix compile error (Java 5 does not support @Override on interface implementations)
|
diff --git a/selene/core/entity.py b/selene/core/entity.py
index <HASH>..<HASH> 100644
--- a/selene/core/entity.py
+++ b/selene/core/entity.py
@@ -272,7 +272,7 @@ class Element(WaitingEntity):
# also it will make sense to make this behaviour configurable...
return self
- def actual_not_overlapped_element(self):
+ def _actual_not_overlapped_element(self):
element = self()
element_html = re.sub('\\s+', ' ', element.get_attribute('outerHTML'))
@@ -320,7 +320,7 @@ class Element(WaitingEntity):
def type(self, text: Union[str, int]) -> Element:
def fn(element: Element):
if self.config.wait_for_no_overlap_found_by_js:
- element = element.actual_not_overlapped_element()
+ element = element._actual_not_overlapped_element()
else:
element = element()
element.send_keys(str(text))
|
[#<I>] REFACTOR: privatizing element.actual_not_overlapped_element
because the method name is pretty risky, might be changed, e.g. to elaborate that it's done by js, or maybe in relation to [#<I>]
|
diff --git a/kappa/event_source.py b/kappa/event_source.py
index <HASH>..<HASH> 100644
--- a/kappa/event_source.py
+++ b/kappa/event_source.py
@@ -179,6 +179,8 @@ class S3EventSource(EventSource):
LOG.debug(exc.response)
LOG.exception('Unable to add S3 event source')
+ enable = add
+
def update(self, function):
self.add(function)
@@ -199,6 +201,8 @@ class S3EventSource(EventSource):
NotificationConfiguration=response)
LOG.debug(response)
+ disable = remove
+
def status(self, function):
LOG.debug('status for s3 notification for %s', function.name)
response = self._s3.call(
|
Add ability to enable and disable S3EventSource
|
diff --git a/spec/unit/resources/base_spec.rb b/spec/unit/resources/base_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/resources/base_spec.rb
+++ b/spec/unit/resources/base_spec.rb
@@ -37,8 +37,9 @@ module ChefAPI
describe '.build' do
it 'creates a new instance' do
described_class.stub(:new)
+ described_class.stub(:schema).and_return(double(attributes: {}))
- expect(described_class).to receive(:new).with(foo: 'bar')
+ expect(described_class).to receive(:new).with({foo: 'bar'}, {})
described_class.build(foo: 'bar')
end
end
|
Pass attributes into the Base.build method
|
diff --git a/timeside/core.py b/timeside/core.py
index <HASH>..<HASH> 100644
--- a/timeside/core.py
+++ b/timeside/core.py
@@ -28,7 +28,8 @@ import re
import numpy
import uuid
import networkx as nx
-
+import inspect
+import os
import gobject
gobject.threads_init()
@@ -52,10 +53,14 @@ class MetaProcessor(MetaComponent):
if id in _processors:
# Doctest test can duplicate a processor
# This can be identify by the conditon "module == '__main__'"
+ new_path = os.path.realpath(inspect.getfile(new_class))
+ id_path = os.path.realpath(inspect.getfile(_processors[id]))
if new_class.__module__ == '__main__':
new_class = _processors[id]
elif _processors[id].__module__ == '__main__':
pass
+ elif new_path == id_path:
+ new_class = _processors[id]
else:
raise ApiError("%s and %s have the same id: '%s'"
% (new_class.__name__,
|
fix(core): fix symlink issue when identifying duplicated processors
|
diff --git a/lib/mongo/server/connection.rb b/lib/mongo/server/connection.rb
index <HASH>..<HASH> 100644
--- a/lib/mongo/server/connection.rb
+++ b/lib/mongo/server/connection.rb
@@ -169,6 +169,7 @@ module Mongo
ensure_connected do |socket|
socket.write(PING_BYTES)
reply = Protocol::Reply.deserialize(socket)
+ p reply
reply.documents[0][Operation::Result::OK] == 1
end
end
|
Print reply for jenkins test on ssl
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -8,11 +8,11 @@ module.exports = function (path, opts, cb) {
var pos = 0
return function (read) {
fs.open(path, flags, mode, function (err, fd) {
- if(err) return read(err)
+ if(err) return read(err, cb)
read(null, function next (end, data) {
if(end === true) fs.close(fd, cb)
else if(end) cb(end) //error!
- else
+ else
if(typeof data === 'string') data = Buffer.from(data) // convert strings to buffers
fs.write(fd, data, 0, data.length, pos, function (err, bytes) {
if(err) read(err, function () { fs.close(fd, cb) })
|
cb after source is aborted
|
diff --git a/src/js/libpannellum.js b/src/js/libpannellum.js
index <HASH>..<HASH> 100644
--- a/src/js/libpannellum.js
+++ b/src/js/libpannellum.js
@@ -266,9 +266,9 @@ function Renderer(container) {
faceImg.onload = onLoad;
faceImg.onerror = incLoaded; // ignore missing face to support partial fallback image
if (imageType == 'multires') {
- faceImg.src = encodeURI(path.replace('%s', sides[s]) + '.' + image.extension);
+ faceImg.src = path.replace('%s', sides[s]) + '.' + image.extension;
} else {
- faceImg.src = encodeURI(image[s].src);
+ faceImg.src = image[s].src;
}
}
fillMissingFaces(fallbackImgSize);
@@ -1196,7 +1196,7 @@ function Renderer(container) {
* @param {MultiresNode} node - Input node.
*/
function processNextTile(node) {
- loadTexture(node, encodeURI(node.path + '.' + image.extension), function(texture, loaded) {
+ loadTexture(node, node.path + '.' + image.extension, function(texture, loaded) {
node.texture = texture;
node.textureLoaded = loaded ? 2 : 1;
}, globalParams.crossOrigin);
|
Remove unnecessary `encodeURI` calls.
|
diff --git a/src/main/java/hex/Layer.java b/src/main/java/hex/Layer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/hex/Layer.java
+++ b/src/main/java/hex/Layer.java
@@ -77,7 +77,7 @@ public abstract class Layer extends Iced {
Dropout(int units) {
_bits = new byte[(units+7)/8];
- _rand = new Random();
+ _rand = new Random(0);
}
// for input layer
diff --git a/src/main/java/hex/nn/Dropout.java b/src/main/java/hex/nn/Dropout.java
index <HASH>..<HASH> 100644
--- a/src/main/java/hex/nn/Dropout.java
+++ b/src/main/java/hex/nn/Dropout.java
@@ -28,7 +28,7 @@ public class Dropout {
Dropout(int units) {
_bits = new byte[(units+7)/8];
- _rand = new Random();
+ _rand = new Random(0);
}
// for input layer
|
Always create deterministic RNG, even though it is seeded later.
|
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/relation/merger.rb
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -145,12 +145,17 @@ module ActiveRecord
# Remove equalities from the existing relation with a LHS which is
# present in the relation being merged in.
def reject_overwrites(lhs_wheres, rhs_wheres)
+ partition_overwrites(lhs_wheres, rhs_wheres).last
+ end
+
+ def partition_overwrites(lhs_wheres, rhs_wheres)
nodes = rhs_wheres.find_all do |w|
w.respond_to?(:operator) && w.operator == :==
end
seen = Set.new(nodes) { |node| node.left }
- lhs_wheres.reject do |w|
+ # returns [deleted, keepers]
+ lhs_wheres.partition do |w|
w.respond_to?(:operator) && w.operator == :== && seen.include?(w.left)
end
end
|
partition the where values so we can access the removed ones
|
diff --git a/worker/uniter/context/factory_test.go b/worker/uniter/context/factory_test.go
index <HASH>..<HASH> 100644
--- a/worker/uniter/context/factory_test.go
+++ b/worker/uniter/context/factory_test.go
@@ -142,6 +142,11 @@ func (s *FactorySuite) TestNewRunContextRelationId(c *gc.C) {
s.AssertRelationContext(c, ctx, 0)
}
+func (s *FactorySuite) TestNewRunContextRelationIdDoesNotExist(c *gc.C) {
+ _, err := s.factory.NewRunContext(12, "baz")
+ c.Assert(err, gc.ErrorMatches, `unknown relation id:.*`)
+}
+
func (s *FactorySuite) TestNewHookContext(c *gc.C) {
ctx, err := s.factory.NewHookContext(hook.Info{Kind: hooks.ConfigChanged})
c.Assert(err, gc.IsNil)
|
juju-run: add missing relationId test for context factory
|
diff --git a/src/Passport.php b/src/Passport.php
index <HASH>..<HASH> 100644
--- a/src/Passport.php
+++ b/src/Passport.php
@@ -409,11 +409,11 @@ class Passport
}
/**
- * Set the current client for the application with the given scopes.
+ * Set the current client for the application with the given scopes.
*
- * @param \Laravel\Passport\Client $client
- * @param array $scopes
- * @return \Laravel\Passport\Client
+ * @param \Laravel\Passport\Client $client
+ * @param array $scopes
+ * @return \Laravel\Passport\Client
*/
public static function actingAsClient($client, $scopes = [])
{
|
style: correct NBSP for regular spaces (#<I>)
|
diff --git a/XBRL-Global.php b/XBRL-Global.php
index <HASH>..<HASH> 100644
--- a/XBRL-Global.php
+++ b/XBRL-Global.php
@@ -429,6 +429,26 @@ class XBRL_Global
}
/**
+ * Recursively remove files
+ * @param string $dir
+ */
+ public static function removeFiles($dir)
+ {
+ foreach ( glob( $dir ) as $file )
+ {
+ if ( is_dir( $file ) )
+ {
+ self::removeFiles( "$file/*" );
+ rmdir( $file );
+ }
+ else
+ {
+ unlink( $file );
+ }
+ }
+ }
+
+ /**
* Removes any cached file and directories
* @return boolean True if the directory exists and has been deleted
*/
@@ -438,23 +458,8 @@ class XBRL_Global
if ( ! is_dir( $this->cacheLocation ) ) return false;
- $rmrf = function ($dir) use ( &$rmrf )
- {
- foreach ( glob( $dir ) as $file )
- {
- if ( is_dir( $file ) )
- {
- $rmrf( "$file/*" );
- rmdir( $file );
- }
- else
- {
- unlink( $file );
- }
- }
- };
-
- $rmrf( $this->cacheLocation );
+
+ self::removeFiles( $this->cacheLocation );
return true;
}
|
Refactoring to create a removeFiles function
|
diff --git a/lib/nexpose/api_request.rb b/lib/nexpose/api_request.rb
index <HASH>..<HASH> 100644
--- a/lib/nexpose/api_request.rb
+++ b/lib/nexpose/api_request.rb
@@ -47,6 +47,7 @@ module Nexpose
end
def execute(options = {})
+ time_tracker = Time.now
@conn_tries = 0
begin
prepare_http_client
@@ -111,12 +112,16 @@ module Nexpose
retry
end
rescue ::Timeout::Error
+ $stdout.puts @http.read_timeout
if @conn_tries < 5
@conn_tries += 1
- # If an explicit timeout is set, don't retry.
- retry unless options.key? :timeout
+ if options.key?(:timeout)
+ retry if (time_tracker + options[:timeout].to_i) > Time.now
+ else
+ retry
+ end
end
- @error = "Nexpose did not respond within #{@http.read_timeout} seconds after #{@conn_tries} attempts."
+ @error = "Nexpose did not respond within #{@http.read_timeout} seconds after #{@conn_tries} attempt(s)."
rescue ::Errno::EHOSTUNREACH, ::Errno::ENETDOWN, ::Errno::ENETUNREACH, ::Errno::ENETRESET, ::Errno::EHOSTDOWN, ::Errno::EACCES, ::Errno::EINVAL, ::Errno::EADDRNOTAVAIL
@error = 'Nexpose host is unreachable.'
# Handle console-level interrupts
|
attempt retry based on timeout
|
diff --git a/wsfexv1.py b/wsfexv1.py
index <HASH>..<HASH> 100644
--- a/wsfexv1.py
+++ b/wsfexv1.py
@@ -834,7 +834,7 @@ if __name__ == "__main__":
else:
wsdl = "https://wswhomo.afip.gov.ar/wsfexv1/service.asmx?WSDL"
cache = proxy = ""
- wrapper = ""
+ wrapper = "httplib2"
cacert = "conf/afip_ca_info.crt"
ok = wsfexv1.Conectar(cache, wsdl, proxy, wrapper, cacert)
|
reverting minor change in wsfexv1.py
|
diff --git a/Upstart.php b/Upstart.php
index <HASH>..<HASH> 100644
--- a/Upstart.php
+++ b/Upstart.php
@@ -5,6 +5,7 @@ namespace Modulus\Framework;
use App\Resolvers\AppServiceResolver;
use Modulus\Framework\Upstart\AppLogger;
use Modulus\Framework\Upstart\AppConnect;
+use Modulus\Framework\Upstart\HandleCors;
use Modulus\Framework\Upstart\ErrorReport;
use Modulus\Framework\Upstart\SwishRouter;
use Modulus\Framework\Mocks\MustRememberMe;
@@ -15,6 +16,7 @@ class Upstart
{
use AppLogger; // Configure application logger
use AppConnect; // Initialize Database connection and Environment variables
+ use HandleCors; // Allow other applications to reach the router dispatch
use SwishRouter; // Handle application routing
use ErrorReport; // Handle application error reporting
use ViewComponent; // Strap application View
@@ -42,6 +44,7 @@ class Upstart
*/
public function boot(?bool $isConsole = false) : void
{
+ $this->addCors();
if (Upstart::$isReady) return;
$this->bootEnv();
|
Feat: execute addCors on boot
|
diff --git a/datalab/data/commands/_sql.py b/datalab/data/commands/_sql.py
index <HASH>..<HASH> 100644
--- a/datalab/data/commands/_sql.py
+++ b/datalab/data/commands/_sql.py
@@ -89,7 +89,7 @@ _sql_parser = _create_sql_parser()
# Register the line magic as well as the cell magic so we can at least give people help
# without requiring them to enter cell content first.
@IPython.core.magic.register_line_cell_magic
-def sql(line, cell):
+def sql(line, cell=None):
""" Create a SQL module with one or more queries. Use %sql --help for more details.
The supported syntax is:
|
Resolve issue where `%%sql --help` raises exception #<I>
|
diff --git a/fireplace/card.py b/fireplace/card.py
index <HASH>..<HASH> 100644
--- a/fireplace/card.py
+++ b/fireplace/card.py
@@ -646,7 +646,7 @@ class Enchantment(BaseCard):
def _set_zone(self, zone):
if zone == Zone.PLAY:
self.owner.buffs.append(self)
- elif zone == Zone.GRAVEYARD:
+ elif zone == Zone.REMOVEDFROMGAME:
self.owner.buffs.remove(self)
super()._set_zone(zone)
@@ -664,7 +664,7 @@ class Enchantment(BaseCard):
logging.info("Destroying buff %r from %r" % (self, self.owner))
if hasattr(self.data.scripts, "destroy"):
self.data.scripts.destroy(self)
- self.zone = Zone.GRAVEYARD
+ self.zone = Zone.REMOVEDFROMGAME
if self.aura_source:
# Clean up the buff from its source auras
self.aura_source._buffs.remove(self)
|
Move destroyed buffs to REMOVEDFROMGAME instead of GRAVEYARD
|
diff --git a/src/main/java/org/komamitsu/fluency/sender/TCPSender.java b/src/main/java/org/komamitsu/fluency/sender/TCPSender.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/komamitsu/fluency/sender/TCPSender.java
+++ b/src/main/java/org/komamitsu/fluency/sender/TCPSender.java
@@ -152,6 +152,27 @@ public class TCPSender
{
SocketChannel socketChannel;
if ((socketChannel = channel.getAndSet(null)) != null) {
+ socketChannel.socket().shutdownOutput();
+
+ int i;
+ int maxWait = 10;
+ for (i = 0; i < maxWait; i++) {
+ if (socketChannel.socket().isInputShutdown()) {
+ break;
+ }
+ try {
+ TimeUnit.MILLISECONDS.sleep(200);
+ }
+ catch (InterruptedException e) {
+ LOG.warn("Interrupted", e);
+ Thread.currentThread().interrupt();
+ break;
+ }
+ }
+ if (i >= maxWait) {
+ LOG.warn("This socket wasn't closed from the receiver side in an expected time");
+ }
+
socketChannel.close();
channel.set(null);
}
|
Shutdown (SHUT_WR) and wait until output is closed in TCPSender#close
instead of just closing the socket
|
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index <HASH>..<HASH> 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -3129,14 +3129,14 @@ class assignment_portfolio_caller extends portfolio_module_caller_base {
print_error('invalidcoursemodule');
}
- if (! $assignment = $DB->get_record("assignment", array("id"=>$cm->instance))) {
+ if (! $assignment = $DB->get_record("assignment", array("id"=>$this->cm->instance))) {
print_error('invalidid', 'assignment');
}
$this->assignmentfile = $CFG->dirroot . '/mod/assignment/type/' . $assignment->assignmenttype . '/assignment.class.php';
require_once($this->assignmentfile);
$assignmentclass = "assignment_$assignment->assignmenttype";
- $this->assignment= new $assignmentclass($cm->id, $assignment, $cm);
+ $this->assignment= new $assignmentclass($this->cm->id, $assignment, $this->cm);
if (!$this->assignment->portfolio_exportable()) {
print_error('notexportable', 'portfolio', $this->get_return_url());
}
|
MDL-<I> - fixing bugs I introduced in a refactor in assignment
|
diff --git a/tests/test_mapper.py b/tests/test_mapper.py
index <HASH>..<HASH> 100644
--- a/tests/test_mapper.py
+++ b/tests/test_mapper.py
@@ -16,7 +16,7 @@ class MapTest(unittest.TestCase):
def setUp(self):
""" gets called for EACH test """
unittest.TestCase.setUp(self)
- self.mymap = mod_map.Mapper()
+ self.mymap = mod_map.Mapper(mod_map.map_file)
def tearDown(self):
@@ -58,7 +58,7 @@ class MapTest(unittest.TestCase):
def test_31_MapColumn(self):
mc = mod_map.MapColumn('table,column,data_type,aikif_map,aikif_map_name,extract,format,where,index,')
- print(mc)
+ #print(mc)
self.assertEqual(mc.table, 'table')
self.assertEqual(mc.column, 'column')
self.assertEqual(mc.data_type, 'data_type')
@@ -71,10 +71,10 @@ class MapTest(unittest.TestCase):
def test_90_get_maps_stats(self):
- mc = mod_map.Mapper()
- print(mc)
+ mc = mod_map.Mapper(mod_map.map_file)
+ #print(mc)
stats = mc.get_maps_stats()
- print(stats)
+ #print(stats)
self.assertTrue(stats, {'file': 10, 'text': 4})
def test_99(self):
|
test for mapper.py instantiates Mapper with map_file
|
diff --git a/pyathenajdbc/cursor.py b/pyathenajdbc/cursor.py
index <HASH>..<HASH> 100644
--- a/pyathenajdbc/cursor.py
+++ b/pyathenajdbc/cursor.py
@@ -108,7 +108,7 @@ class Cursor(object):
self._result_set = None
self._meta_data = None
self._update_count = self._statement.getUpdatecount()
- except Exception as e:
+ except Exception:
_logger.exception('Failed to execute query.')
reraise_dbapi_error()
|
Fix F<I> local variable 'e' is assigned to but never used
|
diff --git a/ui/src/data_explorer/components/DatabaseList.js b/ui/src/data_explorer/components/DatabaseList.js
index <HASH>..<HASH> 100644
--- a/ui/src/data_explorer/components/DatabaseList.js
+++ b/ui/src/data_explorer/components/DatabaseList.js
@@ -68,7 +68,7 @@ const DatabaseList = React.createClass({
const isActive = database === query.database && retentionPolicy === query.retentionPolicy
return (
- <div className={classNames('query-builder--list-item', {active: isActive})} key={`${database}..${retentionPolicy}`} onClick={_.wrap(namespace, onChooseNamespace)}>
+ <div className={classNames('query-builder--list-item', {active: isActive})} key={`${database}..${retentionPolicy}`} onClick={isActive ? null : _.wrap(namespace, onChooseNamespace)}>
{database}.{retentionPolicy}
</div>
)
|
Selecting an already selected Namespace doesn't reset the DE
|
diff --git a/tests/jobs.py b/tests/jobs.py
index <HASH>..<HASH> 100644
--- a/tests/jobs.py
+++ b/tests/jobs.py
@@ -2438,8 +2438,7 @@ class SchedulerJobTest(unittest.TestCase):
execution_date=test_start_date))
# Now call manage_slas and see if the sla_miss callback gets called
- scheduler = SchedulerJob(dag_id='test_sla_miss',
- **self.default_scheduler_args)
+ scheduler = SchedulerJob(dag_id='test_sla_miss')
with mock.patch('airflow.jobs.SchedulerJob.log',
new_callable=PropertyMock) as mock_log:
@@ -2481,8 +2480,7 @@ class SchedulerJobTest(unittest.TestCase):
execution_date=test_start_date))
scheduler = SchedulerJob(dag_id='test_sla_miss',
- num_runs=1,
- **self.default_scheduler_args)
+ num_runs=1)
with mock.patch('airflow.jobs.SchedulerJob.log',
new_callable=PropertyMock) as mock_log:
|
[AIRFLOW-<I>][AIRFLOW-<I>] Fix CI failure caused by []
Closes #<I> from sekikn/AIRFLOW-<I>
|
diff --git a/avatar/__init__.py b/avatar/__init__.py
index <HASH>..<HASH> 100644
--- a/avatar/__init__.py
+++ b/avatar/__init__.py
@@ -27,5 +27,7 @@ from avatar.models import Avatar
def create_default_thumbnails(instance=None, created=False, **kwargs):
if created:
for size in AUTO_GENERATE_AVATAR_SIZES:
+ if AVATAR_DONT_SAVE_DUPLICATES and instance.thumbnail_exists(size):
+ return
instance.create_thumbnail(size)
signals.post_save.connect(create_default_thumbnails, sender=Avatar)
|
if AVATAR_DONT_SAVE_DUPLICATES is enabled don't generate a thumbnail over an existing one
|
diff --git a/Gulpfile.js b/Gulpfile.js
index <HASH>..<HASH> 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -50,5 +50,5 @@ gulp.task('security', function(cb) {
});
gulp.task('default', function(cb) {
- runSequence('test', ['lint', 'style', 'coveralls', 'security'], cb);
+ runSequence('test', ['lint', 'style', 'coveralls'], cb);
});
|
Temporarily disables gulp security task
* The security package, `gulp-requireSafe`, has been deprecated.
* `gulp-nsp` is its replacement. However, it does not yet work
due to a bug.
* This PR disables the security task.
* I will reactivate the security task once `gulp-nsp` gets
their house in order.
|
diff --git a/lib/util.js b/lib/util.js
index <HASH>..<HASH> 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -136,6 +136,10 @@ exports.unwritableError = function(result) {
exports.setDebug = function(newDebug) {
debug = newDebug === true;
+
+ if (db) {
+ db = db.with({debug});
+ }
};
exports.assertConfigured = function() {
@@ -167,7 +171,7 @@ exports.getFirebaseData = function() {
exports.assertConfigured();
if (!db) {
- db = database.create(rules, data.value, data.now);
+ db = database.create(rules, data.value, data.now).with({debug});
}
return db;
|
Tests display evaluation details when debug is on
|
diff --git a/src/Orderly/PayPalIpnBundle/Entity/IpnOrders.php b/src/Orderly/PayPalIpnBundle/Entity/IpnOrders.php
index <HASH>..<HASH> 100644
--- a/src/Orderly/PayPalIpnBundle/Entity/IpnOrders.php
+++ b/src/Orderly/PayPalIpnBundle/Entity/IpnOrders.php
@@ -605,9 +605,9 @@ class IpnOrders
private $caseCreationDate;
/**
- * @var enumorderstatus $orderStatus
+ * @var string $orderStatus
*
- * @ORM\Column(name="order_status", type="enumorderstatus", nullable=true)
+ * @ORM\Column(name="order_status", type="string", nullable=true)
*/
private $orderStatus;
@@ -2298,7 +2298,7 @@ class IpnOrders
/**
* Set orderStatus
*
- * @param enumorderstatus $orderStatus
+ * @param string $orderStatus
*/
public function setOrderStatus($orderStatus)
{
@@ -2308,7 +2308,7 @@ class IpnOrders
/**
* Get orderStatus
*
- * @return enumorderstatus
+ * @return string
*/
public function getOrderStatus()
{
|
enumorderstatus -> string, fixing #2
|
diff --git a/spec/dummy/app/models/post.rb b/spec/dummy/app/models/post.rb
index <HASH>..<HASH> 100644
--- a/spec/dummy/app/models/post.rb
+++ b/spec/dummy/app/models/post.rb
@@ -8,7 +8,7 @@ class Post < ActiveRecord::Base
property :id
property :title
- property :body
+ property :body, if: scope(:read_post_body)
property :user, selectable: true
collection :comments, selectable: true
|
Add if: scope(:xxx) example to Post model in dummy app
This increases test coverage of Garage::Representer#scope.
|
diff --git a/bokeh/server/services.py b/bokeh/server/services.py
index <HASH>..<HASH> 100644
--- a/bokeh/server/services.py
+++ b/bokeh/server/services.py
@@ -61,7 +61,7 @@ class ManagedProcess(object):
-def start_redis(pidfilename, port, data_dir, loglevel="notice",
+def start_redis(pidfilename, port, data_dir, loglevel="warning",
data_file='redis.db', save=True):
base_config = os.path.join(os.path.dirname(__file__), 'redis.conf')
with open(base_config) as f:
|
Set redis loglevel to warning to avoid banner
|
diff --git a/src/Solr/Stores/SolrConfigStore_Post.php b/src/Solr/Stores/SolrConfigStore_Post.php
index <HASH>..<HASH> 100644
--- a/src/Solr/Stores/SolrConfigStore_Post.php
+++ b/src/Solr/Stores/SolrConfigStore_Post.php
@@ -30,7 +30,10 @@ class SolrConfigStore_Post implements SolrConfigStore
$options['host'] . ':' . $options['port'],
$config['path']
]);
- $this->remote = $config['remotepath'];
+
+ if (isset($config['remotepath'])) {
+ $this->remote = $config['remotepath'];
+ }
}
/**
|
FIX Make remotepath optional to restore compatibility with CWP
|
diff --git a/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py b/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py
index <HASH>..<HASH> 100644
--- a/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py
+++ b/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py
@@ -641,6 +641,7 @@ class OneLogin_Saml2_IdPMetadataParser_Test(unittest.TestCase):
expected_settings3 = json.loads(expected_settings3_json)
self.assertEqual(expected_settings3, settings_result3)
+
if __name__ == '__main__':
runner = unittest.TextTestRunner()
unittest.main(testRunner=runner)
|
expected 2 blank lines after class or function definition
|
diff --git a/lib/components/app/responsive-webapp.js b/lib/components/app/responsive-webapp.js
index <HASH>..<HASH> 100644
--- a/lib/components/app/responsive-webapp.js
+++ b/lib/components/app/responsive-webapp.js
@@ -238,7 +238,7 @@ class RouterWrapperWithAuth0 extends Component {
path={'/savetrip'}
component={(routerProps) => {
const props = this._combineProps(routerProps)
- return <SavedTripScreen wizard {...props} />
+ return <SavedTripScreen isCreating {...props} />
}}
/>
<Route
|
refactor(Responsive): Finish rename prop.
|
diff --git a/src/components/autocomplete/js/autocompleteDirective.js b/src/components/autocomplete/js/autocompleteDirective.js
index <HASH>..<HASH> 100644
--- a/src/components/autocomplete/js/autocompleteDirective.js
+++ b/src/components/autocomplete/js/autocompleteDirective.js
@@ -19,6 +19,8 @@ angular
* no matches were found. You can do this by wrapping your template in `md-item-template` and
* adding a tag for `md-not-found`. An example of this is shown below.
*
+ * To reset the displayed value you must clear both values for `md-search-text` and `md-selected-item`.
+ *
* ### Validation
*
* You can use `ng-messages` to include validation the same way that you would normally validate;
|
(docs): how to reset of value of autocomplete
I spent a lot of time trying to figure out how to reset the displayed value of an autocomplete that I was (re)using in a drawer. I eventually found the answer in this issue: <URL>
|
diff --git a/test/unit/support.js b/test/unit/support.js
index <HASH>..<HASH> 100644
--- a/test/unit/support.js
+++ b/test/unit/support.js
@@ -248,7 +248,7 @@ testIframeWithCallback( "A background on the testElement does not cause IE8 to c
if ( expected ) {
test("Verify that the support tests resolve as expected per browser", function() {
- expect( jQuery(expected).size() );
+ expect( 30 );
for ( var i in expected ) {
if ( jQuery.ajax || i !== "ajax" && i !== "cors" ) {
|
Don't try to be dynamic, just get the damn job done. Expects = <I>.
|
diff --git a/lib/Configuration.js b/lib/Configuration.js
index <HASH>..<HASH> 100644
--- a/lib/Configuration.js
+++ b/lib/Configuration.js
@@ -31,7 +31,7 @@ const DEFAULT_CONFIG = {
namedExports: {},
environments: [],
excludes: [],
- globals: ['module', 'require'],
+ globals: ['module', 'require', 'console'],
groupImports: true,
ignorePackagePrefixes: [],
importDevDependencies: false,
diff --git a/lib/importjs.js b/lib/importjs.js
index <HASH>..<HASH> 100644
--- a/lib/importjs.js
+++ b/lib/importjs.js
@@ -1,5 +1,4 @@
// @flow
-import console from 'console';
import fs from 'fs';
import program from 'commander';
|
Don't import `console`
Adding this to the list of default globals should prevent accidentally
importing something named `console`.
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -29,9 +29,9 @@ const pkg = require( './package.json' ),
minDistFilePath = distFolder + minDistFilename;
-gulp.task( 'default', [ 'lint', 'doc', 'test' ] );
+gulp.task( 'default', [ 'doc', 'test' ] );
gulp.task( 'lint', lintTask );
-gulp.task( 'build', buildTask );
+gulp.task( 'build', [ 'lint' ], buildTask );
gulp.task( 'test', [ 'build' ], testTask );
gulp.task( 'doc', [ 'build', 'typescript' ], docTask );
gulp.task( 'serve', [ 'typescript', 'doc' ], serveTask );
|
Update Gulpfile to always lint before building
|
diff --git a/simuvex/procedures/libc.so.6/strstr.py b/simuvex/procedures/libc.so.6/strstr.py
index <HASH>..<HASH> 100644
--- a/simuvex/procedures/libc.so.6/strstr.py
+++ b/simuvex/procedures/libc.so.6/strstr.py
@@ -18,12 +18,9 @@ class strstr(simuvex.SimProcedure):
haystack_strlen = strlen(self.state, inline=True, arguments=[haystack_addr])
needle_strlen = strlen(self.state, inline=True, arguments=[needle_addr])
- haystack_lenval = self.state.expr_value(haystack_strlen.ret_expr)
- needle_lenval = self.state.expr_value(needle_strlen.ret_expr)
-
# naive approach
- haystack_maxlen = haystack_lenval.max()
- needle_maxlen = needle_lenval.max()
+ haystack_maxlen = haystack_strlen.maximum_null
+ needle_maxlen = needle_strlen.maximum_null
l.debug("Maxlen: %d, %d", haystack_maxlen, needle_maxlen)
l.debug("addrs: %s, %s", haystack_addr, needle_addr)
|
Fixing an issue in strstr.py.
|
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index <HASH>..<HASH> 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute_accessors'
+
module ActiveSupport
# Inspired by the buffered logger idea by Ezra
class BufferedLogger
|
Explict class attribute accessor dependency
|
diff --git a/lib/active_merchant/billing/gateways/ebanx.rb b/lib/active_merchant/billing/gateways/ebanx.rb
index <HASH>..<HASH> 100644
--- a/lib/active_merchant/billing/gateways/ebanx.rb
+++ b/lib/active_merchant/billing/gateways/ebanx.rb
@@ -1,15 +1,15 @@
module ActiveMerchant #:nodoc:
module Billing #:nodoc:
class EbanxGateway < Gateway
- self.test_url = 'https://sandbox.ebanx.com/ws/'
- self.live_url = 'https://api.ebanx.com/ws/'
+ self.test_url = 'https://sandbox.ebanxpay.com/ws/'
+ self.live_url = 'https://api.ebanxpay.com/ws/'
self.supported_countries = ['BR', 'MX', 'CO']
self.default_currency = 'USD'
self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club]
self.homepage_url = 'http://www.ebanx.com/'
- self.display_name = 'Ebanx'
+ self.display_name = 'EBANX'
CARD_BRAND = {
visa: 'visa',
|
Update EBANX API URL
Remote tests failing don't appear to be related to the URL change.
Unit: <I> tests, <I> assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications
<I>% passed
Remote: <I> tests, <I> assertions, 3 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications
<I>% passed
Closes #<I>
|
diff --git a/src/datamodel/gfunc.py b/src/datamodel/gfunc.py
index <HASH>..<HASH> 100644
--- a/src/datamodel/gfunc.py
+++ b/src/datamodel/gfunc.py
@@ -350,7 +350,8 @@ class Gfunc(Ugrid):
self.xmin[1], self.xmax[1]]
aspect = self.tsize[1] / self.tsize[0]
dsp_kwargs.update({'interpolation': 'none', 'cmap': gray,
- 'extent': extent, 'aspect': aspect})
+ 'extent': extent, 'aspect': aspect,
+ 'origin': 'lower'})
elif method == 'scatter':
coo_arr = self.coord.asarr()
args_re = [coo_arr[:, 0], coo_arr[:, 1], self.fvals.real]
|
fix y axis swap in imshow method
|
diff --git a/agent/format-2.0.go b/agent/format-2.0.go
index <HASH>..<HASH> 100644
--- a/agent/format-2.0.go
+++ b/agent/format-2.0.go
@@ -139,8 +139,14 @@ func (formatter_2_0) unmarshal(data []byte) (*configInternal, error) {
}
}
- // Mongo version is set, we might be running a version other than default.
+
+ // TODO (anastasiamac 2016-06-17) Mongo version must be set.
+ // For scenarios where mongo version is not set, we should still
+ // be explicit about what "default" mongo version is. After these lines,
+ // config.mongoVersion should not be empty under any circumstance.
+ // Bug# 1593855
if format.MongoVersion != "" {
+ // Mongo version is set, we might be running a version other than default.
config.mongoVersion = format.MongoVersion
}
return config, nil
|
Added comment with bug number: need to always have mongo version in agent.config file.
|
diff --git a/deis/__init__.py b/deis/__init__.py
index <HASH>..<HASH> 100644
--- a/deis/__init__.py
+++ b/deis/__init__.py
@@ -9,4 +9,4 @@ from __future__ import absolute_import
from .celery import app # noqa
-__version__ = '0.9.0'
+__version__ = '0.10.0'
|
Switch master to <I>.
|
diff --git a/ast_test.go b/ast_test.go
index <HASH>..<HASH> 100644
--- a/ast_test.go
+++ b/ast_test.go
@@ -566,6 +566,18 @@ var astTests = []testCase{
},
{
[]string{
+ "foo <<\\EOF\nbar\nEOF",
+ "foo <<\\EOF\nbar",
+ },
+ Stmt{
+ Node: litCmd("foo"),
+ Redirs: []Redirect{
+ {Op: SHL, Word: litWord("\\EOF\nbar\nEOF")},
+ },
+ },
+ },
+ {
+ []string{
"foo <<-EOF\nbar\nEOF",
"foo <<- EOF\nbar\nEOF",
},
diff --git a/parse.go b/parse.go
index <HASH>..<HASH> 100644
--- a/parse.go
+++ b/parse.go
@@ -949,6 +949,11 @@ func unquote(w Word) (unq Word) {
unq.Parts = append(unq.Parts, Lit{Value: x.Value})
case DblQuoted:
unq.Parts = append(unq.Parts, x.Parts...)
+ case Lit:
+ if x.Value[0] == '\\' {
+ x.Value = x.Value[1:]
+ }
+ unq.Parts = append(unq.Parts, x)
default:
unq.Parts = append(unq.Parts, n)
}
|
When unquoting heredoc words, drop leading \
Couldn't find any documentation on this, but both dash and bash seem to
do this.
|
diff --git a/hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java
index <HASH>..<HASH> 100644
--- a/hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java
+++ b/hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java
@@ -906,9 +906,9 @@ public class DefaultRecordStore implements RecordStore {
}
private void cancelAssociatedSchedulers(Set<Data> keySet) {
- if(keySet == null || keySet.isEmpty() ) return;
+ if (keySet == null || keySet.isEmpty()) return;
- for (Data key : keySet ){
+ for (Data key : keySet) {
cancelAssociatedSchedulers(key);
}
}
@@ -929,6 +929,10 @@ public class DefaultRecordStore implements RecordStore {
final NodeEngine nodeEngine = mapService.getNodeEngine();
Map values = mapContainer.getStore().loadAll(keys.values());
+ if (values == null || values.isEmpty()) {
+ loaded.set(true);
+ return;
+ }
MapEntrySet entrySet = new MapEntrySet();
for (Data dataKey : keys.keySet()) {
|
fixes a bug: set loaded=true if partition has no entry.
|
diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go
index <HASH>..<HASH> 100644
--- a/command/agent/agent_test.go
+++ b/command/agent/agent_test.go
@@ -156,22 +156,17 @@ func TestRetryJoinFail(t *testing.T) {
func TestRetryJoinWanFail(t *testing.T) {
t.Parallel()
- t.Skip("fs: skipping tests that use cmd.Run until signal handling is fixed")
- cfg := agent.TestConfig()
tmpDir := testutil.TempDir(t, "consul")
defer os.RemoveAll(tmpDir)
- shutdownCh := make(chan struct{})
- defer close(shutdownCh)
-
ui := cli.NewMockUi()
- cmd := New(ui, "", "", "", "", shutdownCh)
+ cmd := New(ui, "", "", "", "", nil)
args := []string{
"-server",
- "-bind", cfg.BindAddr.String(),
+ "-bind", "127.0.0.1",
"-data-dir", tmpDir,
- "-retry-join-wan", cfg.SerfBindAddrWAN.String(),
+ "-retry-join-wan", "127.0.0.1:99",
"-retry-max-wan", "1",
"-retry-interval-wan", "10ms",
}
|
agent: fix TestRetryJoinWanFail
|
diff --git a/ui/src/components/infinite-scroll/QInfiniteScroll.js b/ui/src/components/infinite-scroll/QInfiniteScroll.js
index <HASH>..<HASH> 100644
--- a/ui/src/components/infinite-scroll/QInfiniteScroll.js
+++ b/ui/src/components/infinite-scroll/QInfiniteScroll.js
@@ -184,12 +184,13 @@ export default Vue.extend({
},
render (h) {
- const content = this.$scopedSlots.default !== void 0
- ? this.$scopedSlots.default()
- : []
- const body = this.fetching === true
- ? [ h('div', { staticClass: 'q-infinite-scroll__loading' }, slot(this, 'loading')) ]
- : []
+ const content = slot(this, 'default')
+ const body = [
+ h('div', {
+ staticClass: 'q-infinite-scroll__loading',
+ class: this.fetching === true ? '' : 'invisible'
+ }, slot(this, 'loading'))
+ ]
return h(
'div',
|
feat(QInfiniteScroll): Persist loading indicator to make scroll stable #<I>
|
diff --git a/salt/renderers/__init__.py b/salt/renderers/__init__.py
index <HASH>..<HASH> 100644
--- a/salt/renderers/__init__.py
+++ b/salt/renderers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+'''
+Renderers Directory
+'''
|
add encoding and docstring for renderers
|
diff --git a/lib/mongoid/relations/embedded/many.rb b/lib/mongoid/relations/embedded/many.rb
index <HASH>..<HASH> 100644
--- a/lib/mongoid/relations/embedded/many.rb
+++ b/lib/mongoid/relations/embedded/many.rb
@@ -170,7 +170,8 @@ module Mongoid
# @since 3.1.0
def delete_if
if block_given?
- target.each do |doc|
+ dup_target = target.dup
+ dup_target.each do |doc|
delete(doc) if yield(doc)
end
self
|
FIX #<I> Embedded documents deleting
|
diff --git a/handler/src/main/java/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java b/handler/src/main/java/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java
index <HASH>..<HASH> 100644
--- a/handler/src/main/java/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java
+++ b/handler/src/main/java/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java
@@ -25,7 +25,7 @@ public final class JdkNpnApplicationProtocolNegotiator extends JdkBaseApplicatio
{
if (!JdkNpnSslEngine.isAvailable()) {
throw new RuntimeException("NPN unsupported. Is your classpatch configured correctly?"
- + " See http://www.eclipse.org/jetty/documentation/current/npn-chapter.html#npn-starting");
+ + " See https://wiki.eclipse.org/Jetty/Feature/NPN");
}
}
|
Eclipse SPDY docs moved
Motivation:
We provide a hyperlink to the docs for SPDY if the runtime is not setup correctly to help users. These docs have moved.
Modifications:
- Update the hyperlink to point to the new doc location.
Result:
Users are able to find docs more easily.
|
diff --git a/httpfile.go b/httpfile.go
index <HASH>..<HASH> 100644
--- a/httpfile.go
+++ b/httpfile.go
@@ -110,12 +110,13 @@ func (f *HttpFile) ReadAt(p []byte, off int64) (int, error) {
return 0, &HttpFileError{Err: fmt.Errorf("Unexpected Content-Range %q (%d)", content_range, n)}
}
- r, err := resp.Body.Read(p)
- if err != nil {
- return 0, err
+ n, err = resp.Body.Read(p)
+ if n > 0 && err == io.EOF {
+ // read reached EOF, but archive/zip doesn't like this!
+ err = nil
}
- return r, nil
+ return n, err
}
// The Reader interface
|
Turns out archive/zip doesn't like a ReadAt that returns n>0 AND io.EOF (even if the specification for ReaderAt/Read say this should be possible).
|
diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go
index <HASH>..<HASH> 100644
--- a/test/e2e/autoscaling/cluster_size_autoscaling.go
+++ b/test/e2e/autoscaling/cluster_size_autoscaling.go
@@ -1926,12 +1926,18 @@ func createPriorityClasses(f *framework.Framework) func() {
}
for className, priority := range priorityClasses {
_, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: className}, Value: priority})
+ if err != nil {
+ glog.Errorf("Error creating priority class: %v", err)
+ }
Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true))
}
return func() {
for className := range priorityClasses {
- f.ClientSet.SchedulingV1beta1().PriorityClasses().Delete(className, nil)
+ err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Delete(className, nil)
+ if err != nil {
+ glog.Errorf("Error deleting priority class: %v", err)
+ }
}
}
}
|
Log error in e2e tests when creating priority classes
|
diff --git a/lib/page.js b/lib/page.js
index <HASH>..<HASH> 100644
--- a/lib/page.js
+++ b/lib/page.js
@@ -22,7 +22,6 @@ var events = require('events')
function Page(path) {
events.EventEmitter.call(this);
this.path = path;
- this.url = path;
this._isOpen = false;
}
|
Remove url from page, set latter by middleware.
|
diff --git a/person-directory-impl/src/main/java/org/apereo/services/persondir/support/ldap/LdaptivePersonAttributeDao.java b/person-directory-impl/src/main/java/org/apereo/services/persondir/support/ldap/LdaptivePersonAttributeDao.java
index <HASH>..<HASH> 100644
--- a/person-directory-impl/src/main/java/org/apereo/services/persondir/support/ldap/LdaptivePersonAttributeDao.java
+++ b/person-directory-impl/src/main/java/org/apereo/services/persondir/support/ldap/LdaptivePersonAttributeDao.java
@@ -52,7 +52,7 @@ import java.util.Map;
* @author Marvin S. Addison
* @since 4.0.0
*/
-public class LdaptivePersonAttributeDao extends AbstractQueryPersonAttributeDao<FilterTemplate> {
+public class LdaptivePersonAttributeDao extends AbstractQueryPersonAttributeDao<FilterTemplate> implements AutoCloseable {
/**
* Logger instance.
@@ -270,4 +270,11 @@ public class LdaptivePersonAttributeDao extends AbstractQueryPersonAttributeDao<
logger.debug("Converted ldap DN entry [{}] to attribute map {}", entry.getDn(), attributeMap.toString());
return attributeMap;
}
+
+ @Override
+ public void close() {
+ if (connectionFactory != null) {
+ connectionFactory.close();
+ }
+ }
}
|
allow ldap dao to close connection factories
|
diff --git a/src/main/java/common/Internet.java b/src/main/java/common/Internet.java
index <HASH>..<HASH> 100644
--- a/src/main/java/common/Internet.java
+++ b/src/main/java/common/Internet.java
@@ -83,7 +83,7 @@ public class Internet {
connection.setRequestProperty("Content-Type", "application/json");
connection.setRequestProperty("charset", "utf-8");
DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
- ByteStringConverter bs = new ByteStringConverter();
+ // ByteStringConverter bs = new ByteStringConverter();
wr.write(postData2);
connection.connect();
|
Removed bs in class internet as it is never used locally
|
diff --git a/src/MailMimeParser.php b/src/MailMimeParser.php
index <HASH>..<HASH> 100644
--- a/src/MailMimeParser.php
+++ b/src/MailMimeParser.php
@@ -6,6 +6,9 @@
*/
namespace ZBateson\MailMimeParser;
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\StreamWrapper;
+
/**
* Parses a MIME message into a \ZBateson\MailMimeParser\Message object.
*
@@ -75,15 +78,14 @@ class MailMimeParser
*/
public function parse($handleOrString)
{
- // $tempHandle is attached to $message, and closed in its destructor
- $tempHandle = fopen('php://temp', 'r+');
- if (is_string($handleOrString)) {
- fwrite($tempHandle, $handleOrString);
- } else {
- stream_copy_to_stream($handleOrString, $tempHandle);
- }
- rewind($tempHandle);
+ $stream = Psr7\stream_for($handleOrString);
+ $copy = Psr7\stream_for(fopen('php://temp', 'r+'));
+
+ Psr7\copy_to_stream($stream, $copy);
+ $copy->rewind();
+ // don't close it when $stream gets destroyed
+ $stream->detach();
$parser = $this->di->newMessageParser();
- return $parser->parse($tempHandle);
+ return $parser->parse(StreamWrapper::getResource($copy));
}
}
|
Refactor MailMimeParser::parse to use Psr7 stream
|
diff --git a/modules/webservices/debugger.php b/modules/webservices/debugger.php
index <HASH>..<HASH> 100644
--- a/modules/webservices/debugger.php
+++ b/modules/webservices/debugger.php
@@ -31,7 +31,7 @@ if ( $target != 'action' && $target != 'controller' && $target != 'visualeditor'
$params .= '&host=' . $url['host'];
$params .= '&port=' . ( isset( $url['port'] ) ? $url['port'] : '' );
$params .= '&path=' . ( isset( $url['path'] ) ? $url['path'] : '/' );
- if ( $url['scheme'] == 'htps' )
+ if ( $url['scheme'] == 'https' )
{
$params .= '&protocol=2';
}
|
- one fix for https urls
|
diff --git a/public/js/user.js b/public/js/user.js
index <HASH>..<HASH> 100644
--- a/public/js/user.js
+++ b/public/js/user.js
@@ -408,7 +408,10 @@ apos.define('apostrophe-workflow', {
self.skipAllRelated = false;
self.nextExportHint = [];
if (!ids.length) {
- return apos.notify('No modifications to commit.', { type: 'warn', dismiss: true });
+ apos.notify('No modifications to commit.', { type: 'warn', dismiss: true });
+ if (callback) {
+ return callback(null);
+ }
}
var leadId = options.leadId || (apos.contextPiece && apos.contextPiece._id) || (apos.pages.page && apos.pages.page._id);
if (!_.contains(ids, leadId)) {
|
Fix obvious bug: don't forget to invoke the callback if present and there is no work to do
|
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js
index <HASH>..<HASH> 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js
@@ -48,10 +48,12 @@ export function getBreakPoints(
const precision =
delta === 0 ? 0 : Math.max(0, Math.ceil(Math.log10(1 / delta)));
const extraBucket = maxValue > maxValue.toFixed(precision) ? 1 : 0;
+ const startValue =
+ minValue < minValue.toFixed(precision) ? minValue - 1 : minValue;
return new Array(numBuckets + 1 + extraBucket)
.fill()
- .map((_, i) => (minValue + i * delta).toFixed(precision));
+ .map((_, i) => (startValue + i * delta).toFixed(precision));
}
return formDataBreakPoints.sort((a, b) => parseFloat(a) - parseFloat(b));
|
make to change the getBreakPoints of polygon chart (#<I>)
|
diff --git a/src/main/java/net/sf/jabb/quartz/AutowiringSpringBeanJobFactory.java b/src/main/java/net/sf/jabb/quartz/AutowiringSpringBeanJobFactory.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/sf/jabb/quartz/AutowiringSpringBeanJobFactory.java
+++ b/src/main/java/net/sf/jabb/quartz/AutowiringSpringBeanJobFactory.java
@@ -27,10 +27,20 @@ public class AutowiringSpringBeanJobFactory extends SpringBeanJobFactory impleme
private static final Log log = LogFactory.getLog(AutowiringSpringBeanJobFactory.class);
static private AutowireCapableBeanFactory beanFactory;
+ static private ApplicationContext appContext;
+
+ /**
+ * This is a convenient method for getting the application context
+ * @return the application context
+ */
+ static public ApplicationContext getApplicationContenxt(){
+ return appContext;
+ }
@Override
public void setApplicationContext(ApplicationContext appContext)
throws BeansException {
+ AutowiringSpringBeanJobFactory.appContext = appContext;
setBeanFacotry(appContext.getAutowireCapableBeanFactory());
}
|
allow the application context to be got easily from non-spring codes
|
diff --git a/src/Command/Environment/EnvironmentDrushCommand.php b/src/Command/Environment/EnvironmentDrushCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/Environment/EnvironmentDrushCommand.php
+++ b/src/Command/Environment/EnvironmentDrushCommand.php
@@ -46,9 +46,7 @@ class EnvironmentDrushCommand extends CommandBase
$this->validateInput($input);
$drushCommand = $input->getArgument('cmd');
- if (is_array($drushCommand)) {
- $drushCommand = implode(' ', $drushCommand);
- }
+ $drushCommand = implode(' ', array_map([OsUtil::class, 'escapePosixShellArg'], (array) $drushCommand));
// Pass through options that the CLI shares with Drush.
foreach (['yes', 'no', 'quiet'] as $option) {
|
Fix argument escaping in drush command
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,5 @@
import sys
+import warnings
from pathlib import Path
from datetime import datetime
@@ -9,6 +10,9 @@ matplotlib.use('agg')
HERE = Path(__file__).parent
sys.path.insert(0, str(HERE.parent))
import scanpy # noqa
+with warnings.catch_warnings():
+ warnings.filterwarnings('ignore', category=FutureWarning)
+ import scanpy.api
# -- General configuration ------------------------------------------------
|
Suppress FutureWarning when building docs
|
diff --git a/examples/conftest.py b/examples/conftest.py
index <HASH>..<HASH> 100644
--- a/examples/conftest.py
+++ b/examples/conftest.py
@@ -2,6 +2,7 @@
# by pytest before any tests are run
import sys
+import warnings
from os.path import abspath, dirname, join
@@ -9,3 +10,7 @@ from os.path import abspath, dirname, join
# 'pip install -e .[dev]' when switching between checkouts and running tests.
git_repo_path = abspath(join(dirname(dirname(__file__)), "src"))
sys.path.insert(1, git_repo_path)
+
+# silence FutureWarning warnings in tests since often we can't act on them until
+# they become normal warnings - i.e. the tests still need to test the current functionality
+warnings.simplefilter(action="ignore", category=FutureWarning)
|
[testing] disable FutureWarning in examples tests (#<I>)
* [testing] disable FutureWarning in examples tests
same as tests/conftest.py, we can't resolve those warning, so turn the noise off.
* fix
|
diff --git a/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb b/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
index <HASH>..<HASH> 100644
--- a/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
+++ b/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
@@ -14,7 +14,7 @@ module RailsEventStoreActiveRecord
def append_to_stream(events, stream, expected_version)
records, event_ids = [], []
Array(events).each do |event|
- records << build_event_record(event)
+ records << build_event_hash(event)
event_ids << event.event_id
end
add_to_stream(event_ids, stream, expected_version, true) do
@@ -116,13 +116,13 @@ module RailsEventStoreActiveRecord
IndexViolationDetector.new.detect(message)
end
- def build_event_record(serialized_record)
- Event.new(
+ def build_event_hash(serialized_record)
+ {
id: serialized_record.event_id,
data: serialized_record.data,
metadata: serialized_record.metadata,
event_type: serialized_record.event_type
- )
+ }
end
# Overwritten in a sub-class
|
Killing mutants: hash is enough here
All the rest will be handled by activerecord-import.
|
diff --git a/Kwf/Component/Plugin/Password/LoginForm/Component.php b/Kwf/Component/Plugin/Password/LoginForm/Component.php
index <HASH>..<HASH> 100644
--- a/Kwf/Component/Plugin/Password/LoginForm/Component.php
+++ b/Kwf/Component/Plugin/Password/LoginForm/Component.php
@@ -5,6 +5,7 @@ class Kwf_Component_Plugin_Password_LoginForm_Component extends Kwc_Form_Compone
{
$ret = parent::getSettings();
$ret['generators']['child']['component']['success'] = false;
+ $ret['useAjaxRequest'] = false;
return $ret;
}
|
don't use ajax request in password plugin form
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup_kwargs = {
'version': '4.1.0',
'description': 'A set that remembers its order, and allows looking up its items by their index in that order.',
'author': 'Elia Robyn Lake',
- 'author_email': 'elial@ec.ai',
+ 'author_email': 'gh@arborelia.net',
'url': 'https://github.com/rspeer/ordered-set',
'packages': packages,
'python_requires': '>=3.7',
|
use personal email in setup.py
|
diff --git a/lib/oxmlk/description.rb b/lib/oxmlk/description.rb
index <HASH>..<HASH> 100644
--- a/lib/oxmlk/description.rb
+++ b/lib/oxmlk/description.rb
@@ -138,7 +138,7 @@ module OxMlk
end
def wrap(xpath=nil)
- [@in,xpath].compact.join('/')
+ (xpath.split('|').map {|x| [@in,x].compact.join('/') }).join('|')
end
end
end
\ No newline at end of file
diff --git a/spec/description_spec.rb b/spec/description_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/description_spec.rb
+++ b/spec/description_spec.rb
@@ -45,10 +45,15 @@ describe OxMlk::Description do
@desc.xpath.should == 'number|person'
end
- it 'should add in + / to xpath if :in is passed' do
+ it 'should add :in + / to xpath if :in is passed' do
@desc = OxMlk::Description.new(:person, :in => :friends)
@desc.xpath.should == 'friends/person'
end
+
+ it 'should add :in + / to all items in array of ox_objetcs' do
+ @desc = OxMlk::Description.new(:digits, :as => [Number,Person], :in => :friends)
+ @desc.xpath.should == 'friends/number|friends/person'
+ end
end
describe '#accessor' do
|
fixed bug where :in only applied to first item in xpath with multiple elements
|
diff --git a/src/Propel/Generator/Command/templates/propel.json.php b/src/Propel/Generator/Command/templates/propel.json.php
index <HASH>..<HASH> 100644
--- a/src/Propel/Generator/Command/templates/propel.json.php
+++ b/src/Propel/Generator/Command/templates/propel.json.php
@@ -6,7 +6,7 @@
'adapter' => $rdbms,
'dsn' => $dsn,
'user' => $user,
- 'password' => '',
+ 'password' => $password,
'settings' => [
'charset' => $charset
]
|
Fixed password not set in json config by `propel init`
|
diff --git a/DependencyInjection/Source/JWKSetSource/JWKSets.php b/DependencyInjection/Source/JWKSetSource/JWKSets.php
index <HASH>..<HASH> 100644
--- a/DependencyInjection/Source/JWKSetSource/JWKSets.php
+++ b/DependencyInjection/Source/JWKSetSource/JWKSets.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;
-class JWKSets extends AbstractJWKSetSource implements JWKSetSourceInterface
+class JWKSets extends AbstractJWKSetSource
{
/**
* {@inheritdoc}
|
Update JWKSets.php
|
diff --git a/cmd/cert.go b/cmd/cert.go
index <HASH>..<HASH> 100644
--- a/cmd/cert.go
+++ b/cmd/cert.go
@@ -35,8 +35,8 @@ func init() {
certCmd.PersistentFlags().String(cert.FlagKeyType, "RSA", "Type of key to generate. [string]")
certCmd.PersistentFlags().StringSlice(cert.FlagIpSans, []string{}, "IP sans. [[]string] (default none)")
certCmd.PersistentFlags().StringSlice(cert.FlagSanHosts, []string{}, "Host Sans. [[]string] (default none)")
- certCmd.PersistentFlags().String(cert.FlagOwner, "root", "Owner of created file/directories. Uid value also accepted. [string]")
- certCmd.PersistentFlags().String(cert.FlagGroup, "root", "Group of created file/directories. Gid value also accepted. [string]")
+ certCmd.PersistentFlags().String(cert.FlagOwner, "0", "Owner of created file/directories. Uid value also accepted. [string]")
+ certCmd.PersistentFlags().String(cert.FlagGroup, "0", "Group of created file/directories. Gid value also accepted. [string]")
RootCmd.AddCommand(certCmd)
}
|
Set owner/group flag default to "0"
- This commit fixes #<I>
|
diff --git a/jsontableschema_pandas/__init__.py b/jsontableschema_pandas/__init__.py
index <HASH>..<HASH> 100644
--- a/jsontableschema_pandas/__init__.py
+++ b/jsontableschema_pandas/__init__.py
@@ -4,4 +4,16 @@ from __future__ import print_function
from __future__ import absolute_import
from __future__ import unicode_literals
+
+# Module API
+
from .storage import Storage
+
+
+# Version
+
+import io
+import os
+__version__ = io.open(
+ os.path.join(os.path.dirname(__file__), 'VERSION'),
+ encoding='utf-8').read().strip()
|
Exposed package version (fixes #<I>)
|
diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
index <HASH>..<HASH> 100644
--- a/lib/phpmailer/class.phpmailer.php
+++ b/lib/phpmailer/class.phpmailer.php
@@ -471,7 +471,7 @@ class PHPMailer
* @return bool
*/
function SmtpSend($header, $body) {
- include_once($this->PluginDir . "class.smtp.php");
+ include_once("class.smtp.php");
$error = "";
$bad_rcpt = array();
|
OK, aligning this to the same as STABLE ... there's been a bit of a mixup
about this file. It's now standard with the single addition of a constructor
to set this->PluginDir, and this is now used for the language file includes.
|
diff --git a/lib/verilog/file.rb b/lib/verilog/file.rb
index <HASH>..<HASH> 100644
--- a/lib/verilog/file.rb
+++ b/lib/verilog/file.rb
@@ -61,7 +61,7 @@ module Verilog
def instantiations
inst = []
- @contents.scan(/(^\s*)(\w+)(\s+#\([.,\(\)\w\s]*\))?(\s+\w+\s*)(\([.,\(\)\w\s]*\))?;/mi){ inst << $2 }
+ @contents.scan(/(^\s*)(\w+)(\s+#\([.,\(\)\w\s]*\))?(\s+\w+\s*)(\([.,\(\)\w\s\/]*\))?;/mi){ inst << $2 }
#Hack, module will also match the instantiation syntax, remove via array subtraction
inst = inst - ['module']
|
Allowing comments after a port.
|
diff --git a/zenpy/lib/objects/events/ticket_event.py b/zenpy/lib/objects/events/ticket_event.py
index <HASH>..<HASH> 100644
--- a/zenpy/lib/objects/events/ticket_event.py
+++ b/zenpy/lib/objects/events/ticket_event.py
@@ -10,7 +10,6 @@ class TicketEvent(BaseObject):
self.updater_id = None
self.child_events = None
self.timestamp = None
- self._ticket = None
self.ticket_id = None
self._system = None
@@ -27,12 +26,3 @@ class TicketEvent(BaseObject):
@updater.setter
def updater(self, value):
self._updater = value
-
- @property
- def ticket(self):
- if self.api and self.ticket_id:
- return self.api.get_ticket(self.ticket_id, skip_cache=True)
-
- @ticket.setter
- def ticket(self, value):
- self._ticket = value
|
Fixed bug that caused exception if deleted ticket was requested from
ticket_event
|
diff --git a/ai/backend/client/cli/__init__.py b/ai/backend/client/cli/__init__.py
index <HASH>..<HASH> 100644
--- a/ai/backend/client/cli/__init__.py
+++ b/ai/backend/client/cli/__init__.py
@@ -44,7 +44,7 @@ def register_command(handler: Callable[[argparse.Namespace], None],
def main():
- colorama.init(strip=True, convert=True)
+ colorama.init()
import ai.backend.client.cli.run # noqa
import ai.backend.client.cli.proxy # noqa
diff --git a/tests/test_pretty.py b/tests/test_pretty.py
index <HASH>..<HASH> 100644
--- a/tests/test_pretty.py
+++ b/tests/test_pretty.py
@@ -9,10 +9,14 @@ def test_pretty_output():
# using "-s" option in pytest and check it manually with your eyes.
pprint = print_pretty
- colorama.init(strip=True, convert=True)
+ colorama.init()
print('normal print')
+ pprint('wow wow wow!')
+ print('just print')
pprint('wow!')
+ pprint('some long loading.... zzzzzzzzzzzzz', status=PrintStatus.WAITING)
+ time.sleep(0.3)
pprint('doing something...', status=PrintStatus.WAITING)
time.sleep(0.3)
pprint('done!', status=PrintStatus.DONE)
|
refs #<I>: Fix broken colors in *NIX envs
* We should just let colorama.init() do whatever it needs.
|
diff --git a/lib/waterline/utils/query/deferred.js b/lib/waterline/utils/query/deferred.js
index <HASH>..<HASH> 100644
--- a/lib/waterline/utils/query/deferred.js
+++ b/lib/waterline/utils/query/deferred.js
@@ -202,10 +202,7 @@ Deferred.prototype.populate = function(keyName, criteria) {
* @returns {Query}
*/
-// TODO: decide on one of these (need feedback)
-Deferred.prototype.with =
-Deferred.prototype.withThese =
-Deferred.prototype.these = function(associatedIds) {
+Deferred.prototype.members = function(associatedIds) {
this._wlQueryInfo.associatedIds = associatedIds;
return this;
};
|
Stick with .members() for now.
|
diff --git a/ontobio/rdfgen/gocamgen/gocam_builder.py b/ontobio/rdfgen/gocamgen/gocam_builder.py
index <HASH>..<HASH> 100644
--- a/ontobio/rdfgen/gocamgen/gocam_builder.py
+++ b/ontobio/rdfgen/gocamgen/gocam_builder.py
@@ -98,10 +98,10 @@ class GoCamBuilder:
GocamgenException(f"Bailing on model for {gene} after {retry_count} retries"))
break # Done with this model. Move on to the next one.
- def make_model_and_add_to_store(self, gene, annotations, modelstate=None):
+ def make_model_and_add_to_store(self, gene, annotations):
return self.make_model(gene, annotations, nquads=True)
- def make_model_and_write_out(self, gene, annotations, output_directory=None, modelstate=None):
+ def make_model_and_write_out(self, gene, annotations, output_directory=None):
return self.make_model(gene, annotations, output_directory=output_directory, nquads=False)
def write_out_store_to_nquads(self, filepath):
|
Removing unnecessary modelstate params
|
diff --git a/pilot.go b/pilot.go
index <HASH>..<HASH> 100644
--- a/pilot.go
+++ b/pilot.go
@@ -183,7 +183,7 @@ func initAutoPilot(svr *server, cfg *autoPilotConfig) (*autopilot.Agent, error)
// We'll launch a goroutine to provide the agent with notifications
// whenever the balance of the wallet changes.
- svr.wg.Add(1)
+ svr.wg.Add(2)
go func() {
defer txnSubscription.Cancel()
defer svr.wg.Done()
@@ -199,7 +199,6 @@ func initAutoPilot(svr *server, cfg *autoPilotConfig) (*autopilot.Agent, error)
}()
go func() {
- defer txnSubscription.Cancel()
defer svr.wg.Done()
for {
|
pilot: avoid cancelling the tx subscription twice, use proper wg value
In this commit we fix a newly introduce bug wherein we would close the
transaction subscription twice on shutdown. This would lead to a
shutdown, but an unclean one as it would panic due to closing a channel
twice.
We fix this my removing a defer statement such that, we’ll only cancel
the subscription once.
|
diff --git a/tests/Psr16/SimpleCacheTest.php b/tests/Psr16/SimpleCacheTest.php
index <HASH>..<HASH> 100644
--- a/tests/Psr16/SimpleCacheTest.php
+++ b/tests/Psr16/SimpleCacheTest.php
@@ -76,7 +76,9 @@ class SimpleCacheTest extends Psr16TestCase
$success = $this->simplecache->set('key2', 'value', new DateInterval('PT1S'));
$this->assertSame(true, $success);
- sleep(2);
+ // sleeping for 2 seconds should do (the 1 second TTL has then passed),
+ // but Couchbase has been observed to to lag slightly at times...
+ sleep(3);
// check both cache & simplecache interface to confirm expire
$this->assertSame(false, $this->cache->get('key'));
|
Wait slightly longer when testing future expiration
|
diff --git a/mbuild/compound.py b/mbuild/compound.py
index <HASH>..<HASH> 100644
--- a/mbuild/compound.py
+++ b/mbuild/compound.py
@@ -192,7 +192,15 @@ class Compound(Part):
self._periodicity = np.array(periods)
def view_hierarchy(self, show_ports=False):
- """View a Compounds hierarchy of compounds as a chart. """
+ """Visualize a compound hierarchy as a tree.
+
+ A tree is constructed from the compound hierarchy with self as the root.
+ The tree is then rendered in a web browser window using D3.js.
+
+ Note
+ ------
+ Portions of this code are adapted from https://gist.github.com/mbostock/4339083.
+ """
try:
import networkx as nx
except ImportError:
@@ -219,10 +227,7 @@ class Compound(Part):
for compound in compound_tree:
node_key = "'{}'".format(compound)
labels[node_key] = '"{} {:d}"'.format(compound, compound_frequency[compound])
- # This code is taken from: https://gist.github.com/mbostock/4339083
- # The directed graph is converted to a json format and manipulated to be
- # correctly displayed
- # The graph is visualized in html by d3.json visualization
+
json_template = json_graph.tree_data(compound_tree, self.kind,
dict(id="name", children="children"))
json_template = str(json_template)
|
updated the docstring of view_hierarchy
|
diff --git a/examples/measure.js b/examples/measure.js
index <HASH>..<HASH> 100644
--- a/examples/measure.js
+++ b/examples/measure.js
@@ -204,7 +204,8 @@ function createHelpTooltip() {
helpTooltip = new ol.Overlay({
element: helpTooltipElement,
offset: [15, 0],
- positioning: 'center-left'
+ positioning: 'center-left',
+ autoPan: false
});
map.addOverlay(helpTooltip);
}
@@ -222,7 +223,8 @@ function createMeasureTooltip() {
measureTooltip = new ol.Overlay({
element: measureTooltipElement,
offset: [0, -15],
- positioning: 'bottom-center'
+ positioning: 'bottom-center',
+ autoPan: false
});
map.addOverlay(measureTooltip);
}
diff --git a/examples/tileutfgrid.js b/examples/tileutfgrid.js
index <HASH>..<HASH> 100644
--- a/examples/tileutfgrid.js
+++ b/examples/tileutfgrid.js
@@ -36,7 +36,8 @@ var nameElement = document.getElementById('country-name');
var infoOverlay = new ol.Overlay({
element: infoElement,
offset: [15, 15],
- stopEvent: false
+ stopEvent: false,
+ autoPan: false
});
map.addOverlay(infoOverlay);
|
Disable autoPan in examples
To avoid that the map is panned when showing
overlays on hover.
|
diff --git a/src/ol/collection.js b/src/ol/collection.js
index <HASH>..<HASH> 100644
--- a/src/ol/collection.js
+++ b/src/ol/collection.js
@@ -76,10 +76,6 @@ ol.CollectionProperty = {
* Collection; they trigger events on the appropriate object, not on the
* Collection as a whole.
*
- * Because a Collection is itself an {@link ol.Object}, it can be bound to any
- * other Object or Collection such that a change in one will automatically be
- * reflected in the other.
- *
* @constructor
* @extends {ol.Object}
* @fires ol.CollectionEvent
|
Remove reference to binding in Collection docs
|
diff --git a/app/view/js/src/obj-datetime.js b/app/view/js/src/obj-datetime.js
index <HASH>..<HASH> 100644
--- a/app/view/js/src/obj-datetime.js
+++ b/app/view/js/src/obj-datetime.js
@@ -85,6 +85,10 @@ bolt.datetimes = function () {
field.date.datepicker(options);
// Bind show button
field.show.click(function () {
+ // Set the date to "today", if nothing has been picked yet.
+ if (!field.date.datepicker('getDate')) {
+ field.date.datepicker('setDate', "+0");
+ }
field.date.datepicker('show');
});
// Bind clear button
|
Default date pickers to "today" if they are empty.
|
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,6 +1,9 @@
require 'rubygems'
+
# Set up gems listed in the Gemfile.
-if File.exist?(File.expand_path('../../Gemfile', __FILE__))
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+if File.exist?(gemfile)
+ ENV['BUNDLE_GEMFILE'] = gemfile
require 'bundler'
Bundler.setup
-end
+end
\ No newline at end of file
|
Allow a Rails application to be initialized from any directory and not just from inside it (ht: Andre Arko).
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.