diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/admin/controllers/Settings.php b/admin/controllers/Settings.php
index <HASH>..<HASH> 100644
--- a/admin/controllers/Settings.php
+++ b/admin/controllers/Settings.php
@@ -101,7 +101,7 @@ class Settings extends BaseAdmin
// --------------------------------------------------------------------------
// Get data
- $this->data['aSettings'] = appSetting(null, Constants::MODULE_SLUG, true);
+ $this->data['aSettings'] = appSetting(null, Constants::MODULE_SLUG, null, true);
// --------------------------------------------------------------------------
|
Fixes for AppSettings
|
diff --git a/integration/integration_suite_test.go b/integration/integration_suite_test.go
index <HASH>..<HASH> 100644
--- a/integration/integration_suite_test.go
+++ b/integration/integration_suite_test.go
@@ -38,7 +38,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
return nil
}, func(_ []byte) {
// Ginkgo Globals
- SetDefaultEventuallyTimeout(3 * time.Second)
+ SetDefaultEventuallyTimeout(5 * time.Second)
// Setup common environment variables
apiURL = os.Getenv("CF_API")
|
change default timeout to 5 seconds for integration tests
|
diff --git a/src/nodeHandler.js b/src/nodeHandler.js
index <HASH>..<HASH> 100644
--- a/src/nodeHandler.js
+++ b/src/nodeHandler.js
@@ -9,7 +9,8 @@ module.exports = function(req, callback){
url: req.url,
method: req.method,
headers: req.headers,
- body: req.body
+ body: req.body,
+ followRedirect: false
}, function(error, res, body){
var response;
if(res){
|
disable automatic redirect handling in node request
|
diff --git a/swagger_parser/swagger_parser.py b/swagger_parser/swagger_parser.py
index <HASH>..<HASH> 100755
--- a/swagger_parser/swagger_parser.py
+++ b/swagger_parser/swagger_parser.py
@@ -27,7 +27,8 @@ class SwaggerParser(object):
paths: dict of path with their actions, parameters, and responses.
"""
- _HTTP_VERBS = {'get', 'put', 'post', 'delete', 'options', 'head', 'patch'}
+ _HTTP_VERBS = set('get', 'put', 'post', 'delete', 'options', 'head',
+ 'patch')
def __init__(self, swagger_path=None, swagger_dict=None, use_example=True):
"""Run parsing from either a file or a dict.
|
fixed syntax issue breaking Python <I>
The `{foo, bar}` syntax for set literals was introduced in Python <I>. This should make the code work again for Python <I>.
|
diff --git a/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java b/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
index <HASH>..<HASH> 100644
--- a/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
+++ b/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
@@ -85,7 +85,7 @@ public class CalendarPeriodCountCalculator implements PeriodCountCalculator<Cale
private int dayDiff(final Calendar start, final Calendar end) {
final long diff = Math.abs(start.getTimeInMillis() - end.getTimeInMillis());
final double dayDiff = ((double) diff) / MILLIS_IN_DAY;
- return (int) (dayDiff);
+ return (int) Math.round(dayDiff);
}
public double monthDiff(final Calendar start, final Calendar end, final PeriodCountBasis basis) {
|
fixed the problem with the <I>/<I> days... on to the standardizing the timezone - local vs. UTC
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ with open(os.path.join(__location__, 'metadata.py'), 'r') as f:
setup(
- name=metadata['name'],
+ name='tableprint',
url=metadata['url'],
version=metadata['version'],
diff --git a/tableprint/metadata.py b/tableprint/metadata.py
index <HASH>..<HASH> 100644
--- a/tableprint/metadata.py
+++ b/tableprint/metadata.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
# Version info
-__name__ = 'tableprint'
-__version__ = '0.6.7'
+__version__ = '0.6.8'
__license__ = 'MIT'
# Project description(s)
|
removing __name__ from metadata
|
diff --git a/src/Zephyrus/Network/RouterEngine.php b/src/Zephyrus/Network/RouterEngine.php
index <HASH>..<HASH> 100644
--- a/src/Zephyrus/Network/RouterEngine.php
+++ b/src/Zephyrus/Network/RouterEngine.php
@@ -44,10 +44,12 @@ abstract class RouterEngine
/**
* Keeps references of request uri and request method
+ *
+ * @param Request $request
*/
- public function __construct()
+ public function __construct(Request $request)
{
- $this->request = RequestFactory::create();
+ $this->request = $request;
$this->requestedUri = $this->request->getPath();
$this->requestedMethod = $this->request->getMethod();
$this->requestedRepresentation = $this->request->getAccept();
|
Injected request dependency to RouterEngine
|
diff --git a/js/reveal.js b/js/reveal.js
index <HASH>..<HASH> 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -977,9 +977,9 @@ var Reveal = (function(){
function resume() {
var wasPaused = dom.wrapper.classList.contains( 'paused' );
+ dom.wrapper.classList.remove( 'paused' );
cueAutoSlide();
- dom.wrapper.classList.remove( 'paused' );
if( wasPaused ) {
dispatchEvent( 'resumed' );
|
bugfix - continue autoslide after resume
|
diff --git a/test_flexidate.py b/test_flexidate.py
index <HASH>..<HASH> 100644
--- a/test_flexidate.py
+++ b/test_flexidate.py
@@ -87,7 +87,6 @@ class TestFlexiDate(object):
def test_isoformat(self):
fd = FlexiDate(2000, 1, 24)
- print(fd.isoformat(True))
assert str(fd.isoformat()) == '2000-01-24'
def test_from_str(self):
@@ -97,7 +96,6 @@ class TestFlexiDate(object):
def dotest2(fd):
out = FlexiDate.from_str("Not a date")
- print(str(out))
assert str(out) == 'None'
fd = FlexiDate(2000, 1, 23)
|
Removing print stmts left in during testing
|
diff --git a/pescador/mux.py b/pescador/mux.py
index <HASH>..<HASH> 100644
--- a/pescador/mux.py
+++ b/pescador/mux.py
@@ -395,13 +395,8 @@ class BaseMux(core.Streamer):
@property
def n_streams(self):
- """Return the number of streamers. Will fail if it's an iterable,
- in which case just return None.
- """
- try:
- return len(self.streamers)
- except TypeError:
- return None
+ """Return the number of streamers."""
+ return len(self.streamers)
def activate(self):
"""Activates the mux as a streamer, choosing which substreams to
|
remove weird check in n_streams that is actually unnecessary
|
diff --git a/LiSE/LiSE/engine.py b/LiSE/LiSE/engine.py
index <HASH>..<HASH> 100644
--- a/LiSE/LiSE/engine.py
+++ b/LiSE/LiSE/engine.py
@@ -803,7 +803,7 @@ class Engine(AbstractEngine, gORM):
for (orig, dest) in self._edges_cache.iter_keys(char, branch, tick):
yield from unhandled_iter(char, orig, dest, branch, tick)
- def _poll_rules(self):
+ def _follow_rules(self):
branch, tick = self.time
charmap = self.character
rulemap = self.rule
|
Rename _poll_rules -> _follow_rules
|
diff --git a/openpnm/algorithms/Reaction.py b/openpnm/algorithms/Reaction.py
index <HASH>..<HASH> 100644
--- a/openpnm/algorithms/Reaction.py
+++ b/openpnm/algorithms/Reaction.py
@@ -16,18 +16,22 @@ class GenericReaction(GenericAlgorithm, ModelsMixin):
self.settings['algorithm'] = algorithm.name
self.settings['quantity'] = algorithm.settings['quantity']
- def apply(self):
+ def apply(self, A=None, b=None):
net = self.simulation.network
Ps = net.map_pores(self['pore._id'])
# Fetch algorithm object from simulation
alg = self.simulation[self.settings['algorithm']]
+ if A is None:
+ A = alg.A
+ if b is None:
+ b = alg.b
quantity = alg.settings['quantity']
x = alg[quantity].copy()
self[quantity] = x[Ps]
# Regenerate models with new guess
self.regenerate_models()
# Add S1 to diagonal of A
- datadiag = alg.A.diagonal()
+ datadiag = A.diagonal()
datadiag[Ps] = datadiag[Ps] + self[self.settings['rate_model']][:, 1]
- alg.A.setdiag(datadiag)
- alg.b[Ps] = alg.b[Ps] - self[self.settings['rate_model']][:, 2]
+ A.setdiag(datadiag)
+ b[Ps] = b[Ps] - self[self.settings['rate_model']][:, 2]
|
Adjust solve to accept A and b
|
diff --git a/public/source/ref.js b/public/source/ref.js
index <HASH>..<HASH> 100644
--- a/public/source/ref.js
+++ b/public/source/ref.js
@@ -43,7 +43,7 @@ var RefViewModel = function(args) {
this.color = args.color;
this.remoteIsAncestor = ko.computed(function() {
if (!self.remoteRef()) return false;
- return self.node().isAncestor(self.remoteRef().node());
+ return self.node() && self.node().isAncestor(self.remoteRef().node());
});
this.remoteIsOffspring = ko.computed(function() {
if (!self.remoteRef()) return false;
|
Require node to check if remote node is ancestor
|
diff --git a/mapsforge-map/src/main/java/org/mapsforge/map/layer/Layer.java b/mapsforge-map/src/main/java/org/mapsforge/map/layer/Layer.java
index <HASH>..<HASH> 100644
--- a/mapsforge-map/src/main/java/org/mapsforge/map/layer/Layer.java
+++ b/mapsforge-map/src/main/java/org/mapsforge/map/layer/Layer.java
@@ -1,6 +1,7 @@
/*
* Copyright 2010, 2011, 2012, 2013 mapsforge.org
* Copyright 2014 Ludwig M Brinckmann
+ * Copyright 2015 devemux86
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -124,6 +125,8 @@ public abstract class Layer {
*/
public final void setVisible(boolean visible) {
this.visible = visible;
+
+ requestRedraw();
}
/**
|
Layer: request redraw on visibility change
|
diff --git a/src/__tests__/util/helpers.js b/src/__tests__/util/helpers.js
index <HASH>..<HASH> 100644
--- a/src/__tests__/util/helpers.js
+++ b/src/__tests__/util/helpers.js
@@ -19,7 +19,7 @@ export let test = (spec, input, callback) => {
}
ava(`${spec} (toString)`, t => {
- t.same(result, input);
+ t.deepEqual(result, input);
});
};
|
Update helpers file for AVA <I>.
|
diff --git a/lxd/storage/backend_lxd.go b/lxd/storage/backend_lxd.go
index <HASH>..<HASH> 100644
--- a/lxd/storage/backend_lxd.go
+++ b/lxd/storage/backend_lxd.go
@@ -3884,7 +3884,7 @@ func (b *lxdBackend) ImportCustomVolume(projectName string, poolVol *backup.Conf
// Create the storage volume DB records.
err := VolumeDBCreate(b, projectName, poolVol.Volume.Name, poolVol.Volume.Description, drivers.VolumeTypeCustom, false, volumeConfig, time.Time{}, drivers.ContentType(poolVol.Volume.ContentType))
if err != nil {
- return fmt.Errorf("Failed creating custom volume %q record in project %q: %w", poolVol.Volume.Name, projectName, err)
+ return err
}
revert.Add(func() { VolumeDBDelete(b, projectName, poolVol.Volume.Name, drivers.VolumeTypeCustom) })
|
lxd/storage/backend/lxd: No need to wrap errors from VolumeDBCreate
|
diff --git a/fedmsg/commands/relay.py b/fedmsg/commands/relay.py
index <HASH>..<HASH> 100644
--- a/fedmsg/commands/relay.py
+++ b/fedmsg/commands/relay.py
@@ -68,6 +68,8 @@ class RelayCommand(BaseCommand):
options=self.config,
# Only run this *one* consumer
consumers=[RelayConsumer],
+ # And no producers.
+ producers=[],
# Tell moksha to quiet its logging.
framework=False,
)
|
Fedmsg-relay shouldn't run producers.
If another package happens to be installed in the system, running
`fedmsg-relay` shouldn't inadvertently start that thing.
|
diff --git a/tasks/client.js b/tasks/client.js
index <HASH>..<HASH> 100644
--- a/tasks/client.js
+++ b/tasks/client.js
@@ -159,6 +159,24 @@ module.exports = function (gulp, config) {
port: config.staticServer.port,
root: config.build.distPath
});
+
+ if (process.env.SERVE_HTTPS === 'true') {
+ var fs = require('fs');
+
+ var httpsOptions = true;
+ if (process.env.HTTPS_KEY && process.env.HTTPS_CERT) {
+ httpsOptions = {
+ key: fs.readFileSync(process.env.HTTPS_KEY),
+ cert: fs.readFileSync(process.env.HTTPS_CERT)
+ }
+ }
+
+ connect.server({
+ port: config.staticServer.port + 10000,
+ root: config.build.distPath,
+ https: httpsOptions
+ });
+ }
},
reloadStaticServer: function() {
|
feat(https): support serving assets on HTTPS
|
diff --git a/lib/Local.js b/lib/Local.js
index <HASH>..<HASH> 100644
--- a/lib/Local.js
+++ b/lib/Local.js
@@ -40,7 +40,7 @@ function Local(){
callback(new LocalError('No output received'));
if(data['state'] != 'connected'){
- callback(new LocalError(data['message']));
+ callback(new LocalError(data['message']['message']));
} else {
that.pid = data['pid'];
callback();
|
Instead of taking the message object, just take message
The message field is again an object that contains a message.
In order to receive the text, take that.
|
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index <HASH>..<HASH> 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -51,7 +51,6 @@ $string['autosubscribeyes'] = "Yes: when I post, subscribe me to that forum";
$string['availability'] = "Availability";
$string['availablecourses'] = "Available Courses";
$string['backup'] = "Backup";
-$string['backupdir'] = "backupdata";
$string['backupdate'] = "Backup Date";
$string['backupdetails'] = "Backup Details";
$string['backupfilename'] = "backup";
|
Take out backupdir string due to some backup
detected problems related to it.
|
diff --git a/lib/params.js b/lib/params.js
index <HASH>..<HASH> 100644
--- a/lib/params.js
+++ b/lib/params.js
@@ -54,13 +54,11 @@ define(function(require, exports, module) {
param: function(def, name, source) {
var param = def;
- source = source || 'url';
-
+
// Singe edge case for implicit param generation from the url pathparts,
// where the pathpart is not defined in params definition.
if (typeof def === 'string' && !name) {
return {
- name: def,
source: 'url',
optional: false,
type: BuiltinTypes.get('string'),
@@ -75,18 +73,15 @@ define(function(require, exports, module) {
}
param.optional = !!param.optional;
- param.source = param.source || source;
+ param.source = param.source || source || "body";
+ param.type = param.type || "string";
// allow regular expressions as types
if (param.type instanceof RegExp)
param.type = new RegExpType(param.type);
- if (param.source == "body")
- param.type = param.type || "json";
-
- param.type = param.type || "string";
-
- if (!/^body|url|query$/.test(param.source)) {
+
+ if ( !/^body|url|query$/.test(param.source)) {
throw new Error("parameter source muste be 'url', 'query' or 'body'");
}
|
default source is now body, simplified thigns
|
diff --git a/src/gogoutils/parser.py b/src/gogoutils/parser.py
index <HASH>..<HASH> 100644
--- a/src/gogoutils/parser.py
+++ b/src/gogoutils/parser.py
@@ -4,10 +4,18 @@ except ImportError:
from urlparse import urlparse
+class ParserError(Exception):
+ pass
+
+
class Parser(object):
"""A Parser for urls"""
def __init__(self, url):
+
+ if not url:
+ error = 'url may not be "None" or empty'
+ raise ParserError(error)
self.url = url.lower()
def parse_url(self):
diff --git a/tests/test_parser.py b/tests/test_parser.py
index <HASH>..<HASH> 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -1,4 +1,5 @@
-from gogoutils.parser import Parser
+import pytest
+from gogoutils.parser import Parser, ParserError
def test_parser_url():
@@ -26,3 +27,14 @@ def test_parser_url():
project, repo = Parser(url).parse_url()
assert project == 'gogoair'
assert repo == 'test'
+
+
+def test_empty_params():
+ urls = [
+ None,
+ '',
+ ]
+
+ for url in urls:
+ with pytest.raises(ParserError):
+ g = Parser(url)
|
Ensure an url is passed to Parser
|
diff --git a/test/buffer.js b/test/buffer.js
index <HASH>..<HASH> 100644
--- a/test/buffer.js
+++ b/test/buffer.js
@@ -16,7 +16,7 @@ module.exports = function runBufferTestSuite() {
statsd = null;
});
- ['main client', /*'child client', 'child of child client'*/].forEach(function (description, index) {
+ ['main client', 'child client', 'child of child client'].forEach(function (description, index) {
describe(description, function () {
describe('UDP', function () {
it('should aggregate packets when maxBufferSize is set to non-zero', function (done) {
|
Uncomment multiple clients in test/buffer.js
|
diff --git a/src/cryptojwt/key_bundle.py b/src/cryptojwt/key_bundle.py
index <HASH>..<HASH> 100755
--- a/src/cryptojwt/key_bundle.py
+++ b/src/cryptojwt/key_bundle.py
@@ -208,7 +208,8 @@ class KeyBundle(object):
except JWKException as err:
logger.warning('While loading keys: {}'.format(err))
else:
- self._keys.append(_key)
+ if _key not in self._keys:
+ self._keys.append(_key)
flag = 1
break
if not flag:
|
Don't add keys that are already there.
|
diff --git a/lib/MissMatch.js b/lib/MissMatch.js
index <HASH>..<HASH> 100644
--- a/lib/MissMatch.js
+++ b/lib/MissMatch.js
@@ -45,18 +45,10 @@ mm.makeParser = function (src) {
*/
function validChar(c) {
var code = c.charCodeAt(0);
- return (code >= 65 && code <= 90) || (code >= 97 && code <= 122);
- }
-
- /**
- * Match valid JS object property names. Like variable names
- * this is incomplete.
- * TODO: A better validation has to be found.
- */
- function validProp(c) {
- return validChar(c)
- || (c === '_')
- || ((c.charCodeAt(0) >= 47) && (c.charCodeAt(0) <= 57));
+ return (code >= 65 && code <= 90)
+ || (code >= 97 && code <= 122)
+ || (code === 95) // '_'
+ || (code === 36) // '$'
}
/**
@@ -211,7 +203,7 @@ mm.makeParser = function (src) {
consume(); // '.'
var name = [], property;
- while(validProp(peek())) {
+ while(validChar(peek())) {
name.push(next());
}
|
allow _ and $ in variable names
|
diff --git a/autolens/autofit/non_linear.py b/autolens/autofit/non_linear.py
index <HASH>..<HASH> 100644
--- a/autolens/autofit/non_linear.py
+++ b/autolens/autofit/non_linear.py
@@ -63,9 +63,7 @@ class NonLinearOptimizer(object):
if name is None:
name = ""
- self.path = "{}/{}".format(conf.instance.output_path, name)
- if not os.path.exists(self.path):
- os.makedirs(self.path)
+ self.path = link.make_linked_folder("{}/{}".format(conf.instance.output_path, name))
self.chains_path = "{}/{}".format(self.path, 'chains')
if not os.path.exists(self.chains_path):
os.makedirs(self.chains_path)
@@ -335,7 +333,7 @@ class MultiNest(NonLinearOptimizer):
logger.info("Running MultiNest...")
self.run(fitness_function.__call__, prior, self.variable.total_priors,
- outputfiles_basename="{}/mn".format(link.make_linked_folder(self.chains_path)),
+ outputfiles_basename="{}/mn".format(self.chains_path),
n_live_points=self.n_live_points,
const_efficiency_mode=self.const_efficiency_mode,
importance_nested_sampling=self.importance_nested_sampling,
|
link wrapping whole multinest folder (fixes integration test but causes bugs in non_linear
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -34,8 +34,6 @@ function validateQuery(query) {
}
module.exports = function(source) {
- this.cacheable && this.cacheable();
-
var query = utils.parseQuery(this.query);
validateQuery(query);
var prefix = escapeStringRegexp(query.prefix || '{{');
diff --git a/test/test.js b/test/test.js
index <HASH>..<HASH> 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,14 +1,6 @@
import test from 'ava';
import loader from '../index.js';
-test('calls cacheable', t => {
- t.plan(1);
- const context = {
- cacheable: () => t.pass()
- };
- loader.call(context, '');
-});
-
test('basic usage', t => {
t.is(
loader.call({}, '{{anotherLoader!hi.js}}'),
|
no need to call cacheable() in webpack 2
|
diff --git a/pyzotero/zotero.py b/pyzotero/zotero.py
index <HASH>..<HASH> 100644
--- a/pyzotero/zotero.py
+++ b/pyzotero/zotero.py
@@ -669,9 +669,9 @@ class Zotero(object):
"""
verify(payload)
if not parentid:
- liblevel = '/users/{u}/items?key={k}'
+ liblevel = '/{t}/{u}/items?key={k}'
else:
- liblevel = '/users/{u}/items/{i}/children?key={k}'
+ liblevel = '/{t}/{u}/items/{i}/children?key={k}'
# Create one or more new attachments
headers = {
'X-Zotero-Write-Token': token(),
@@ -682,6 +682,7 @@ class Zotero(object):
req = requests.post(
url=self.endpoint
+ liblevel.format(
+ t=self.library_type,
u=self.library_id,
i=parentid,
k=self.api_key),
|
Use group type when creating attachments
Closes #<I>
|
diff --git a/holoviews/core/io.py b/holoviews/core/io.py
index <HASH>..<HASH> 100644
--- a/holoviews/core/io.py
+++ b/holoviews/core/io.py
@@ -31,12 +31,12 @@ from .options import Store
from .util import unique_iterator, group_sanitizer, label_sanitizer
-def sanitizer(name, replacements={':':'_', '/':'_', '\\':'_'}):
+def sanitizer(name, replacements=[(':','_'), ('/','_'), ('\\','_')]):
"""
String sanitizer to avoid problematic characters in filenames.
"""
- for k,v in replacements.items():
- name = name.replace(k,v)
+ for old,new in replacements:
+ name = name.replace(old,new)
return name
|
Fixed replacements ordering in core.io.sanitizer
|
diff --git a/spacy/tests/matcher/test_matcher_bugfixes.py b/spacy/tests/matcher/test_matcher_bugfixes.py
index <HASH>..<HASH> 100644
--- a/spacy/tests/matcher/test_matcher_bugfixes.py
+++ b/spacy/tests/matcher/test_matcher_bugfixes.py
@@ -113,7 +113,6 @@ def test_ner_interaction(EN):
doc = EN.tokenizer(u'get me a flight from SFO to LAX leaving 20 December and arriving on January 5th')
EN.tagger(doc)
EN.matcher(doc)
- EN.entity.add_label('AIRPORT')
EN.entity(doc)
ents = [(ent.label_, ent.text) for ent in doc.ents]
|
* Require user-custom NER classes to work without adding the label.
|
diff --git a/docs/source/conf.py b/docs/source/conf.py
index <HASH>..<HASH> 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -56,7 +56,7 @@ author = u'Conor Svensson'
# The short X.Y version.
version = u'3.0'
# The full version, including alpha/beta/rc tags.
-release = u'3.0.0'
+release = u'3.0.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
|
Updated version in conf.py.
|
diff --git a/packages/openneuro-server/graphql/resolvers/dataset.js b/packages/openneuro-server/graphql/resolvers/dataset.js
index <HASH>..<HASH> 100644
--- a/packages/openneuro-server/graphql/resolvers/dataset.js
+++ b/packages/openneuro-server/graphql/resolvers/dataset.js
@@ -34,13 +34,13 @@ export const datasetName = obj => {
if (results) {
// Return the latest snapshot name
const sortedSnapshots = results.sort(snapshotCreationComparison)
- return description(null, {
+ return description(obj, {
datasetId: obj.id,
revision: sortedSnapshots[0].hexsha,
}).then(desc => desc.Name)
} else if (obj.revision) {
// Return the draft name or null
- description(null, {
+ description(obj, {
datasetId: obj.id,
revision: obj.revision,
}).then(desc => desc.Name)
|
Include parent object in datasetName description call.
|
diff --git a/src/main/java/org/dbflute/jetty/JettyBoot.java b/src/main/java/org/dbflute/jetty/JettyBoot.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/dbflute/jetty/JettyBoot.java
+++ b/src/main/java/org/dbflute/jetty/JettyBoot.java
@@ -522,6 +522,9 @@ public class JettyBoot {
// -----------------------------------------------------
// Classpath Jar
// -------------
+ // cannot use web-fragment and meta-inf as default
+ // because jetty does not see classpath jar resources
+ // so manually enable it
protected void setupClasspathJarResourceIfNeeds(WebAppContext context) {
if (isWarableWorld() || !isValidMetaInfConfiguration()) {
return;
|
comment about 'cannot use web-fragment and meta-inf as default...'
|
diff --git a/js/gateio.js b/js/gateio.js
index <HASH>..<HASH> 100644
--- a/js/gateio.js
+++ b/js/gateio.js
@@ -277,7 +277,7 @@ module.exports = class gateio extends Exchange {
let address = undefined;
if ('addr' in response)
address = this.safeString (response, 'addr');
- if ((typeof address !== 'undefined') && (address.indexOf ('address') > 0))
+ if ((typeof address !== 'undefined') && (address.indexOf ('address') >= 0))
throw new InvalidAddress (this.id + ' queryDepositAddress ' + address);
return {
'currency': currency,
|
made transpiler happy #<I>
|
diff --git a/tests/integration/test_tornado.py b/tests/integration/test_tornado.py
index <HASH>..<HASH> 100644
--- a/tests/integration/test_tornado.py
+++ b/tests/integration/test_tornado.py
@@ -283,4 +283,4 @@ def test_tornado_with_decorator_use_cassette(get_client):
response = yield get_client().fetch(
http.HTTPRequest('http://www.google.com/', method='GET')
)
- assert response.body == "not actually google"
+ assert response.body.decode('utf-8') == "not actually google"
|
Fix tornado python3 tests.
|
diff --git a/device_state.go b/device_state.go
index <HASH>..<HASH> 100644
--- a/device_state.go
+++ b/device_state.go
@@ -12,15 +12,17 @@ type DeviceState int8
const (
StateInvalid DeviceState = iota
+ StateUnauthorized
StateDisconnected
StateOffline
StateOnline
)
var deviceStateStrings = map[string]DeviceState{
- "": StateDisconnected,
- "offline": StateOffline,
- "device": StateOnline,
+ "": StateDisconnected,
+ "offline": StateOffline,
+ "device": StateOnline,
+ "unauthorized": StateUnauthorized,
}
func parseDeviceState(str string) (DeviceState, error) {
diff --git a/devicestate_string.go b/devicestate_string.go
index <HASH>..<HASH> 100644
--- a/devicestate_string.go
+++ b/devicestate_string.go
@@ -4,9 +4,9 @@ package adb
import "fmt"
-const _DeviceState_name = "StateInvalidStateDisconnectedStateOfflineStateOnline"
+const _DeviceState_name = "StateInvalidStateUnauthorizedStateDisconnectedStateOfflineStateOnline"
-var _DeviceState_index = [...]uint8{0, 12, 29, 41, 52}
+var _DeviceState_index = [...]uint8{0, 12, 29, 46, 58, 69}
func (i DeviceState) String() string {
if i < 0 || i >= DeviceState(len(_DeviceState_index)-1) {
|
Pr state unauthorized (#<I>)
Support parsing unauthorized state.
Includes a few fixes for Windows support as well:
* Adds conditional build files for `unix.Access`.
* Renames files for platform specific `isExecutable()`.
|
diff --git a/src/main/java/com/github/seratch/jslack/api/model/Attachment.java b/src/main/java/com/github/seratch/jslack/api/model/Attachment.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/github/seratch/jslack/api/model/Attachment.java
+++ b/src/main/java/com/github/seratch/jslack/api/model/Attachment.java
@@ -128,7 +128,7 @@ public class Attachment {
* <p>
* Use ts when referencing articles or happenings. Your message will have its own timestamp when published.
*/
- private Integer ts;
+ private String ts;
/**
* By default,
|
'ts' -- should be a String (#<I>)
'ts' values are more or less like --> <I>
which is not an integer. So changing it to String instead of Integer --> keeping it consistent with the 'ts' attribute in the 'message' model
|
diff --git a/pymongo/cursor.py b/pymongo/cursor.py
index <HASH>..<HASH> 100644
--- a/pymongo/cursor.py
+++ b/pymongo/cursor.py
@@ -133,9 +133,9 @@ class Cursor(object):
def __query_spec(self):
"""Get the spec to use for a query.
"""
- if self.__is_command or "$query" in self.__spec:
- return self.__spec
- spec = SON({"$query": self.__spec})
+ spec = self.__spec
+ if not self.__is_command and "$query" not in self.__spec:
+ spec = SON({"$query": self.__spec})
if self.__ordering:
spec["$orderby"] = self.__ordering
if self.__explain:
|
support adding additional special query options automatically, even if we've already specified some manually
|
diff --git a/lib/commons/dom/is-offscreen.js b/lib/commons/dom/is-offscreen.js
index <HASH>..<HASH> 100644
--- a/lib/commons/dom/is-offscreen.js
+++ b/lib/commons/dom/is-offscreen.js
@@ -13,6 +13,11 @@ dom.isOffscreen = function (element) {
if (coords.bottom < 0) {
return true;
}
+
+ if (coords.left === 0 && coords.right === 0) {
+ //This is an edge case, an empty (zero-width) element that isn't positioned 'off screen'.
+ return false;
+ }
if (dir === 'ltr') {
if (coords.right <= 0) {
|
Handle the edge case of a zero width element with a right bound of 0
This was causing some tests to fail
|
diff --git a/skyfield/tests/test_keplerlib.py b/skyfield/tests/test_keplerlib.py
index <HASH>..<HASH> 100644
--- a/skyfield/tests/test_keplerlib.py
+++ b/skyfield/tests/test_keplerlib.py
@@ -57,7 +57,7 @@ def test_comet():
b' 283.3593 88.9908 20200224 -2.0 4.0 C/1995 O1 (Hale-Bopp)'
b' MPC106342\n')
df = load_comets_dataframe(BytesIO(text))
- row = df.ix[0]
+ row = df.iloc[0]
ts = load.timescale(builtin=True)
eph = load('de421.bsp')
|
Switch test away from deprecated ".ix", to fix CI
|
diff --git a/src/Environment.php b/src/Environment.php
index <HASH>..<HASH> 100644
--- a/src/Environment.php
+++ b/src/Environment.php
@@ -92,8 +92,7 @@ class Environment
self::purge(TEMP_DIR);
register_shutdown_function(function () {
- self::purge(TMP_DIR);
- @rmdir(TMP_DIR);
+ self::rmdir(TEMP_DIR);
});
}
@@ -170,6 +169,17 @@ class Environment
* @param string $dir
* @return void
*/
+ public static function rmdir($dir)
+ {
+ if (!is_dir($dir)) return;
+ self::purge($dir);
+ @rmdir($dir);
+ }
+
+ /**
+ * @param string $dir
+ * @return void
+ */
private static function purge($dir)
{
THelpers::purge($dir);
|
Environment: cleanup only TEMP_DIR (single test-case)
|
diff --git a/master/buildbot/util/deferwaiter.py b/master/buildbot/util/deferwaiter.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/util/deferwaiter.py
+++ b/master/buildbot/util/deferwaiter.py
@@ -37,6 +37,7 @@ class DeferWaiter:
self._waited.add(id(d))
d.addBoth(self._finished, d)
+ return d
@defer.inlineCallbacks
def wait(self):
|
util: Return added Deferred from DeferWaiter.add()
|
diff --git a/src/test/java/hex/DeepLearningProstateTest.java b/src/test/java/hex/DeepLearningProstateTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/hex/DeepLearningProstateTest.java
+++ b/src/test/java/hex/DeepLearningProstateTest.java
@@ -147,6 +147,7 @@ public class DeepLearningProstateTest extends TestUtil {
}
model1 = UKV.get(dest_tmp);
+ Assert.assertTrue(p.train_samples_per_iteration <= 0 || model1.epoch_counter > epochs || Math.abs(model1.epoch_counter - epochs)/epochs < 0.1);
if (n_folds != 0)
// test HTML of cv models
|
Add assertion that the number of training rows is correct.
|
diff --git a/pkg/volume/downwardapi/downwardapi_test.go b/pkg/volume/downwardapi/downwardapi_test.go
index <HASH>..<HASH> 100644
--- a/pkg/volume/downwardapi/downwardapi_test.go
+++ b/pkg/volume/downwardapi/downwardapi_test.go
@@ -33,12 +33,12 @@ import (
const basePath = "/tmp/fake"
-func formatMap(m map[string]string) string {
- var l string
+func formatMap(m map[string]string) (fmtstr string) {
for key, value := range m {
- l += key + "=" + fmt.Sprintf("%q", value) + "\n"
+ fmtstr += fmt.Sprintf("%v=%q\n", key, value)
}
- return l
+
+ return
}
func newTestHost(t *testing.T, client client.Interface) volume.VolumeHost {
|
Refactor helper method in api/volume/downwardapi
|
diff --git a/src/edu/rpi/sss/util/servlets/HttpServletUtils.java b/src/edu/rpi/sss/util/servlets/HttpServletUtils.java
index <HASH>..<HASH> 100644
--- a/src/edu/rpi/sss/util/servlets/HttpServletUtils.java
+++ b/src/edu/rpi/sss/util/servlets/HttpServletUtils.java
@@ -150,10 +150,16 @@ public class HttpServletUtils {
}
try {
- return request.getRequestURL().toString();
+ StringBuffer sb = request.getRequestURL();
+ if (sb != null) {
+ return sb.toString();
+ }
+
+ // Presumably portlet - see what happens with uri
+ return request.getRequestURI();
} catch (Throwable t) {
Logger.getLogger(HttpServletUtils.class).warn(
- "Unable to get url from " + request);
+ "Unable to get url from " + request, t);
return "BogusURL.this.is.probably.a.portal";
}
}
|
To build bedework after this update will require ant-contrib.jar to be added to apache-ant-<I>/lib
This will be done in the preview quickstart
Upgraded portlet support. Managed to display the user calendar in liferay4.
Made much more of the portlet support common. Moved many config settings into the properties file.
Some changes still needed
Moved portlet stylesheets into common portlet directory
|
diff --git a/client_test.go b/client_test.go
index <HASH>..<HASH> 100644
--- a/client_test.go
+++ b/client_test.go
@@ -498,7 +498,6 @@ func BenchmarkAddLargeTorrent(b *testing.B) {
cfg := TestingConfig()
cfg.DisableTCP = true
cfg.DisableUTP = true
- cfg.ListenHost = func(string) string { return "redonk" }
cl, err := NewClient(cfg)
require.NoError(b, err)
defer cl.Close()
|
Fix benchmark broken by changes to client listeners
|
diff --git a/jax/lax.py b/jax/lax.py
index <HASH>..<HASH> 100644
--- a/jax/lax.py
+++ b/jax/lax.py
@@ -841,13 +841,10 @@ class _OpaqueParam(object):
"""Wrapper that hashes on its identity, instead of its contents.
Used to pass unhashable parameters as primitive attributes."""
- __slots__ = ["val", "id"]
+ __slots__ = ["val"]
+
def __init__(self, val):
self.val = val
- self.id = next(_opaque_param_ids)
- def __hash__(self):
- return self.id
-_opaque_param_ids = itertools.count()
def while_loop(cond_fun, body_fun, init_val):
|
Simplify definition of _OpaqueParam to use object identity for hashing/equality.
|
diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb
index <HASH>..<HASH> 100644
--- a/plugins/guests/debian/cap/configure_networks.rb
+++ b/plugins/guests/debian/cap/configure_networks.rb
@@ -42,7 +42,10 @@ module VagrantPlugins
# each specifically, we avoid reconfiguring eth0 (the NAT interface) so
# SSH never dies.
interfaces.each do |interface|
- comm.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
+ # Ubuntu 16.04+ returns an error when downing an interface that
+ # does not exist. The `|| true` preserves the behavior that older
+ # Ubuntu versions exhibit and Vagrant expects (GH-7155)
+ comm.sudo("/sbin/ifdown eth#{interface} 2> /dev/null || true")
comm.sudo("/sbin/ip addr flush dev eth#{interface} 2> /dev/null")
end
|
Do not return an error if ifdown fails
Ubuntu versions prior to <I> always returned a successful exit status,
even if one tried to down an interface that does not exist. This
behavior changed in Ubuntu <I> to return an error. This commit
preserves the old behavior.
Fixes GH-<I>
|
diff --git a/ddmrp_history/models/stock_buffer.py b/ddmrp_history/models/stock_buffer.py
index <HASH>..<HASH> 100644
--- a/ddmrp_history/models/stock_buffer.py
+++ b/ddmrp_history/models/stock_buffer.py
@@ -54,7 +54,7 @@ class StockBuffer(models.Model):
"top_of_yellow": self.top_of_yellow,
"top_of_green": self.top_of_green,
"net_flow_position": self.net_flow_position,
- "on_hand_position": self.product_location_qty,
+ "on_hand_position": self.product_location_qty_available_not_res,
"adu": self.adu,
}
return data
|
[<I>][FIX] ddmrp_history: record not reserved on-hand qty
|
diff --git a/sendRequest.js b/sendRequest.js
index <HASH>..<HASH> 100644
--- a/sendRequest.js
+++ b/sendRequest.js
@@ -13,7 +13,9 @@
var http = require('http');
var defer = function () {
- var promise = (global.protractor ? protractor.promise : Q);
+ var promise = (global.protractor && protractor.promise.USE_PROMISE_MANAGER !== false)
+ ? protractor.promise
+ : Q;
var deferred = promise.defer();
if (deferred.fulfill && !deferred.resolve) {
|
Do not use protractor promise if promise manager is disabled
|
diff --git a/client/js/util.js b/client/js/util.js
index <HASH>..<HASH> 100644
--- a/client/js/util.js
+++ b/client/js/util.js
@@ -154,7 +154,7 @@ qq.log = function(message, level) {
qq.isObject = function(variable) {
"use strict";
- return Object.prototype.toString.call(variable) === '[object Object]';
+ return variable && !variable.nodeType && Object.prototype.toString.call(variable) === '[object Object]';
};
qq.isFunction = function(variable) {
|
fixes #<I> - Fix uploader freeze during init in IE8 or older
|
diff --git a/buildbot/status/web/console.py b/buildbot/status/web/console.py
index <HASH>..<HASH> 100755
--- a/buildbot/status/web/console.py
+++ b/buildbot/status/web/console.py
@@ -315,7 +315,7 @@ class ConsoleStatusResource(HtmlResource):
return builds
def getChangeForBuild(self, build, revision):
- if not build.getChanges(): # Forced build
+ if not build or not build.getChanges(): # Forced build
devBuild = DevBuild(revision, build.getResults(),
build.getNumber(),
build.isFinished(),
|
Don't fail if getChangeForBuild gets None for a build
I'm not sure why this would happen, but this change should prevent it
from crashing. Fixes #<I>, hopefully.
|
diff --git a/lib/config/config-initializer.js b/lib/config/config-initializer.js
index <HASH>..<HASH> 100644
--- a/lib/config/config-initializer.js
+++ b/lib/config/config-initializer.js
@@ -305,7 +305,7 @@ function promptUser(callback) {
type: "list",
name: "styleguide",
message: "Which style guide do you want to follow?",
- choices: [{name: "Google", value: "google"}, {name: "AirBnB", value: "airbnb"}, {name: "Standard", value: "standard"}],
+ choices: [{name: "Google", value: "google"}, {name: "Airbnb", value: "airbnb"}, {name: "Standard", value: "standard"}],
when(answers) {
answers.packageJsonExists = npmUtil.checkPackageJson();
return answers.source === "guide" && answers.packageJsonExists;
|
Fix: rename "AirBnB" => "Airbnb" init choice (fixes #<I>)
This renames the config initializer choice name from `AirBnB` to the preferred spelling of `Airbnb`
|
diff --git a/src/elements/db/SuperTableBlockQuery.php b/src/elements/db/SuperTableBlockQuery.php
index <HASH>..<HASH> 100644
--- a/src/elements/db/SuperTableBlockQuery.php
+++ b/src/elements/db/SuperTableBlockQuery.php
@@ -96,9 +96,13 @@ class SuperTableBlockQuery extends ElementQuery
*/
public function __call($name, $params)
{
- // Handle calling methods a Static Super Table field - `{{ superTable.getFieldLayout().fields }}`
+ // Handle calling methods via a Static Super Table field - `{{ superTable.getFieldLayout().fields }}`
if (is_string($name)) {
- return $this->one()->$name($params) ?? null;
+ $block = $this->one() ?? null;
+
+ if ($block && method_exists($block, $name)) {
+ return $block->$name($params) ?? null;
+ }
}
return parent::__call($name, $params);
|
Fix being unable to query ST fields directly
|
diff --git a/lib/freetype/c.rb b/lib/freetype/c.rb
index <HASH>..<HASH> 100644
--- a/lib/freetype/c.rb
+++ b/lib/freetype/c.rb
@@ -211,6 +211,19 @@ module FreeType
charmap: :pointer
end
+ class << self
+ module LazyAttach
+ def attach_function(name, func, args, returns = nil, options = nil)
+ super
+ rescue FFI::NotFoundError
+ define_method(name) do |*|
+ raise NotImplementedError, "`#{name}' is not implemented in this system"
+ end
+ end
+ end
+ prepend LazyAttach
+ end
+
# library = FFI::MemoryPointer.new(:pointer)
# err = FT_Init_FreeType(library)
# err = FT_Done_Library(library.get_pointer(0))
|
Lazy Attach when target function is not defined
|
diff --git a/autogen/config.js b/autogen/config.js
index <HASH>..<HASH> 100644
--- a/autogen/config.js
+++ b/autogen/config.js
@@ -80,6 +80,9 @@ exports.extraLiquidFilters = {
json_stringify: function(value) {
return JSON.stringify(value);
},
+ trim: function(value) {
+ return value.trim();
+ },
//evaluates expression as JavaScript in the given context
eval: function (expression, context) {
var vm = require('vm');
|
Add trim filter in autogen config
|
diff --git a/src/components/button/index.js b/src/components/button/index.js
index <HASH>..<HASH> 100644
--- a/src/components/button/index.js
+++ b/src/components/button/index.js
@@ -22,6 +22,10 @@ export default class Button extends BaseComponent {
*/
iconSource: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
/**
+ * Icon image style
+ */
+ iconStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
+ /**
* Color of the button background
*/
backgroundColor: PropTypes.string,
@@ -95,7 +99,7 @@ export default class Button extends BaseComponent {
}
renderIcon() {
- const {iconSource, label, link, disabled} = this.props;
+ const {iconSource, iconStyle, label, link, disabled} = this.props;
if (iconSource) {
return (
<Image
@@ -104,6 +108,7 @@ export default class Button extends BaseComponent {
this.styles.icon,
(link && disabled) && this.styles.iconDisabled,
label && this.styles.iconSpacing,
+ iconStyle,
]}
/>);
}
|
allow to custom style the icon in button component
|
diff --git a/SUFIA_VERSION b/SUFIA_VERSION
index <HASH>..<HASH> 100644
--- a/SUFIA_VERSION
+++ b/SUFIA_VERSION
@@ -1 +1 @@
-3.5.0
+3.6.0
diff --git a/lib/sufia/version.rb b/lib/sufia/version.rb
index <HASH>..<HASH> 100644
--- a/lib/sufia/version.rb
+++ b/lib/sufia/version.rb
@@ -1,3 +1,3 @@
module Sufia
- VERSION = "3.5.0"
+ VERSION = "3.6.0"
end
diff --git a/sufia-models/lib/sufia/models/version.rb b/sufia-models/lib/sufia/models/version.rb
index <HASH>..<HASH> 100644
--- a/sufia-models/lib/sufia/models/version.rb
+++ b/sufia-models/lib/sufia/models/version.rb
@@ -1,5 +1,5 @@
module Sufia
module Models
- VERSION = "3.5.0"
+ VERSION = "3.6.0"
end
end
|
Preparing for <I> release
|
diff --git a/src/core/plugins/configure/validateConfig.js b/src/core/plugins/configure/validateConfig.js
index <HASH>..<HASH> 100644
--- a/src/core/plugins/configure/validateConfig.js
+++ b/src/core/plugins/configure/validateConfig.js
@@ -42,6 +42,12 @@ function validateCommand(command) {
}
function validateConfig(schema, config) {
+ // ajv caches schemas by their ids effectively preventing us from using
+ // multiple instances of appache with a single instance of ajv, so we bust
+ // the cache on every config validation as a workaround.
+ // TODO: we should use an ajv instance per appache instance and only clear
+ // the cache when the schema changes
+ ajv.removeSchema()
let isValid = ajv.validate(schema, config)
if (!isValid) {
|
Avoid ajv caching to allow multiple appache instances
|
diff --git a/resources/lang/de-DE/cachet.php b/resources/lang/de-DE/cachet.php
index <HASH>..<HASH> 100644
--- a/resources/lang/de-DE/cachet.php
+++ b/resources/lang/de-DE/cachet.php
@@ -121,8 +121,8 @@ return [
'meta' => [
'description' => [
'incident' => 'Details and updates about the :name incident that occurred on :date',
- 'schedule' => 'Details about the scheduled maintenance period :name starting :startDate',
- 'subscribe' => 'Subscribe to :app in order to receive updates of incidents and scheduled maintenance periods',
+ 'schedule' => 'Details zu den geplanten Wartungszeitraum :name Beginn ab :startDate',
+ 'subscribe' => 'Abonniere :app um Updates von Vorfällen und geplanten Wartungszeiten zu erhalten',
'overview' => 'Bleiben sie auf dem Laufenden mit den neuesten Service-Updates von :app.',
],
],
|
New translations cachet.php (German)
|
diff --git a/bokeh/bbmodel.py b/bokeh/bbmodel.py
index <HASH>..<HASH> 100644
--- a/bokeh/bbmodel.py
+++ b/bokeh/bbmodel.py
@@ -40,11 +40,11 @@ class ContinuumModel(object):
def get(self, key, default=None):
return self.attributes.get(key, default)
- def get_ref(self, field, client):
+ def get_obj(self, field, client):
ref = self.get(field)
return client.get(ref['type'], ref['id'])
- def vget_ref(self, field, client):
+ def vget_obj(self, field, client):
return [client.get(ref['type'], ref['id']) for ref in \
self.attributes.get(field)]
|
changing our get_ref calls to be get_obj, since that's what they actually do
|
diff --git a/sunspot/lib/sunspot/search/abstract_search.rb b/sunspot/lib/sunspot/search/abstract_search.rb
index <HASH>..<HASH> 100644
--- a/sunspot/lib/sunspot/search/abstract_search.rb
+++ b/sunspot/lib/sunspot/search/abstract_search.rb
@@ -38,7 +38,7 @@ module Sunspot
# Sunspot#new_search(), you will need to call this method after building the
# query.
#
- def execute
+ def execute opts={}
reset
params = @query.to_params
# Here we add the ability to perform the request through POST rather than GET
|
You can now submit your requests using GET or POST verb
|
diff --git a/src/Models/User.php b/src/Models/User.php
index <HASH>..<HASH> 100644
--- a/src/Models/User.php
+++ b/src/Models/User.php
@@ -692,34 +692,6 @@ class User extends Entry
}
/**
- * Enables the current user.
- *
- * @throws AdldapException
- *
- * @return User
- */
- public function enable()
- {
- $this->enabled = 1;
-
- return $this;
- }
-
- /**
- * Disables the current user.
- *
- * @throws AdldapException
- *
- * @return User
- */
- public function disable()
- {
- $this->enabled = 0;
-
- return $this;
- }
-
- /**
* Sets the password on the current user.
*
* @param string $password
|
Remove enable and disable User model methods
- Removed enable and disable User model methods due to
UserAccountControl needing to be set for this functionality
|
diff --git a/openid/oidutil.py b/openid/oidutil.py
index <HASH>..<HASH> 100644
--- a/openid/oidutil.py
+++ b/openid/oidutil.py
@@ -11,6 +11,10 @@ def log(message, unused_level=0):
sys.stderr.write('\n')
def appendArgs(url, args):
+ if hasattr(args, 'items'):
+ args = args.items()
+ args.sort()
+
if len(args) == 0:
return url
|
[project @ Change behavior of appendArgs to sort dicts before using]
|
diff --git a/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/StubAplsLicensingServiceImpl.java b/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/StubAplsLicensingServiceImpl.java
index <HASH>..<HASH> 100644
--- a/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/StubAplsLicensingServiceImpl.java
+++ b/worker/worker-execution/score-worker-execution-impl/src/main/java/io/cloudslang/worker/execution/services/StubAplsLicensingServiceImpl.java
@@ -31,12 +31,12 @@ public class StubAplsLicensingServiceImpl implements AplsLicensingService {
}
@Override
- public boolean checkoutUiStep(String executionId, String branchId) {
+ public boolean incrementUiStep(String executionId, String branchId) {
return true;
}
@Override
- public void checkinUiStep(String executionId, String branchId) {
+ public void decrementUiStep(String executionId, String branchId) {
}
}
|
US/<I>/merge UI steps from master
|
diff --git a/lib/httparty/logger/logger.rb b/lib/httparty/logger/logger.rb
index <HASH>..<HASH> 100644
--- a/lib/httparty/logger/logger.rb
+++ b/lib/httparty/logger/logger.rb
@@ -3,16 +3,19 @@ require 'httparty/logger/curl_logger'
module HTTParty
module Logger
+ def self.formatters
+ {
+ :curl => Logger::CurlLogger,
+ :apache => Logger::ApacheLogger
+ }
+ end
+
def self.build(logger, level, formatter)
level ||= :info
formatter ||= :apache
- case formatter
- when :curl
- Logger::CurlLogger.new(logger, level)
- else
- Logger::ApacheLogger.new(logger, level)
- end
+ logger_klass = formatters[formatter] || Logger::ApacheLogger
+ logger_klass.new(logger, level)
end
end
end
|
abstract formatter selection so easy to override and add custom formatter
|
diff --git a/src/factory/Bodies.js b/src/factory/Bodies.js
index <HASH>..<HASH> 100644
--- a/src/factory/Bodies.js
+++ b/src/factory/Bodies.js
@@ -191,7 +191,7 @@ var Bodies = {};
// vertices are convex, so just create a body normally
body = {
position: { x: x, y: y },
- vertices: vertices
+ vertices: Vertices.clockwiseSort(vertices)
};
return Body.create(Common.extend({}, body, options));
@@ -209,12 +209,6 @@ var Bodies = {};
concave.vertices.push([vertices[i].x, vertices[i].y]);
}
- // check for complexity
- if (!concave.isSimple()) {
- Common.log('Bodies.fromVertices: Non-simple polygons are not supported. Could not decompose vertices. Fallback to convex hull.', 'warn');
- canDecompose = false;
- }
-
// try to decompose
if (canDecompose) {
// vertices are concave and simple, we can decompose into parts
@@ -298,4 +292,4 @@ var Bodies = {};
}
};
-})();
+})();
\ No newline at end of file
|
removed complexity check in Bodies.fromVertices, enforce clockwise sort
|
diff --git a/src/com/google/javascript/jscomp/CompilerOptions.java b/src/com/google/javascript/jscomp/CompilerOptions.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/CompilerOptions.java
+++ b/src/com/google/javascript/jscomp/CompilerOptions.java
@@ -2796,6 +2796,14 @@ public class CompilerOptions implements Serializable {
this.packageJsonEntryNames = names;
}
+ public void setUseSizeHeuristicToStopOptimizationLoop(boolean mayStopEarly) {
+ this.useSizeHeuristicToStopOptimizationLoop = mayStopEarly;
+ }
+
+ public void setMaxOptimizationLoopIterations(int maxIterations) {
+ this.optimizationLoopMaxIterations = maxIterations;
+ }
+
/** Serializes compiler options to a stream. */
@GwtIncompatible("ObjectOutputStream")
public void serialize(OutputStream objectOutputStream) throws IOException {
|
Move the optimization loop tuning API into the public API.
-------------
Created by MOE: <URL>
|
diff --git a/Adapter/ShopwareAdapter/ServiceBus/CommandHandler/Category/HandleCategoryCommandHandler.php b/Adapter/ShopwareAdapter/ServiceBus/CommandHandler/Category/HandleCategoryCommandHandler.php
index <HASH>..<HASH> 100644
--- a/Adapter/ShopwareAdapter/ServiceBus/CommandHandler/Category/HandleCategoryCommandHandler.php
+++ b/Adapter/ShopwareAdapter/ServiceBus/CommandHandler/Category/HandleCategoryCommandHandler.php
@@ -130,7 +130,7 @@ class HandleCategoryCommandHandler implements CommandHandlerInterface
]);
if (empty($shopIdentities)) {
- return null;
+ continue;
}
foreach ($shopIdentities as $shopIdentity) {
|
bugfix import categories if first shop is not mapped
|
diff --git a/models/Menu.php b/models/Menu.php
index <HASH>..<HASH> 100644
--- a/models/Menu.php
+++ b/models/Menu.php
@@ -23,12 +23,11 @@ class Menu extends ActiveRecord
public static function getDefaultId() {
$cache = \yii::$app->cache;
$cacheDefaultKey = self::getCacheDefaultKey();
- if (($result = $cache->get($cacheDefaultKey)) !== null) {
- return $result;
+ if (($result = $cache->get($cacheDefaultKey)) === null) {
+ $result = self::find()->andWhere('is_default')->select('id')->createCommand()->queryScalar();
+ $cache->set($cacheDefaultKey, $result);
}
- $result = self::find()->andWhere('is_default')->select('id')->createCommand()->queryScalar();
- $cache->set($cacheDefaultKey, $result);
if ($result === false) {
$result = null;
}
|
Fixed bug with no default cached value
|
diff --git a/Kwf/Assets/Filter/Css/KwfLocal.php b/Kwf/Assets/Filter/Css/KwfLocal.php
index <HASH>..<HASH> 100644
--- a/Kwf/Assets/Filter/Css/KwfLocal.php
+++ b/Kwf/Assets/Filter/Css/KwfLocal.php
@@ -14,10 +14,12 @@ class Kwf_Assets_Filter_Css_KwfLocal extends Kwf_Assets_Filter_Css_SelectorRepla
throw new Kwf_Exception("dependency is required for this filter");
}
- $prefix = Kwf_Config::getValue('application.uniquePrefix');
- if ($prefix) $prefix .= '-';
- else $prefix = '';
- $replacements['kwfLocal'] = $prefix.self::getLocalClassForDependency($dependency);
+ if ($dependency instanceof Kwf_Assets_Dependency_File) {
+ $prefix = Kwf_Config::getValue('application.uniquePrefix');
+ if ($prefix) $prefix .= '-';
+ else $prefix = '';
+ $replacements['kwfLocal'] = $prefix.self::getLocalClassForDependency($dependency);
+ }
return array(
'replacements' => $replacements
|
Fix kwfLocal with Component.css dependency
|
diff --git a/generators/generator-constants.js b/generators/generator-constants.js
index <HASH>..<HASH> 100644
--- a/generators/generator-constants.js
+++ b/generators/generator-constants.js
@@ -61,7 +61,7 @@ const DOCKER_MYSQL_VERSION = '8.0.30';
const DOCKER_MYSQL = `mysql:${DOCKER_MYSQL_VERSION}`;
const DOCKER_MARIADB_VERSION = '10.8.3';
const DOCKER_MARIADB = `mariadb:${DOCKER_MARIADB_VERSION}`;
-const DOCKER_POSTGRESQL_VERSION = '14.4';
+const DOCKER_POSTGRESQL_VERSION = '14.5';
const DOCKER_POSTGRESQL = `postgres:${DOCKER_POSTGRESQL_VERSION}`;
const DOCKER_MONGODB_VERSION = '4.4.14';
const DOCKER_MONGODB = `mongo:${DOCKER_MONGODB_VERSION}`;
|
Update postgres docker image version to <I>
|
diff --git a/dvc/remote/gdrive.py b/dvc/remote/gdrive.py
index <HASH>..<HASH> 100644
--- a/dvc/remote/gdrive.py
+++ b/dvc/remote/gdrive.py
@@ -33,12 +33,11 @@ class GDriveMissedCredentialKeyError(DvcException):
@decorator
def _wrap_pydrive_retriable(call):
- from apiclient import errors
from pydrive2.files import ApiRequestError
try:
result = call()
- except (ApiRequestError, errors.HttpError) as exception:
+ except ApiRequestError as exception:
retry_codes = ["403", "500", "502", "503", "504"]
if any(
"HttpError {}".format(code) in str(exception)
@@ -210,6 +209,7 @@ class RemoteGDrive(RemoteBASE):
GoogleAuth.DEFAULT_SETTINGS["get_refresh_token"] = True
GoogleAuth.DEFAULT_SETTINGS["oauth_scope"] = [
"https://www.googleapis.com/auth/drive",
+ # drive.appdata grants access to appDataFolder GDrive directory
"https://www.googleapis.com/auth/drive.appdata",
]
|
Remove usage of google-api-python-client deps
|
diff --git a/spec/database_cleaner/sequel/base_spec.rb b/spec/database_cleaner/sequel/base_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/database_cleaner/sequel/base_spec.rb
+++ b/spec/database_cleaner/sequel/base_spec.rb
@@ -24,6 +24,7 @@ module DatabaseCleaner
end
it "should default to :default" do
+ pending "I figure out how to use Sequel and write some real tests for it..."
subject.db.should == :default
end
end
|
marks failing Sequel test as pending
|
diff --git a/test/integration/server/test_bunyan.js b/test/integration/server/test_bunyan.js
index <HASH>..<HASH> 100644
--- a/test/integration/server/test_bunyan.js
+++ b/test/integration/server/test_bunyan.js
@@ -12,7 +12,7 @@ describe('bunyan', function() {
var child;
before(function(done) {
- this.timeout(10000);
+ this.timeout(30000);
util.setupScenario('bunyan', function(err) {
if (err) {
|
Increase timeout for bunyan test
Build can sometimes take a long time…
|
diff --git a/holoviews/core/data/__init__.py b/holoviews/core/data/__init__.py
index <HASH>..<HASH> 100644
--- a/holoviews/core/data/__init__.py
+++ b/holoviews/core/data/__init__.py
@@ -378,10 +378,10 @@ class Dataset(Element):
raise ValueError("The aggregate method requires a function to be specified")
if dimensions is None: dimensions = self.kdims
elif not isinstance(dimensions, list): dimensions = [dimensions]
- aggregated = self.interface.aggregate(self, dimensions, function, **kwargs)
+ kdims = [self.get_dimension(d) for d in dimensions]
+ aggregated = self.interface.aggregate(self, kdims, function, **kwargs)
aggregated = self.interface.unpack_scalar(self, aggregated)
- kdims = [self.get_dimension(d) for d in dimensions]
vdims = self.vdims
if spreadfn:
error = self.interface.aggregate(self, dimensions, spreadfn)
|
Fixed aliases on Dataset aggregate
|
diff --git a/gandi/cli/core/conf.py b/gandi/cli/core/conf.py
index <HASH>..<HASH> 100644
--- a/gandi/cli/core/conf.py
+++ b/gandi/cli/core/conf.py
@@ -134,6 +134,9 @@ class GandiModule(object):
def _get(cls, scope, key, default=None, separator='.'):
key = key.split(separator)
value = cls._conffiles.get(scope, {})
+ if not value:
+ return default
+
try:
for k in key:
value = value[k]
@@ -164,8 +167,7 @@ class GandiModule(object):
if ret is None:
if mandatory:
msg = ('missing configuration value for %s\n'
- 'please use "gandi config [-g] %s <VALUE>" to set a value\n\n'
- '-g globally\n'
+ 'please use "gandi config [-g] %s <VALUE>" to set a value\n'
% (key, key))
raise UsageError(msg)
return default
|
Fixes but with config retrieval if local is empty
|
diff --git a/spec/components/all_components_spec.rb b/spec/components/all_components_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/components/all_components_spec.rb
+++ b/spec/components/all_components_spec.rb
@@ -18,7 +18,9 @@ describe "All components" do
expect(yaml["name"]).not_to be_nil
expect(yaml["description"]).not_to be_nil
expect(yaml["examples"]).not_to be_nil
- expect(yaml["accessibility_criteria"]).not_to be_nil
+ expect(
+ yaml["accessibility_criteria"] || yaml["shared_accessibility_criteria"]
+ ).not_to be_nil
end
it "has the correct class in the ERB template",
|
Allow shared_accessibility_criteria to fulfill need
When a components accessibility has only shared accessibility criterias
it doesn't seem necessary to force typing some in.
|
diff --git a/spec/integration/lhm_spec.rb b/spec/integration/lhm_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/integration/lhm_spec.rb
+++ b/spec/integration/lhm_spec.rb
@@ -77,7 +77,7 @@ describe Lhm do
end
slave do
- key?(table_read(:users), ["username", "created_at"]).must_equal(false)
+ key?(table_read(:users), [:username, :created_at]).must_equal(false)
end
end
|
added slave blocks to lhm
|
diff --git a/gns3server/version.py b/gns3server/version.py
index <HASH>..<HASH> 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -23,5 +23,5 @@
# or negative for a release candidate or beta (after the base version
# number has been incremented)
-__version__ = "1.0a6"
+__version__ = "1.0a7.dev1"
__version_info__ = (1, 0, 0, -99)
|
Bump to version alpha7.dev1
|
diff --git a/src/Container.php b/src/Container.php
index <HASH>..<HASH> 100644
--- a/src/Container.php
+++ b/src/Container.php
@@ -152,7 +152,7 @@ class Container implements ContainerInterface
{
if (!isset($this->definitions[$id])) {
if (isset($this->rootContainer)) {
- if ($this->rootContainer instanceof static) {
+ if ($this->rootContainer instanceof self) {
return $this->rootContainer->getWithParams($id, $params);
} else {
return $this->rootContainer->get($id);
|
Fixed mistake: `self` is ok this case too
|
diff --git a/pypreprocessor/__init__.py b/pypreprocessor/__init__.py
index <HASH>..<HASH> 100644
--- a/pypreprocessor/__init__.py
+++ b/pypreprocessor/__init__.py
@@ -5,14 +5,11 @@ __author__ = 'Evan Plaice'
__version__ = '0.6.0'
#modified by hendiol
-
# changed by hendiol at 18.01.2017: added reset_internal for processing several files after each other
-<<<<<<< HEAD
# changed by hendiol at 11.04.2017: trying to get nested #ifdefs handeld
+# changed by hendiol at 12.04.2017: improved (several file processing) and added nested ifdef statements possible
+
-=======
-#test for further changes
->>>>>>> develop-several_files
import sys
import os
import traceback
|
Added the features and cleaned up head information
|
diff --git a/btceapi/common.py b/btceapi/common.py
index <HASH>..<HASH> 100644
--- a/btceapi/common.py
+++ b/btceapi/common.py
@@ -10,7 +10,7 @@ exps = [decimal.Decimal("1e-%d" % i) for i in range(16)]
btce_domain = "btc-e.com"
all_currencies = ("btc", "usd", "rur", "ltc", "nmc", "eur", "nvc",
- "trc", "ppc", "ftc")
+ "trc", "ppc", "ftc", "xpm")
all_pairs = ("btc_usd", "btc_rur", "btc_eur", "ltc_btc", "ltc_usd",
"ltc_rur", "ltc_eur", "nmc_btc", "nmc_usd", "nvc_btc",
"nvc_usd", "usd_rur", "eur_usd", "trc_btc", "ppc_btc",
|
Add XPM to the list of currencies
Update all_currencies in btceapi/common.py.
|
diff --git a/estnltk/taggers/standard_taggers/flatten_tagger.py b/estnltk/taggers/standard_taggers/flatten_tagger.py
index <HASH>..<HASH> 100644
--- a/estnltk/taggers/standard_taggers/flatten_tagger.py
+++ b/estnltk/taggers/standard_taggers/flatten_tagger.py
@@ -22,6 +22,14 @@ class FlattenTagger(Tagger):
self.attribute_mapping = attribute_mapping
self.default_values = default_values
+ def _make_layer_template(self):
+ return Layer(name=self.output_layer,
+ attributes=self.output_attributes,
+ text_object=None,
+ parent=None,
+ enveloping=None,
+ ambiguous=False)
+
def _make_layer(self, text, layers, status):
layer = flatten(input_layer=layers[self.input_layers[0]],
output_layer=self.output_layer,
|
Refactored estnltk/taggers/standard_taggers (remaining part)
|
diff --git a/src/BotApi.php b/src/BotApi.php
index <HASH>..<HASH> 100644
--- a/src/BotApi.php
+++ b/src/BotApi.php
@@ -845,7 +845,6 @@ class BotApi
) {
$results = array_map(function ($item) {
/* @var AbstractInlineQueryResult $item */
-
return json_decode($item->toJson(), true);
}, $results);
|
Empty commit to relaunch Scrutinizer "time-out" tests
|
diff --git a/singularity/build/utils.py b/singularity/build/utils.py
index <HASH>..<HASH> 100644
--- a/singularity/build/utils.py
+++ b/singularity/build/utils.py
@@ -48,7 +48,7 @@ def test_container(image_path):
work in most linux.
:param image_path: path to the container image
'''
- testing_command = ["singularity", "exec", image, 'echo pancakemania']
+ testing_command = ["singularity", "exec", image_path, 'echo pancakemania']
output = Popen(testing_command,stderr=STDOUT,stdout=PIPE)
t = output.communicate()[0],output.returncode
result = {'message':t[0],
diff --git a/singularity/version.py b/singularity/version.py
index <HASH>..<HASH> 100644
--- a/singularity/version.py
+++ b/singularity/version.py
@@ -1,4 +1,4 @@
-__version__ = "0.95"
+__version__ = "0.96"
AUTHOR = 'Vanessa Sochat'
AUTHOR_EMAIL = 'vsochat@stanford.edu'
NAME = 'singularity'
|
modified: singularity/build/utils.py
modified: singularity/version.py
|
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index <HASH>..<HASH> 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -58,7 +58,25 @@ class SimpleSAML_Configuration {
echo '<p>This file was missing: [' . $filename . ']</p>';
exit;
}
- require_once($filename);
+ require($filename);
+
+ // Check that $config array is defined...
+ if (!isset($config) || !is_array($config))
+ throw new Exception('Configuration file [' . $this->configfilename . '] does not contain a valid $config array.');
+
+ if(array_key_exists('override.host', $config)) {
+ foreach($config['override.host'] AS $host => $ofs) {
+ if (SimpleSAML_Utilities::getSelfHost() === $host) {
+ foreach(SimpleSAML_Utilities::arrayize($ofs) AS $of) {
+ $overrideFile = $this->configpath . '/' . $of;
+ if (!file_exists($overrideFile))
+ throw new Exception('Config file [' . $this->configfilename . '] requests override for host ' . $host . ' but file does not exists [' . $of . ']');
+ require($overrideFile);
+ }
+ }
+ }
+ }
+
$this->configuration = $config;
}
|
Add support for hostbased override of configuration files
|
diff --git a/bower.js b/bower.js
index <HASH>..<HASH> 100644
--- a/bower.js
+++ b/bower.js
@@ -1,6 +1,6 @@
{
"name": "flipclock",
- "version": "0.5.1",
+ "version": "0.5.2",
"homepage": "https://github.com/objectivehtml/FlipClock",
"authors": [
"Objective HTML",
diff --git a/compiled/flipclock.js b/compiled/flipclock.js
index <HASH>..<HASH> 100644
--- a/compiled/flipclock.js
+++ b/compiled/flipclock.js
@@ -199,7 +199,7 @@ var FlipClock;
* Version
*/
- version: '0.5.1',
+ version: '0.5.2',
/**
* Sets the default options
diff --git a/src/flipclock/js/libs/core.js b/src/flipclock/js/libs/core.js
index <HASH>..<HASH> 100644
--- a/src/flipclock/js/libs/core.js
+++ b/src/flipclock/js/libs/core.js
@@ -57,7 +57,7 @@ var FlipClock;
* Version
*/
- version: '0.5.1',
+ version: '0.5.2',
/**
* Sets the default options
|
Updated lib to <I>
|
diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java
index <HASH>..<HASH> 100644
--- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java
+++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java
@@ -77,7 +77,8 @@ public class ConstraintDefinitionsTest extends Arquillian {
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.2", id = "a")
+ @SpecAssertion(section = "3.2", id = "a"),
+ @SpecAssertion(section = "3.2", id = "b")
})
public void testRepeatableConstraint() {
Validator validator = TestUtil.getValidatorUnderTest();
|
Add a spec reference for a test added as part of BVTCK-<I>
|
diff --git a/lib/maruku/input/parse_block.rb b/lib/maruku/input/parse_block.rb
index <HASH>..<HASH> 100644
--- a/lib/maruku/input/parse_block.rb
+++ b/lib/maruku/input/parse_block.rb
@@ -549,7 +549,11 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
def split_cells(s,allowBlank=false)
if (allowBlank)
- s.split('|',-1)[1..-2] # allow blank cells, but only keep the inner elements of the cells
+ if (/^[|].*[|]$/ =~ s) # handle the simple and decorated table cases
+ s.split('|',-1)[1..-2] # allow blank cells, but only keep the inner elements of the cells
+ else
+ s.split('|',-1)
+ end
else
s.split('|').reject(&:empty?).map(&:strip)
end
|
Handle the undecorated table case as well. This was broken with the initial better table handling
|
diff --git a/command/hook_ui.go b/command/hook_ui.go
index <HASH>..<HASH> 100644
--- a/command/hook_ui.go
+++ b/command/hook_ui.go
@@ -177,7 +177,9 @@ func (h *UiHook) ProvisionOutput(
s := bufio.NewScanner(strings.NewReader(msg))
s.Split(scanLines)
for s.Scan() {
- buf.WriteString(fmt.Sprintf("%s%s\n", prefix, s.Text()))
+ if line := strings.TrimSpace(s.Text()); line != "" {
+ buf.WriteString(fmt.Sprintf("%s%s\n", prefix, line))
+ }
}
h.ui.Output(strings.TrimSpace(buf.String()))
|
command: make sure the output has a line from a provisioner to output
|
diff --git a/test/karma.browserstack.js b/test/karma.browserstack.js
index <HASH>..<HASH> 100644
--- a/test/karma.browserstack.js
+++ b/test/karma.browserstack.js
@@ -9,7 +9,7 @@ module.exports = {
bs_firefox_latest_supported: {
base: 'BrowserStack',
browser: 'firefox',
- browser_version: '69',
+ browser_version: '81',
os: 'Windows',
os_version: 10
},
@@ -30,7 +30,7 @@ module.exports = {
bs_edge_latest_supported: {
base: 'BrowserStack',
browser: 'Edge',
- browser_version: '18',
+ browser_version: '86',
os: 'Windows',
os_version: '10'
},
@@ -51,7 +51,7 @@ module.exports = {
bs_chrome_latest_supported: {
base: 'BrowserStack',
browser: "Chrome",
- browser_version: "77",
+ browser_version: "86",
os: 'Windows',
os_version: 10
},
@@ -65,9 +65,9 @@ module.exports = {
bs_safari_latest_supported: {
base: 'BrowserStack',
browser: "Safari",
- browser_version: "12.1",
+ browser_version: "13.1",
os: 'OS X',
- os_version: 'Mojave'
+ os_version: 'Catalina'
},
bs_iphone7: {
base: 'BrowserStack',
|
Update supported browsers to test on browserstack
|
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -297,9 +297,17 @@ function assertFixture(t, rule, fixture, basename, setting) {
t.plan(positionless ? 1 : 2);
- try {
- remark().use(lint, options).process(file, fixture.config);
- } catch (err) {}
+ remark().use(lint, options).process(file, fixture.config, function (err) {
+ if (err && err.source !== 'remark-lint') {
+ throw err;
+ }
+ });
+
+ t.deepEqual(
+ normalize(file.messages),
+ expected,
+ 'should equal with position'
+ );
file.messages.forEach(function (message) {
if (message.ruleId !== ruleId) {
@@ -311,19 +319,16 @@ function assertFixture(t, rule, fixture, basename, setting) {
}
});
- t.deepEqual(
- normalize(file.messages),
- expected,
- 'should equal with position'
- );
-
if (!positionless) {
file.messages = [];
try {
- remark().use(function () {
- return removePosition;
- }).use(lint, options).process(file);
+ remark()
+ .use(function () {
+ return removePosition;
+ })
+ .use(lint, options)
+ .process(file);
} catch (err) {}
t.deepEqual(
|
Refactor tests to not swallow unknown errors
|
diff --git a/src/Google/Service/Compute.php b/src/Google/Service/Compute.php
index <HASH>..<HASH> 100644
--- a/src/Google/Service/Compute.php
+++ b/src/Google/Service/Compute.php
@@ -6082,6 +6082,7 @@ class Google_Service_Compute_AttachedDisk extends Google_Collection
public $index;
protected $initializeParamsType = 'Google_Service_Compute_AttachedDiskInitializeParams';
protected $initializeParamsDataType = '';
+ public $interface;
public $kind;
public $licenses;
public $mode;
@@ -6138,6 +6139,16 @@ class Google_Service_Compute_AttachedDisk extends Google_Collection
return $this->initializeParams;
}
+ public function setInterface($interface)
+ {
+ $this->interface = $interface;
+ }
+
+ public function getInterface()
+ {
+ return $this->interface;
+ }
+
public function setKind($kind)
{
$this->kind = $kind;
|
Updated Compute.php
This change has been generated by a script that has detected changes in the
discovery doc of the API.
Check <URL>
|
diff --git a/jquery.scrollify.js b/jquery.scrollify.js
index <HASH>..<HASH> 100644
--- a/jquery.scrollify.js
+++ b/jquery.scrollify.js
@@ -173,6 +173,7 @@
console.warn("Scrollify warning:", window.location.hash, "is not a valid jQuery expression.");
}
}
+ currentIndex = index;
$(settings.target).promise().done(function(){
currentIndex = index;
locked = false;
|
fix issue #<I>: before()/after() doesn't trigger
|
diff --git a/lib/ddbcli/ddb-endpoint.rb b/lib/ddbcli/ddb-endpoint.rb
index <HASH>..<HASH> 100644
--- a/lib/ddbcli/ddb-endpoint.rb
+++ b/lib/ddbcli/ddb-endpoint.rb
@@ -13,6 +13,7 @@ module DynamoDB
'dynamodb.ap-southeast-1.amazonaws.com' => 'ap-southeast-1',
'dynamodb.ap-southeast-2.amazonaws.com' => 'ap-southeast-2',
'dynamodb.ap-northeast-1.amazonaws.com' => 'ap-northeast-1',
+ 'dynamodb.ap-northeast-2.amazonaws.com' => 'ap-northeast-2',
'dynamodb.sa-east-1.amazonaws.com' => 'sa-east-1',
}
|
add ap-northeast-2 region
|
diff --git a/lib/deliver/deliverfile/deliverfile_creator.rb b/lib/deliver/deliverfile/deliverfile_creator.rb
index <HASH>..<HASH> 100644
--- a/lib/deliver/deliverfile/deliverfile_creator.rb
+++ b/lib/deliver/deliverfile/deliverfile_creator.rb
@@ -64,7 +64,11 @@ module Deliver
private
def self.gem_path
- Gem::Specification.find_by_name("deliver").gem_dir
+ if Gem::Specification::find_all_by_name('deliver').any?
+ return Gem::Specification.find_by_name('deliver').gem_dir
+ else
+ return './'
+ end
end
# This method takes care of creating a new 'deliver' folder, containg the app metadata
|
Fixed fetching gem_path in test env
|
diff --git a/lib/reporters/base.js b/lib/reporters/base.js
index <HASH>..<HASH> 100644
--- a/lib/reporters/base.js
+++ b/lib/reporters/base.js
@@ -116,7 +116,8 @@ exports.list = function(failures){
// msg
var err = test.err
, stack = err.stack
- , index = stack.indexOf(err.message) + err.message.length
+ , message = err.message || ''
+ , index = stack.indexOf(message) + message.length
, msg = stack.slice(0, index);
// indent stack trace without msg
|
Fixed weird reporting when err.message is not present
nodes core "assert" lib will throw without a .message,
for example assert(1 == 2), assert(1 == 2, "something failed")
is fine however
|
diff --git a/odl/solvers/functional/functional.py b/odl/solvers/functional/functional.py
index <HASH>..<HASH> 100644
--- a/odl/solvers/functional/functional.py
+++ b/odl/solvers/functional/functional.py
@@ -926,14 +926,14 @@ class FunctionalProduct(Functional, OperatorPointwiseProduct):
class FunctionalProductGradient(Operator):
- """Functional representing the derivative of ``f(.) * g(.)``."""
+ """Functional representing the gradient of ``f(.) * g(.)``."""
def _call(self, x):
return (func.right(x) * func.left.gradient(x) +
func.left(x) * func.right.gradient(x))
return FunctionalProductGradient(self.domain, self.domain,
- linear=True)
+ linear=False)
class FunctionalQuotient(Functional):
@@ -1006,7 +1006,7 @@ class FunctionalQuotient(Functional):
class FunctionalQuotientGradient(Operator):
- """Functional representing the derivative of ``f(.) / g(.)``."""
+ """Functional representing the gradient of ``f(.) / g(.)``."""
def _call(self, x):
"""Apply the functional to the given point."""
@@ -1016,7 +1016,7 @@ class FunctionalQuotient(Functional):
(- dividendx / divisorx**2) * func.divisor.gradient(x))
return FunctionalQuotientGradient(self.domain, self.domain,
- linear=True)
+ linear=False)
class FunctionalDefaultConvexConjugate(Functional):
|
BUG: fixed FunctionalProduct and Quotient's gradient being set to linear
|
diff --git a/bids/variables/tests/test_variables.py b/bids/variables/tests/test_variables.py
index <HASH>..<HASH> 100644
--- a/bids/variables/tests/test_variables.py
+++ b/bids/variables/tests/test_variables.py
@@ -141,7 +141,7 @@ def test_merge_dense_run_variables(layout2):
n_rows = sum([len(c.values) for c in variables])
merged = merge_variables(variables)
assert len(merged.values) == n_rows
- assert merged.index.columns.equals(variables[0].index.columns)
+ assert set(merged.index.columns) == set(variables[0].index.columns)
def test_simple_variable_to_df(layout1):
|
fix test so order of columns doesn't matter
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.