diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/nblr/src/main/java/jlibs/nblr/codegen/java/JavaCodeGenerator.java b/nblr/src/main/java/jlibs/nblr/codegen/java/JavaCodeGenerator.java
index <HASH>..<HASH> 100644
--- a/nblr/src/main/java/jlibs/nblr/codegen/java/JavaCodeGenerator.java
+++ b/nblr/src/main/java/jlibs/nblr/codegen/java/JavaCodeGenerator.java
@@ -681,16 +681,9 @@ public class JavaCodeGenerator extends CodeGenerator{
);
}
- String keyWord, suffix;
- if(booleanProperty(HANDLER_IS_CLASS)){
- keyWord = "class";
- suffix = "implements";
- }else{
- keyWord = "interface";
- suffix = " extends ";
- }
+ String keyWord = booleanProperty(HANDLER_IS_CLASS) ? "class" : "interface";
printer.printlns(
- "public "+keyWord+" "+className[1]+"<E extends Exception>"+suffix+"<E>{",
+ "public "+keyWord+" "+className[1]+"<E extends Exception>{",
PLUS
);
}
|
generated consumer class/interface doesn't extend/implement anything
|
diff --git a/scout_apm/core_agent_manager.py b/scout_apm/core_agent_manager.py
index <HASH>..<HASH> 100644
--- a/scout_apm/core_agent_manager.py
+++ b/scout_apm/core_agent_manager.py
@@ -91,9 +91,9 @@ class CoreAgentManager:
subprocess.Popen(
[
executable, 'daemon',
- '--api-key', 'Qnk5SKpNEeboPdeJkhae',
- '--log-level', 'info',
- '--app-name', 'CoreAgent',
+ '--api-key', self.api_key(),
+ '--log-level', self.log_level(),
+ '--app-name', self.app_name(),
'--socket', self.socket_path()
])
@@ -101,6 +101,15 @@ class CoreAgentManager:
print('Socket path', agent_context.config.value('socket_path'))
return agent_context.config.value('socket_path')
+ def log_level(self):
+ return 'debug'
+
+ def app_name(self):
+ return 'CoreAgent'
+
+ def api_key(self):
+ return 'Qnk5SKpNEeboPdeJkhae'
+
def atexit(self, directory):
print('Atexit shutting down agent')
CoreAgentProbe().shutdown()
|
Extract functions for args to CoreAgent
|
diff --git a/nodeserver.js b/nodeserver.js
index <HASH>..<HASH> 100755
--- a/nodeserver.js
+++ b/nodeserver.js
@@ -52,6 +52,20 @@ module.exports = exports = new function() {
}
}
}
+
+ //double check with regex
+ for(var i = 0; i < websitesCount; i++) {
+ var website = this.websites[i];
+ var bindingsCount = website.bindings.length;
+
+ for(var j = 0; j < bindingsCount; j++) {
+ var regex = new RegExp(website.bindings[j], "gi")
+
+ if(regex.test(url)) {
+ return website;
+ }
+ }
+ }
}
@@ -72,7 +86,10 @@ module.exports = exports = new function() {
this.config = JSON.parse(config);
for(var i = 0; i < this.config.sites.length; i++) {
- this.addWebsite(this.config.sites[i]);
+ var site = this.config.sites[i];
+
+ site.id = site.id || site.bindings[0];
+ this.addWebsite(site);
}
if(this.config.nodeserver.admin.active) {
|
new regex double check and added id to site object
|
diff --git a/url.go b/url.go
index <HASH>..<HASH> 100644
--- a/url.go
+++ b/url.go
@@ -48,9 +48,9 @@ func NewURL(ref string) (*url.URL, error) {
}
func ConvertGitURLHTTPToSSH(url *url.URL) (*url.URL, error) {
- user := url.User.Username()
- if user == "" {
- user = "git"
+ user := "git";
+ if url.User != nil {
+ user = url.User.Username()
}
sshURL := fmt.Sprintf("ssh://%s@%s%s", user, url.Host, url.Path)
return url.Parse(sshURL)
|
Fix nil pointer dereference on older Go versions
|
diff --git a/src/layout/Force.js b/src/layout/Force.js
index <HASH>..<HASH> 100644
--- a/src/layout/Force.js
+++ b/src/layout/Force.js
@@ -16,9 +16,9 @@ var FORCE_MAP = map()
.set('y', forceY);
var FORCES = 'forces',
- PARAMS = ['alpha', 'alphaMin', 'alphaTarget', 'drag', 'forces'],
+ PARAMS = ['alpha', 'alphaMin', 'alphaTarget', 'velocityDecay', 'drag', 'forces'],
CONFIG = ['static', 'iterations'],
- FIELDS = ['x', 'y', 'vx', 'vy'];
+ FIELDS = ['x', 'y', 'vx', 'vy', 'fx', 'fy'];
/**
* Force simulation layout.
@@ -51,8 +51,8 @@ prototype.transform = function(_, pulse) {
// fix / unfix nodes as needed
if (_.modified('fixed')) {
- sim.unfixAll();
- array(_.fixed).forEach(function(t) { sim.fix(t); });
+ sim.nodes().forEach(function(t) { t.fx = null; t.fy = null; });
+ array(_.fixed).forEach(function(t) { t.fx = t.x; t.fy = t.y; });
}
// run simulation
|
Update Force to d3-force <I> API.
|
diff --git a/internetarchive/cli/ia_upload.py b/internetarchive/cli/ia_upload.py
index <HASH>..<HASH> 100644
--- a/internetarchive/cli/ia_upload.py
+++ b/internetarchive/cli/ia_upload.py
@@ -237,6 +237,9 @@ def main(argv, session):
local_file.seek(0)
else:
local_file = args['<file>']
+ # Properly expand a period to the contents of the current working directory.
+ if local_file and local_file[0] == '.':
+ local_file = os.listdir('.')
if isinstance(local_file, (list, tuple, set)) and args['--remote-name']:
local_file = local_file[0]
|
Expand a period to the contents of the current directory.
The previous behavior when specifying a period as a wildcard was faulty.
Now a period is properly expanded to the contents of the current directory.
ia_upload.py seemed to be the most sensible location for this fix, since it
is the closest to receiving the path and so that the behavior of the library
does not change.
Closes #<I>, fixes #<I>.
|
diff --git a/logentry/logentry.go b/logentry/logentry.go
index <HASH>..<HASH> 100644
--- a/logentry/logentry.go
+++ b/logentry/logentry.go
@@ -31,6 +31,8 @@ type Response struct {
type Body struct {
ElapsedTime int `json:"elapsedTime"`
Date int `json:"date"`
+ Index string `json:"index"`
+ Type string `json:"type"`
Request Request `json:"request"`
Response Response `json:"response"`
}
@@ -59,6 +61,6 @@ func New(indexPrefix, typeName, JobType, WorkerName string, Code, ElapsedTime in
response := Response{Metadata: responseMetadata}
Date := int((now.UnixNano() / 1000000)) - ElapsedTime
- body := Body{Request: request, Response: response, ElapsedTime: ElapsedTime, Date: Date}
+ body := Body{Request: request, Response: response, ElapsedTime: ElapsedTime, Date: Date, Index: index, Type: typeName}
return &LogEntry{Index: index, Type: typeName, Body: body}
}
diff --git a/logentry/version.go b/logentry/version.go
index <HASH>..<HASH> 100644
--- a/logentry/version.go
+++ b/logentry/version.go
@@ -1,4 +1,4 @@
package logentry
// VERSION is the current library Version
-var VERSION = "1.1.0"
+var VERSION = "1.2.0"
|
<I> Add index and type to logentry body
|
diff --git a/src/comfy.js b/src/comfy.js
index <HASH>..<HASH> 100644
--- a/src/comfy.js
+++ b/src/comfy.js
@@ -11,7 +11,7 @@
* @class
*/
function Comfy(env) {
- this.env = env;
+ this._env = env;
}
/**
@@ -74,13 +74,13 @@ Comfy.prototype.property = function (name, options) {
var opts = this.withOptions(options);
var envName = this.nameToEnvKey(name);
- var envValue = this.env[envName];
+ var envValue = this._env[envName];
if (typeof envValue === "undefined") {
if (opts.optional) {
envValue = opts.defaultValue;
} else {
- throw "Required property " + envName + " not present in env:" + this.env;
+ throw "Required property " + envName + " not present in env:" + this._env;
}
}
|
Rename internal env property to _env to reduce chance of collisions
|
diff --git a/src/python/grpcio/setup.py b/src/python/grpcio/setup.py
index <HASH>..<HASH> 100644
--- a/src/python/grpcio/setup.py
+++ b/src/python/grpcio/setup.py
@@ -146,7 +146,7 @@ TEST_PACKAGE_DATA = {
TESTS_REQUIRE = (
'oauth2client>=1.4.7',
- 'protobuf==3.0.0a3',
+ 'protobuf>=3.0.0a3',
'coverage>=4.0',
) + INSTALL_REQUIRES
|
Remove ceiling on required protobuf version
This is possible now that <URL>.
|
diff --git a/src/base/Response.php b/src/base/Response.php
index <HASH>..<HASH> 100644
--- a/src/base/Response.php
+++ b/src/base/Response.php
@@ -23,6 +23,15 @@ class Response extends Component
*/
public $exitStatus = 0;
+ /**
+ * @var Application
+ */
+ protected $app;
+
+ public function __construct(Application $app)
+ {
+ $this->app = $app;
+ }
/**
* Sends the response to client.
|
Added app with DI to `Response`
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -8,7 +8,7 @@ var webpack = require('webpack-stream');
var del = require('del');
var runSequence = require('run-sequence');
-gulp.task('default', ['spec']);
+gulp.task('default', ['ci']);
function testAssetsStream(watch) {
return gulp.src(['spec/**/*_spec.js'])
|
change default task to one that actually makes sense
|
diff --git a/lib/Model-rest.js b/lib/Model-rest.js
index <HASH>..<HASH> 100644
--- a/lib/Model-rest.js
+++ b/lib/Model-rest.js
@@ -20,7 +20,7 @@ module.exports = function(Model,options){
}
var isEmpty = function(obj){
- return !Object.keys(obj).length;
+ return !obj || !Object.keys(obj).length;
};
var handleResponse = function(err,res,callback,type){
|
fix exception when trying to check an empty object
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(name='pyscroll',
author='bitcraft',
author_email='leif.theden@gmail.com',
packages=['pyscroll', 'tests'],
- install_requires=['pygame', 'six'],
+ install_requires=['six'],
license='LGPLv3',
long_description='see README.md',
package_data={
|
remove pygame from deps, as it causes problems on some windows systems.
|
diff --git a/admin/test/spec/controllers/inspectionCtrl.js b/admin/test/spec/controllers/inspectionCtrl.js
index <HASH>..<HASH> 100644
--- a/admin/test/spec/controllers/inspectionCtrl.js
+++ b/admin/test/spec/controllers/inspectionCtrl.js
@@ -20,14 +20,15 @@ describe('Controller: inspectionCtrl', function () {
then: function (cb) {
cb(new Inspection(id, {'foo': 'bar'}));
}
- }
+ };
}
};
inspectionCtrl = $controller('inspectionCtrl', {
$scope: scope,
$routeParams: {inspectionId: 123},
- $inspectionsRepository: $inspectionsRepository
+ $inspectionsRepository: $inspectionsRepository,
+ RDT_REPORTS: {'report-name': 'report/script/path.html'}
});
}));
@@ -36,4 +37,8 @@ describe('Controller: inspectionCtrl', function () {
expect(scope.inspection.id).toBe(123);
expect(scope.inspection.data.foo).toBe('bar');
});
+
+ it('should load the reports map in the scope', function () {
+ expect(scope.reports).toEqual({'report-name': 'report/script/path.html'});
+ });
});
|
Expecting reports map to be filled in the scope of the `inspectionCtrl`
|
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index <HASH>..<HASH> 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -625,7 +625,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
try {
final Client client = cluster.connect(name.getMethodName());
- final ResultSet first = client.submit("Thread.sleep(5000);g.V().fold().coalesce(unfold(), g.addV('person'))");
+ final ResultSet first = client.submit("Thread.sleep(5000);g.V().fold().coalesce(unfold(), __.addV('person'))");
final ResultSet second = client.submit("g.V().count()");
final CompletableFuture<List<Result>> futureFirst = first.all();
|
Use anonymous traversal for child in test CTR
|
diff --git a/fedmsg/consumers/ircbot.py b/fedmsg/consumers/ircbot.py
index <HASH>..<HASH> 100644
--- a/fedmsg/consumers/ircbot.py
+++ b/fedmsg/consumers/ircbot.py
@@ -231,7 +231,6 @@ class IRCBotConsumer(FedmsgConsumer):
if f and re.search(f, topic):
return False
for f in filters.get('body', []):
- type(msg)
if f and re.search(f, str(msg)):
return False
return True
|
Remove old debug artifact.
|
diff --git a/contrib/parseq-restli-client/src/main/java/com/linkedin/restli/client/ParSeqRestClientBuilder.java b/contrib/parseq-restli-client/src/main/java/com/linkedin/restli/client/ParSeqRestClientBuilder.java
index <HASH>..<HASH> 100644
--- a/contrib/parseq-restli-client/src/main/java/com/linkedin/restli/client/ParSeqRestClientBuilder.java
+++ b/contrib/parseq-restli-client/src/main/java/com/linkedin/restli/client/ParSeqRestClientBuilder.java
@@ -50,7 +50,7 @@ public class ParSeqRestClientBuilder {
return this;
}
- public ParSeqRestClientBuilder setInboundRequestFinder(InboundRequestContextFinder inboundRequestContextFinder) {
+ public ParSeqRestClientBuilder setInboundRequestContextFinder(InboundRequestContextFinder inboundRequestContextFinder) {
ArgumentUtil.requireNotNull(inboundRequestContextFinder, "inboundRequestContextFinder");
_inboundRequestContextFinder = inboundRequestContextFinder;
return this;
|
renamed setInboundRequestFinder to setInboundRequestContextFinder
|
diff --git a/airflow/models.py b/airflow/models.py
index <HASH>..<HASH> 100644
--- a/airflow/models.py
+++ b/airflow/models.py
@@ -826,6 +826,7 @@ class TaskInstance(Base):
successes, skipped, failed, upstream_failed, done = qry.first()
upstream = len(task._upstream_list)
tr = task.trigger_rule
+ upstream_done = done >= upstream
# handling instant state assignment based on trigger rules
if flag_upstream_failed:
@@ -838,10 +839,10 @@ class TaskInstance(Base):
if successes or skipped:
self.set_state(State.SKIPPED)
elif tr == TR.ONE_SUCCESS:
- if done >= upstream and not successes:
+ if upstream_done and not successes:
self.set_state(State.SKIPPED)
elif tr == TR.ONE_FAILED:
- if successes or skipped:
+ if upstream_done and not(failed or upstream_failed):
self.set_state(State.SKIPPED)
if (
@@ -849,7 +850,7 @@ class TaskInstance(Base):
(tr == TR.ONE_FAILED and (failed or upstream_failed)) or
(tr == TR.ALL_SUCCESS and successes >= upstream) or
(tr == TR.ALL_FAILED and failed + upstream_failed >= upstream) or
- (tr == TR.ALL_DONE and done >= upstream)
+ (tr == TR.ALL_DONE and upstream_done)
):
return True
|
Fixing bad ONE_FAILED in recent PR
|
diff --git a/src/lib/DocSearch.js b/src/lib/DocSearch.js
index <HASH>..<HASH> 100644
--- a/src/lib/DocSearch.js
+++ b/src/lib/DocSearch.js
@@ -36,6 +36,7 @@ class DocSearch {
appId = 'BH4D9OD16A',
debug = false,
algoliaOptions = {},
+ queryDataCallback = null,
autocompleteOptions = {
debug: false,
hint: false,
@@ -53,6 +54,7 @@ class DocSearch {
inputSelector,
debug,
algoliaOptions,
+ queryDataCallback,
autocompleteOptions,
transformData,
queryHook,
@@ -66,6 +68,7 @@ class DocSearch {
this.indexName = indexName;
this.input = DocSearch.getInputFromSelector(inputSelector);
this.algoliaOptions = { hitsPerPage: 5, ...algoliaOptions };
+ this.queryDataCallback = queryDataCallback || null;
const autocompleteOptionsDebug =
autocompleteOptions && autocompleteOptions.debug
? autocompleteOptions.debug
@@ -214,6 +217,9 @@ class DocSearch {
},
])
.then(data => {
+ if (this.queryDataCallback && typeof this.queryDataCallback == "function") {
+ this.queryDataCallback(data)
+ }
let hits = data.results[0].hits;
if (transformData) {
hits = transformData(hits) || hits;
|
implement query data callback method into src (#<I>)
|
diff --git a/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnector.java b/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnector.java
index <HASH>..<HASH> 100644
--- a/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnector.java
+++ b/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnector.java
@@ -706,7 +706,7 @@ public class SignavioConnector extends AbstractRepositoryConnector implements Si
sendRequest(jsonRequest);
// TODO: return the object
- return getRepositoryArtifact(id);
+ return getRepositoryArtifact("/"+id);
} catch (Exception je) {
throw new RepositoryException("Unable to create model '" + artifactName + "' in parent folder '" + parentFolderId + "'", je);
}
|
Fixed Problem with SignavioConnector returning wrong id
|
diff --git a/src/core/lombok/ToString.java b/src/core/lombok/ToString.java
index <HASH>..<HASH> 100644
--- a/src/core/lombok/ToString.java
+++ b/src/core/lombok/ToString.java
@@ -64,7 +64,7 @@ public @interface ToString {
* Include the result of the superclass's implementation of {@code toString} in the output.
* <strong>default: false</strong>
*
- * @return Whether to call the superclass's {@code equals} implementation as part of the generated equals algorithm.
+ * @return Whether to call the superclass's {@code toString} implementation as part of the generated equals algorithm.
*/
boolean callSuper() default false;
|
fix JavaDoc of callSuper in the ToString annotation
|
diff --git a/src/UserManager.js b/src/UserManager.js
index <HASH>..<HASH> 100644
--- a/src/UserManager.js
+++ b/src/UserManager.js
@@ -406,7 +406,10 @@ export class UserManager extends OidcClient {
if (postLogoutRedirectUri){
args.post_logout_redirect_uri = postLogoutRedirectUri;
}
- return this._signoutStart(args, this._redirectNavigator).then(()=>{
+ let navParams = {
+ useReplaceToNavigate : args.useReplaceToNavigate
+ };
+ return this._signoutStart(args, this._redirectNavigator, navParams).then(()=>{
Log.info("UserManager.signoutRedirect: successful");
});
}
|
Pass navigator params for signout to allow for useReplaceToNavigate flag #<I>
|
diff --git a/spacy/cli/converters/conllu2json.py b/spacy/cli/converters/conllu2json.py
index <HASH>..<HASH> 100644
--- a/spacy/cli/converters/conllu2json.py
+++ b/spacy/cli/converters/conllu2json.py
@@ -2,6 +2,7 @@
from __future__ import unicode_literals
import json
+from ...compat import json_dumps
from ... import util
@@ -29,7 +30,8 @@ def conllu2json(input_path, output_path, n_sents=10, use_morphology=False):
output_filename = input_path.parts[-1].replace(".conllu", ".json")
output_file = output_path / output_filename
- json.dump(docs, output_file.open('w', encoding='utf-8'), indent=2)
+ with output_file.open('w', encoding='utf-8') as f:
+ f.write(json_dumps(docs))
util.print_msg("Created {} documents".format(len(docs)),
title="Generated output file {}".format(output_file))
|
Use spacy.compat.json_dumps for Python 2/3 compatibility (resolves #<I>)
|
diff --git a/src/DM/AjaxCom/Resources/public/js/ajaxcom.js b/src/DM/AjaxCom/Resources/public/js/ajaxcom.js
index <HASH>..<HASH> 100644
--- a/src/DM/AjaxCom/Resources/public/js/ajaxcom.js
+++ b/src/DM/AjaxCom/Resources/public/js/ajaxcom.js
@@ -2,6 +2,15 @@
// https://github.com/advertize/AjaxCom
(function($) {
"use strict";
+
+ $.event.props.push('state');
+ $(window).on('popstate.ajaxcom', function(event) {
+ if (typeof event.state === 'object' && event.state !== null) {
+ window.location.reload();
+ }
+ });
+ window.history.replaceState({}, null);
+
// Intercept click and submit events and perform an ajax request then
// handle instructions returned
//
@@ -157,12 +166,12 @@
switch (options.method) {
case 'push':
setTimeout(function() {
- window.history.pushState(null, null, options.url);
+ window.history.pushState({}, null, options.url);
}, options.wait);
break;
case 'replace':
setTimeout(function() {
- window.history.replaceState(null, null, options.url);
+ window.history.replaceState({}, null, options.url);
}, options.wait);
break;
case 'redirect':
|
Force back/forward buttons to reload the page
|
diff --git a/cdn/types.go b/cdn/types.go
index <HASH>..<HASH> 100644
--- a/cdn/types.go
+++ b/cdn/types.go
@@ -9,7 +9,7 @@ import (
const (
Web = "web"
Download = "download"
- video = "video"
+ Video = "video"
LiveStream = "liveStream"
Ipaddr = "ipaddr"
Domain = "domain"
@@ -27,7 +27,7 @@ const (
AccessControlMaxAge = "Access-Control-Max-Age"
)
-var CdnTypes = []string{Web, Download, video, LiveStream}
+var CdnTypes = []string{Web, Download, Video, LiveStream}
var SourceTypes = []string{Ipaddr, Domain, OSS}
var Scopes = []string{Domestic, Overseas, Global}
var HeaderKeys = []string{ContentType, CacheControl, ContentDisposition, ContentLanguage, Expires, AccessControlAllowMethods, AccessControlAllowOrigin, AccessControlMaxAge}
|
make the variable Video visable outside the package
|
diff --git a/casacore/functionals/functional.py b/casacore/functionals/functional.py
index <HASH>..<HASH> 100644
--- a/casacore/functionals/functional.py
+++ b/casacore/functionals/functional.py
@@ -146,7 +146,7 @@ class functional(_functional):
if len(retval) == n:
return numpy.array(retval)
return numpy.array(retval).reshape(self.npar() + 1,
- n / self.ndim()).transpose()
+ n // self.ndim()).transpose()
def add(self, other):
if not isinstance(other, functional):
diff --git a/tests/test_functionals.py b/tests/test_functionals.py
index <HASH>..<HASH> 100644
--- a/tests/test_functionals.py
+++ b/tests/test_functionals.py
@@ -1,5 +1,5 @@
import unittest2 as unittest
-from pyrap.functionals import *
+from casacore.functionals import *
class TestFunctionals(unittest.TestCase):
|
fixed the integer division bug in functionals
|
diff --git a/httprunner/models.py b/httprunner/models.py
index <HASH>..<HASH> 100644
--- a/httprunner/models.py
+++ b/httprunner/models.py
@@ -124,7 +124,7 @@ class RequestData(BaseModel):
url: Url
headers: Headers = {}
cookies: Cookies = {}
- body: Union[Text, bytes, Dict, List, None] = {}
+ body: Union[Text, bytes, List, Dict, None] = {}
class ResponseData(BaseModel):
@@ -133,7 +133,7 @@ class ResponseData(BaseModel):
cookies: Cookies
encoding: Union[Text, None] = None
content_type: Text
- body: Union[Text, bytes, Dict, List]
+ body: Union[Text, bytes, List, Dict]
class ReqRespData(BaseModel):
|
fix：resolved list read error caused by Pydantic.BaseModel #<I>
|
diff --git a/src/cartesian/Area.js b/src/cartesian/Area.js
index <HASH>..<HASH> 100644
--- a/src/cartesian/Area.js
+++ b/src/cartesian/Area.js
@@ -50,7 +50,6 @@ class Area extends Component {
PropTypes.func, PropTypes.element, PropTypes.object, PropTypes.bool,
]),
hide: PropTypes.bool,
-
// have curve configuration
layout: PropTypes.oneOf(['horizontal', 'vertical']),
baseLine: PropTypes.oneOfType([
diff --git a/src/chart/LineChart.js b/src/chart/LineChart.js
index <HASH>..<HASH> 100644
--- a/src/chart/LineChart.js
+++ b/src/chart/LineChart.js
@@ -5,4 +5,3 @@ import generateCategoricalChart from './generateCategoricalChart';
import Line from '../cartesian/Line';
export default generateCategoricalChart('LineChart', Line);
-
|
feat: add props `hide` for each graphic Component
|
diff --git a/alot/buffers.py b/alot/buffers.py
index <HASH>..<HASH> 100644
--- a/alot/buffers.py
+++ b/alot/buffers.py
@@ -5,7 +5,7 @@ import widgets
import settings
import commands
from walker import PipeWalker
-from message import decode_header
+from helper import shorten_author_string
class Buffer(object):
@@ -86,7 +86,8 @@ class EnvelopeBuffer(Buffer):
Buffer.__init__(self, ui, self.body, 'envelope')
def __str__(self):
- return "to: %s" % decode_header(self.mail['To'])
+ to = self.envelope.get('To', fallback='unset')
+ return "to: %s" % shorten_author_string(to, 400)
def get_email(self):
return self.mail
|
EnvelopeBuffer statusline love
use unencoded recipient string from envelope for
EnvelopeBuffers statusline and shorten it using
helper.shorten_authors_string.
|
diff --git a/src/Entity/Testing/AbstractEntityTest.php b/src/Entity/Testing/AbstractEntityTest.php
index <HASH>..<HASH> 100644
--- a/src/Entity/Testing/AbstractEntityTest.php
+++ b/src/Entity/Testing/AbstractEntityTest.php
@@ -197,7 +197,7 @@ abstract class AbstractEntityTest extends TestCase implements EntityTestInterfac
$dto->$method();
}
if (0 === $this->getCount()) {
- self::markTestSkipped('No assertable getters in this Entity');
+ self::assertTrue(true);
}
return $entity;
|
cant skip a test that is being depended on
|
diff --git a/lib/fluent/plugin/output.rb b/lib/fluent/plugin/output.rb
index <HASH>..<HASH> 100644
--- a/lib/fluent/plugin/output.rb
+++ b/lib/fluent/plugin/output.rb
@@ -1264,7 +1264,7 @@ module Fluent
current_clock = Fluent::Clock.now
interval = state.next_clock - current_clock
- if state.next_clock <= current_clock && (!@retry || @retry_mutex.synchronize{ @retry.next_time } <= Time.now)
+ if state.next_clock <= current_clock && @retry_mutex.synchronize { @retry ? @retry.next_time <= Time.now : true }
try_flush
# next_flush_time uses flush_thread_interval or flush_thread_burst_interval (or retrying)
|
Fix race condition of retry state in flush thread
This is simple solution but performance is bit decreased.
The better solution is changing retry mechanizm but it makes
the code complicated. This is feature task.
|
diff --git a/libkbfs/disk_block_cache.go b/libkbfs/disk_block_cache.go
index <HASH>..<HASH> 100644
--- a/libkbfs/disk_block_cache.go
+++ b/libkbfs/disk_block_cache.go
@@ -288,9 +288,14 @@ func (cache *DiskBlockCacheStandard) compactCachesLocked(ctx context.Context) {
metaDb := cache.metaDb
tlfDb := cache.tlfDb
go func() {
+ cache.log.CDebugf(ctx, "+ Disk cache compaction starting.")
+ cache.log.CDebugf(ctx, "Compacting metadata db.")
metaDb.CompactRange(util.Range{})
+ cache.log.CDebugf(ctx, "Compacting TLF db.")
tlfDb.CompactRange(util.Range{})
+ cache.log.CDebugf(ctx, "Compacting block db.")
blockDb.CompactRange(util.Range{})
+ cache.log.CDebugf(ctx, "- Disk cache compaction complete.")
// Give back the sentinel.
cache.compactCh <- struct{}{}
}()
|
disk_block_cache: Log all steps of disk block cache compaction.
|
diff --git a/lib/Serverless.js b/lib/Serverless.js
index <HASH>..<HASH> 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -80,7 +80,11 @@ class Serverless {
return BbPromise.resolve();
}
- // populate variables after --help, otherwise help may fail to print (https://github.com/serverless/serverless/issues/2041)
+ // make sure the command exists before doing anything else
+ this.pluginManager.validateCommand(this.processedInput.commands);
+
+ // populate variables after --help, otherwise help may fail to print
+ // (https://github.com/serverless/serverless/issues/2041)
this.variables.populateService(this.pluginManager.cliOptions);
// trigger the plugin lifecycle when there's something which should be processed
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index <HASH>..<HASH> 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -150,6 +150,10 @@ class PluginManager {
return BbPromise.reduce(hooks, (__, hook) => hook(), null);
}
+ validateCommand(commandsArray) {
+ this.getCommand(commandsArray);
+ }
+
validateOptions(command) {
_.forEach(command.options, (value, key) => {
if (value.required && (this.cliOptions[key] === true || !(this.cliOptions[key]))) {
|
fix Verify that a command is valid before trying to populate variables
|
diff --git a/src/android/BranchSDK.java b/src/android/BranchSDK.java
index <HASH>..<HASH> 100644
--- a/src/android/BranchSDK.java
+++ b/src/android/BranchSDK.java
@@ -246,7 +246,7 @@ public class BranchSDK extends CordovaPlugin
result.put("data", installParams);
- this.callbackContext.success(installParams);
+ this.callbackContext.success(result);
}
|
[FIX] getFirstReferringParams not returning JSON object.
|
diff --git a/app/extensions/Redirector/extension.php b/app/extensions/Redirector/extension.php
index <HASH>..<HASH> 100644
--- a/app/extensions/Redirector/extension.php
+++ b/app/extensions/Redirector/extension.php
@@ -91,7 +91,7 @@ class Extension extends BaseExtension
public function initializeConfiguration()
{
// Get the routing.yml configuration
- $this->routes = $this->app->config->get('routing');
+ $this->routes = $this->app['config']->get('routing');
// Set the configuration defaults
$config = array(
@@ -270,7 +270,7 @@ class Extension extends BaseExtension
// Merge global variables with those defined by the user
$self->variables = array_merge($self->variables, array(
- 'admin_path' => $app->config->get('general/branding/path'),
+ 'admin_path' => $app['config']->get('general/branding/path'),
));
// Replace variables with actual data
foreach ($self->variables as $variable => $data) {
|
Refactored out two 'old style' `$app->config` statements.
|
diff --git a/src/Jobs/Entity/Job.php b/src/Jobs/Entity/Job.php
index <HASH>..<HASH> 100644
--- a/src/Jobs/Entity/Job.php
+++ b/src/Jobs/Entity/Job.php
@@ -17,7 +17,7 @@ use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
/**
* The job model
*
- * @ODM\Document(collection="jobs", repositoryClass="Jobs\Repository\Job")
+ * @ODM\Document(collection="jobs")
*/
class Job extends AbstractIdentifiableEntity implements JobInterface {
|
[Jobs] Refactor job repository and entities to make it work with new RepositoryService
(references gh-<I>)
|
diff --git a/spec/models/audit_rails/audit_spec.rb b/spec/models/audit_rails/audit_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/models/audit_rails/audit_spec.rb
+++ b/spec/models/audit_rails/audit_spec.rb
@@ -55,11 +55,11 @@ describe AuditRails::Audit do
john = "John Smith"
fake = "Fake User"
audit = 3.times{
- AuditRails::Audit.create!(:action => action = "Visit", :user_name => john)
- AuditRails::Audit.create!(:action => action = "login", :user_name => fake)
+ AuditRails::Audit.create!(:action => action = "visit", :user_name => john, :controller => 'home')
+ AuditRails::Audit.create!(:action => action = "login", :user_name => fake, :controller => 'session')
}
- AuditRails::Audit.analysis_by_page_views.should == {'login' => 3, 'Visit' => 3}
+ AuditRails::Audit.analysis_by_page_views.should == {['session', 'login'] => 3, ['home','visit'] => 3}
end
end
|
Fixed failing spec for controller-action name
|
diff --git a/framework/directives/progress.js b/framework/directives/progress.js
index <HASH>..<HASH> 100755
--- a/framework/directives/progress.js
+++ b/framework/directives/progress.js
@@ -6,6 +6,7 @@
* @description
* [en]A material design progress component. Can be displayed both as a linear or circular progress indicator.[/en]
* [ja]マテリアルデザインのprgoressコンポーネントです。linearもしくはcircularなプログレスインジケータを表示できます。[/ja]
+ * @codepen VvVaZv
* @example
* <ons-progress
* type="circular"
|
docs(ons-progress): Add CodePen sample.
|
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
index <HASH>..<HASH> 100644
--- a/src/_pytest/fixtures.py
+++ b/src/_pytest/fixtures.py
@@ -1021,6 +1021,7 @@ def fixture(scope="function", params=None, autouse=False, ids=None, name=None):
:arg params: an optional list of parameters which will cause multiple
invocations of the fixture function and all of the tests
using it.
+ The current parameter is available in ``request.param``.
:arg autouse: if True, the fixture func is activated for all tests that
can see it. If False (the default) then an explicit
|
doc: mention that pytest.fixture's param is in request.param
|
diff --git a/bugwarrior/services/github.py b/bugwarrior/services/github.py
index <HASH>..<HASH> 100644
--- a/bugwarrior/services/github.py
+++ b/bugwarrior/services/github.py
@@ -241,18 +241,18 @@ class GithubService(IssueService):
self.get_owned_repo_issues(user + "/" + repo['name'])
)
issues.update(self.get_directly_assigned_issues())
- log.name(self.target).debug(" Found {0} issues total.", len(issues))
+ log.name(self.target).debug(" Found {0} issues.", len(issues))
issues = filter(self.include, issues.values())
- log.name(self.target).debug(" Pruned down to {0} issues", len(issues))
+ log.name(self.target).debug(" Pruned down to {0} issues.", len(issues))
# Next, get all the pull requests (and don't prune by default)
repos = filter(self.filter_repos_for_prs, all_repos)
requests = sum([self._reqs(user + "/" + r['name']) for r in repos], [])
- log.name(self.target).debug(" Found {0} pull requests", len(requests))
+ log.name(self.target).debug(" Found {0} pull requests.", len(requests))
if self.filter_pull_requests:
requests = filter(self.include, requests)
log.name(self.target).debug(
- " Pruned down to {0} pull requests",
+ " Pruned down to {0} pull requests.",
len(requests)
)
|
Cleaning up log messages to be slightly more consistent.
|
diff --git a/mpldatacursor.py b/mpldatacursor.py
index <HASH>..<HASH> 100644
--- a/mpldatacursor.py
+++ b/mpldatacursor.py
@@ -237,13 +237,17 @@ class DataCursor(object):
if event.artist in self.annotations.values():
return
+ ax = event.artist.axes
# Get the pre-created annotation box for the axes or create a new one.
if self.display != 'multiple':
- annotation = self.annotations[event.artist.axes]
+ annotation = self.annotations[ax]
+ elif event.mouseevent in self.annotations:
+ # Avoid creating multiple datacursors for the same click event
+ # when several artists are selected.
+ annotation = self.annotations[event.mouseevent]
else:
- annotation = self.annotate(event.artist.axes,
- **self._annotation_kwargs)
- self.annotations[event.artist.axes] = annotation
+ annotation = self.annotate(ax, **self._annotation_kwargs)
+ self.annotations[event.mouseevent] = annotation
if self.display == 'single':
# Hide any other annotation boxes...
|
Fixed bug when multiple artists are selected with display="multiple".
|
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/commands.js b/bundles/org.eclipse.orion.client.ui/web/orion/commands.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/commands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/commands.js
@@ -220,7 +220,7 @@ define([
} else {
processKey(evt);
}
- };
+ }
function CommandsProxy() {
this._init();
@@ -649,7 +649,7 @@ define([
node.classList.add("dropdownMenuItem"); //$NON-NLS-0$
if (addCheck) {
var check = document.createElement("span"); //$NON-NLS-0$
- check.classList.add("check");
+ check.classList.add("check"); //$NON-NLS-0$
check.appendChild(document.createTextNode(choice.checked ? "\u25CF" : "")); //$NON-NLS-1$ //$NON-NLS-0$
node.appendChild(check);
}
|
cleanup warnings in commands.js
|
diff --git a/salesforce/backend/introspection.py b/salesforce/backend/introspection.py
index <HASH>..<HASH> 100644
--- a/salesforce/backend/introspection.py
+++ b/salesforce/backend/introspection.py
@@ -218,6 +218,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
if params['max_len'] > field['length']:
field['length'] = params['max_len']
del params['max_len']
+ optional_kw = {'collation': None} if DJANGO_32_PLUS else {}
# We prefer "length" over "byteLength" for "internal_size".
# (because strings have usually: byteLength == 3 * length)
result.append(FieldInfo( # type:ignore[call-arg] # problem with a conditional type
@@ -229,7 +230,9 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
field['scale'], # scale,
field['nillable'], # null_ok,
params.get('default'), # default
- params,
+ # 'collation' paramater is used only in Django >= 3.2. It is before 'params', but we pass it by **kw
+ params=params,
+ **optional_kw
))
return result
|
Fix introspection with Django <I>
|
diff --git a/tests/runnerTest.js b/tests/runnerTest.js
index <HASH>..<HASH> 100644
--- a/tests/runnerTest.js
+++ b/tests/runnerTest.js
@@ -388,6 +388,34 @@ describe('Runner process', function () {
}]);
});
});
+
+ describe('check test cases can be run through runner', function () {
+ var TestCase = require('../src/testCase');
+ it('should be possible to run a TestCase', function(done) {
+ var called = false;
+ var Case2 = TestCase.extend({
+ run: function (remote, desired, cb) {
+ called = true;
+ cb();
+ }
+ });
+
+ run({
+ skipCapabilitiesCheck: true,
+ browsers: [{
+ browserName: "chrome",
+ version: 'latest'
+ }],
+ after: function (err) {
+ assert.equal(err.message, 'Errors where catched for this run.');
+ done();
+ }
+ },
+ [
+ new Case2()
+ ]);
+ });
+ });
});
function setupConsoleResponse(statuscode) {
|
Add test to show that TestCase are not run through runner.
|
diff --git a/lib/SetupJelix16.php b/lib/SetupJelix16.php
index <HASH>..<HASH> 100644
--- a/lib/SetupJelix16.php
+++ b/lib/SetupJelix16.php
@@ -32,7 +32,16 @@ class SetupJelix16 {
$configDir = $this->parameters->getVarConfigDir();
// open the configuration file
- $iniFileName = $this->parameters->getConfigFileName();
+ // during upgrade of composer-module-setup, it seems Composer load some classes
+ // of the previous version (here ModuleSetup + JelixParameters), and load
+ // other classes (here SetupJelix16) after the upgrade. so API is not the one we expected.
+ // so we should check if the new method getConfigFileName is here
+ if (method_exists($this->parameters, 'getConfigFileName')) {
+ $iniFileName = $this->parameters->getConfigFileName();
+ }
+ else {
+ $iniFileName = 'localconfig.ini.php';
+ }
if (!$iniFileName) {
$iniFileName = 'localconfig.ini.php';
}
|
SetupJelix<I>: fix error during composer install about missing method
During the upgrade of composer-module-setup, some classes of the
previous version are already loaded and then may not contain new feature
or new api, expected by the classes loaded after the source update.
This why we add errors like Call to undefined method Jelix\ComposerPlugin\JelixParameters::getConfigFileName()
during composer install/update.
|
diff --git a/src/Model/NewsCategoryModel.php b/src/Model/NewsCategoryModel.php
index <HASH>..<HASH> 100644
--- a/src/Model/NewsCategoryModel.php
+++ b/src/Model/NewsCategoryModel.php
@@ -144,7 +144,7 @@ WHERE {$relation['reference_field']} IN (SELECT id FROM tl_news WHERE pid IN (".
// Determine the alias condition
if (is_numeric($idOrAlias)) {
$columns[] = "$t.id=?";
- $values[] = $idOrAlias;
+ $values[] = (int) $idOrAlias;
} else {
if (MultilingualHelper::isActive()) {
$columns[] = '(t1.alias=? OR t2.alias=?)';
@@ -152,7 +152,7 @@ WHERE {$relation['reference_field']} IN (SELECT id FROM tl_news WHERE pid IN (".
$values[] = $idOrAlias;
} else {
$columns[] = "$t.alias=?";
- $values[] = (int) $idOrAlias;
+ $values[] = $idOrAlias;
}
}
|
cast to int on correct variable …
|
diff --git a/openpnm/geometry/StickAndBall2D.py b/openpnm/geometry/StickAndBall2D.py
index <HASH>..<HASH> 100644
--- a/openpnm/geometry/StickAndBall2D.py
+++ b/openpnm/geometry/StickAndBall2D.py
@@ -175,7 +175,7 @@ class StickAndBall2D(GenericGeometry):
self.add_model(propname='pore.seed',
model=mods.misc.random,
element='pore',
- num_range=[0.5, 0.5],
+ num_range=[0.2, 0.7],
seed=None)
self.add_model(propname='pore.max_size',
|
Correct num_range of pore.seed model in 2D to be same as 3D class
|
diff --git a/public/js/core/tabExpander.js b/public/js/core/tabExpander.js
index <HASH>..<HASH> 100644
--- a/public/js/core/tabExpander.js
+++ b/public/js/core/tabExpander.js
@@ -80,7 +80,7 @@ var tabExpander = (function($, window){
var tabContainerWidthPx = totalHeaderWidthPx - ( leftMenuWidthPx + rightMenuWidthPx );
// tabContainerWidthPercent = 99 - ( leftMenuWidthPercent + rightMenuWidthPercent);
// tabContainerWidthPercent = 100.5 - ( leftMenuWidthPercent + rightMenuWidthPercent);
- tabContainerWidthPercent = 113.8 - ( leftMenuWidthPercent + rightMenuWidthPercent);
+ tabContainerWidthPercent = 113.5 - ( leftMenuWidthPercent + rightMenuWidthPercent);
// <ul>
navUlContainer = 1;
|
revision 2 on fixed issue: <I>
|
diff --git a/builder/osc/bsusurrogate/builder_acc_test.go b/builder/osc/bsusurrogate/builder_acc_test.go
index <HASH>..<HASH> 100644
--- a/builder/osc/bsusurrogate/builder_acc_test.go
+++ b/builder/osc/bsusurrogate/builder_acc_test.go
@@ -39,8 +39,7 @@ const testBuilderAccBasic = `
"device_name" : "/dev/xvdf",
"delete_on_vm_deletion" : false,
"volume_size" : 10,
- "iops": 300,
- "no_device": 0
+ "iops": 300
}
],
"omi_root_device":{
|
fix: typo in bsusurrogate acc test
|
diff --git a/modules/logging.js b/modules/logging.js
index <HASH>..<HASH> 100644
--- a/modules/logging.js
+++ b/modules/logging.js
@@ -11,7 +11,7 @@ module.exports = {
initMaster: function(config) {
var logStream = process.stdout;
- if(config.logging)
+ if(config.logging && config.logging.logFile)
logStream = fs.createWriteStream(config.logging.logFile, {'flags': 'a'});
process.on('msg:log', function(data) {
|
Fix running logging without logFile.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ See https://github.com/eandersson/amqp-storm for more information.
"""
setup(name='AMQP-Storm',
- version='1.0.4',
+ version='1.0.5',
description='Thread-safe Python AMQP Client Library based on pamqp.',
long_description=long_description,
author='Erik Olof Gunnar Andersson',
|
Bumping to <I> on pypi.
|
diff --git a/service/src/main/java/org/ops4j/pax/wicket/internal/injection/AbstractProxyTargetLocator.java b/service/src/main/java/org/ops4j/pax/wicket/internal/injection/AbstractProxyTargetLocator.java
index <HASH>..<HASH> 100644
--- a/service/src/main/java/org/ops4j/pax/wicket/internal/injection/AbstractProxyTargetLocator.java
+++ b/service/src/main/java/org/ops4j/pax/wicket/internal/injection/AbstractProxyTargetLocator.java
@@ -67,8 +67,8 @@ public abstract class AbstractProxyTargetLocator<Container> implements IProxyTar
throw new IllegalStateException("not possible", e);
}
if (references == null || references.length == 0) {
- throw new IllegalStateException(String.format("Found %s service references for %s; this is not OK...",
- references.length, bundleContext.getBundle().getSymbolicName()));
+ throw new IllegalStateException(String.format("Found zero service references for %s; this is not OK...",
+ bundleContext.getBundle().getSymbolicName()));
}
try {
Thread.currentThread().setContextClassLoader(parent.getClassLoader());
|
[PAXWICKET-<I>] NPE during bean resolvement failure handling
This one was an especially pitty one since the NPE was thrown during the creation
of the error message hiding the real problem. Many
|
diff --git a/lib/lesshint.js b/lib/lesshint.js
index <HASH>..<HASH> 100644
--- a/lib/lesshint.js
+++ b/lib/lesshint.js
@@ -133,7 +133,7 @@ Lesshint.prototype.getReporter = function (reporter) {
var reporterPath;
// Nothing defined, just fall back to our simple default
- if (!reporter) {
+ if (!reporter || reporter === 'default') {
reporterPath = path.resolve(__dirname, './reporters/default');
return require(reporterPath);
|
Allowed for 'default' reporter as explicit fallback (#<I>)
Fixes #<I>.
|
diff --git a/leveldb/storage/file_storage_unix.go b/leveldb/storage/file_storage_unix.go
index <HASH>..<HASH> 100644
--- a/leveldb/storage/file_storage_unix.go
+++ b/leveldb/storage/file_storage_unix.go
@@ -67,9 +67,14 @@ func isErrInvalid(err error) bool {
if err == os.ErrInvalid {
return true
}
+ // Go < 1.8
if syserr, ok := err.(*os.SyscallError); ok && syserr.Err == syscall.EINVAL {
return true
}
+ // Go >= 1.8 returns *os.PathError instead
+ if patherr, ok := err.(*os.PathError); ok && patherr.Err == syscall.EINVAL {
+ return true
+ }
return false
}
|
leveldb/storage: catch EINVAL on go >= <I> too (#<I>)
In go <I>, various functions were updated to return PathError instead.
This includes `os.File Sync()`.
For reference, the upstream commit which made this change is
<URL>
|
diff --git a/src/server/pps/server/api_server.go b/src/server/pps/server/api_server.go
index <HASH>..<HASH> 100644
--- a/src/server/pps/server/api_server.go
+++ b/src/server/pps/server/api_server.go
@@ -757,6 +757,8 @@ func (a *apiServer) CreatePipeline(ctx context.Context, request *ppsclient.Creat
return nil, fmt.Errorf("pipeline %v already exists", request.Pipeline.Name)
}
+ setDefaultPipelineInputMethod(request.Inputs)
+
if request.Pipeline == nil {
return nil, fmt.Errorf("pachyderm.ppsclient.pipelineserver: request.Pipeline cannot be nil")
}
|
Didn't mean to remove this line
|
diff --git a/config.js b/config.js
index <HASH>..<HASH> 100644
--- a/config.js
+++ b/config.js
@@ -160,6 +160,7 @@ module.exports = {
comments: /^!|@preserve|@license|@cc_on/i
}
},
+ sourcemaps: true,
folders: ['js', 'ts'],
ignoreList: []
},
diff --git a/pumps/uglify.js b/pumps/uglify.js
index <HASH>..<HASH> 100644
--- a/pumps/uglify.js
+++ b/pumps/uglify.js
@@ -7,7 +7,7 @@ module.exports = {
return [
config.uglify.sourcemaps ? sourcemaps.init() : noop(),
uglify(config.uglify.options),
- config.uglify.sourcemaps ? sourcemaps.write() : noop()
+ config.uglify.sourcemaps ? sourcemaps.write('./') : noop()
];
}
};
\ No newline at end of file
|
write js maps to js build directory by default
|
diff --git a/src/js/build-html.js b/src/js/build-html.js
index <HASH>..<HASH> 100644
--- a/src/js/build-html.js
+++ b/src/js/build-html.js
@@ -145,7 +145,7 @@ module.exports = function(options) {
&& document.querySelector(options.tocSelector) !== null
&& headings.length > 0) {
some.call(headings, function(heading, i) {
- if (heading.offsetTop > top + options.headingsOffset) {
+ if (heading.offsetTop > top + options.headingsOffset + 1) {
// Don't allow negative index value.
var index = (i === 0) ? i : i - 1;
topHeader = headings[index];
|
Make current section highlighted instead of previous (#<I>)
When I go directly to a link, it highlights the link before the
one I am visiting. I put some console.log() statements in and it looks
like it's some sub-pixel rounding problem?
I experience the issue on my own site and also the official tocbot
docs page, in both chromium and firefox (on linux). This patch fixes
the issue for my site in both browsers.
|
diff --git a/src/SleepingOwl/Models/Traits/ModelWithImageOrFileFieldsTrait.php b/src/SleepingOwl/Models/Traits/ModelWithImageOrFileFieldsTrait.php
index <HASH>..<HASH> 100644
--- a/src/SleepingOwl/Models/Traits/ModelWithImageOrFileFieldsTrait.php
+++ b/src/SleepingOwl/Models/Traits/ModelWithImageOrFileFieldsTrait.php
@@ -243,7 +243,7 @@ trait ModelWithImageOrFileFieldsTrait
}
}
}
- if (preg_match('/get(?<field>[a-zA-Z]+)Attribute/', $method, $attr))
+ if (preg_match('/get(?<field>[a-zA-Z0-9]+)Attribute/', $method, $attr))
{
$fields = [Str::lower($attr['field']), Str::camel($attr['field']), Str::snake($attr['field'])];
foreach ($fields as $field)
|
Fix: file fields were not working for field names containing numbers
|
diff --git a/tests/integration/pybaseball/test_statcast_batter.py b/tests/integration/pybaseball/test_statcast_batter.py
index <HASH>..<HASH> 100644
--- a/tests/integration/pybaseball/test_statcast_batter.py
+++ b/tests/integration/pybaseball/test_statcast_batter.py
@@ -4,13 +4,13 @@ from pybaseball.statcast_batter import statcast_batter, statcast_batter_exitvelo
def test_statcast_batter_exitvelo_barrels() -> None:
- result: pd.DataFrame = statcast_batter_exitvelo_barrels(2019)
+ result: pd.DataFrame = statcast_batter_exitvelo_barrels(2019, 250)
assert result is not None
assert not result.empty
assert len(result.columns) == 19
- assert len(result) == 135
+ assert len(result) == 175
def test_statcast_batter() -> None:
|
Fix statcast exitvelo tests, and use our own qualifier (#<I>)
|
diff --git a/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js b/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js
index <HASH>..<HASH> 100644
--- a/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js
+++ b/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js
@@ -212,7 +212,8 @@ class Nav extends BaseComponent {
if (
e.target.closest('.pl-c-nav') === null &&
e.target.closest('.pl-js-nav-trigger') === null &&
- e.target.closest('svg') === null
+ e.target.closest('svg') === null &&
+ e.target.closest('pl-toggle-layout') === null
) {
self.cleanupActiveNav();
}
|
fix: don't auto-close nav when clicking on a nav toggle
|
diff --git a/lib/service.js b/lib/service.js
index <HASH>..<HASH> 100644
--- a/lib/service.js
+++ b/lib/service.js
@@ -1914,6 +1914,15 @@
var entityNamespace = utils.namespaceFromProperties(props);
return new root.AlertGroup(this.service, props.name, entityNamespace);
},
+
+ /**
+ * Suppress removing alerts via the fired alerts endpoint.
+ *
+ * @method splunkjs.Service.FiredAlerts
+ */
+ remove: function() {
+ throw new Error("To remove an alert, remove the saved search with the same name.");
+ },
/**
* Constructor for `splunkjs.Service.FiredAlerts`.
@@ -1932,6 +1941,7 @@
this._super(service, this.path(), namespace);
this.instantiateEntity = utils.bind(this, this.instantiateEntity);
+ this.remove = utils.bind(this, this.remove);
}
});
|
Suppress remove for firedAlerts
|
diff --git a/wulaphp/router/DefaultDispatcher.php b/wulaphp/router/DefaultDispatcher.php
index <HASH>..<HASH> 100644
--- a/wulaphp/router/DefaultDispatcher.php
+++ b/wulaphp/router/DefaultDispatcher.php
@@ -33,7 +33,7 @@ class DefaultDispatcher implements IURLDispatcher {
public function dispatch($url, $router, $parsedInfo) {
//检测请求是否合法
$strict_mode = @constant('URL_STRICT_MODE');
- if (($strict_mode || is_null($strict_mode)) && substr($router->requestURI, -1, 1) == '/') {
+ if (($strict_mode || is_null($strict_mode)) && $router->requestURI != '/' && substr($router->requestURI, -1, 1) == '/') {
return null;
}
|
Fix "/" url cannot route bug
|
diff --git a/aiida_codtools/cli/misc/cif_import.py b/aiida_codtools/cli/misc/cif_import.py
index <HASH>..<HASH> 100644
--- a/aiida_codtools/cli/misc/cif_import.py
+++ b/aiida_codtools/cli/misc/cif_import.py
@@ -43,7 +43,7 @@ from aiida.utils.cli import options
help='Optional API url for the database'
)
@click.option(
- '-a', '--importer-api-key', type=click.STRING, required=False,
+ '-k', '--importer-api-key', type=click.STRING, required=False,
help='Optional API key for the database'
)
@click.option(
|
Rename API key flag to -k for cif import launch script
The -a flag should usually be reserved for something like --all
|
diff --git a/lib/puppet/pops/validation/checker3_1.rb b/lib/puppet/pops/validation/checker3_1.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/pops/validation/checker3_1.rb
+++ b/lib/puppet/pops/validation/checker3_1.rb
@@ -260,15 +260,12 @@ class Puppet::Pops::Validation::Checker3_1
top(o.eContainer, o)
end
- # Asserts that value is a valid QualifiedName. No additional checking is made, objects that use
- # a QualifiedName as a name should check the validity - this since a QualifiedName is used as a BARE WORD
- # and then additional chars may be valid (like a hyphen).
+ # No checking takes place - all expressions using a QualifiedName need to check. This because the
+ # rules are slightly different depending on the container (A variable allows a numeric start, but not
+ # other names). This means that (if the lexer/parser so chooses) a QualifiedName
+ # can be anything when it represents a Bare Word and evaluates to a String.
#
def check_QualifiedName(o)
- # Is this a valid qualified name?
- if o.value !~ Puppet::Pops::Patterns::NAME
- acceptor.accept(Issues::ILLEGAL_NAME, o, {:name=>o.value})
- end
end
# Checks that the value is a valid UpperCaseWord (a CLASSREF), and optionally if it contains a hypen.
|
(PUP-<I>) Make future parser accept $_private
This removes validation of QualifiedName (they must be validated
differently depending on where they appear). Variables were bit
by this too restrictive validation rule.
|
diff --git a/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php b/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php
index <HASH>..<HASH> 100644
--- a/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php
@@ -402,7 +402,11 @@ class UsersController extends AbstractModuleController
});
$roles = $this->userService->currentUserIsAdministrator() ? $this->policyService->getRoles() : $currentUserRoles;
- sort($roles);
+
+ usort($roles, static function (Role $a, Role $b) {
+ return strcmp($a->getName(), $b->getName());
+ });
+
return $roles;
}
|
TASK: Correctly sort roles by name
|
diff --git a/slacker/__init__.py b/slacker/__init__.py
index <HASH>..<HASH> 100644
--- a/slacker/__init__.py
+++ b/slacker/__init__.py
@@ -600,7 +600,7 @@ class Files(BaseAPI):
}
if file_:
- if type(file_) in types.StringTypes:
+ if isinstance(file_, str):
file_ = open(file_, 'rb')
return self.post('files.upload', data=data, files={'file': file_})
else:
|
Replace `types.StringTypes` with `isinstance`
As `types.StringTypes` is not available in Python 3+
|
diff --git a/examples/language-modeling/run_clm.py b/examples/language-modeling/run_clm.py
index <HASH>..<HASH> 100644
--- a/examples/language-modeling/run_clm.py
+++ b/examples/language-modeling/run_clm.py
@@ -102,8 +102,8 @@ class DataTrainingArguments:
default=None,
metadata={"help": "An optional input evaluation data file to evaluate the perplexity on (a text file)."},
)
- block_size: int = field(
- default=-1,
+ block_size: Optional[int] = field(
+ default=None,
metadata={
"help": "Optional input sequence length after tokenization."
"The training dataset will be truncated in block of this size for training."
@@ -261,8 +261,14 @@ def main():
load_from_cache_file=not data_args.overwrite_cache,
)
- if data_args.block_size <= 0:
+ if data_args.block_size is None:
block_size = tokenizer.model_max_length
+ if block_size > 1024:
+ logger.warn(
+ f"The tokenizer picked seems to have a very large `model_max_length` ({tokenizer.model_max_length}). "
+ "Picking 1024 instead. You can change that default value by passing --block_size xxx."
+ )
+ block_size = 1024
else:
if data_args.block_size > tokenizer.model_max_length:
logger.warn(
|
Small fix to the run clm script (#<I>)
|
diff --git a/lib/extensions/mspec/mspec/runner/mspec.rb b/lib/extensions/mspec/mspec/runner/mspec.rb
index <HASH>..<HASH> 100644
--- a/lib/extensions/mspec/mspec/runner/mspec.rb
+++ b/lib/extensions/mspec/mspec/runner/mspec.rb
@@ -6,6 +6,7 @@ module MSpec
#RHO
@count = 0
@exc_count = 0
+ @exc_locations = []
#RHO
@exit = nil
@@ -43,6 +44,10 @@ module MSpec
def self.count
@count
end
+
+ def self.exc_locations
+ @exc_locations
+ end
#RHO
def self.describe(mod, options=nil, &block)
@@ -63,6 +68,7 @@ module MSpec
#RHO
@count = 0
@exc_count = 0
+ @exc_locations = []
#RHO
STDOUT.puts RUBY_DESCRIPTION
@@ -133,6 +139,7 @@ module MSpec
#RHO
puts "FAIL: #{current} - #{exc.message}\n" + (@backtrace ? exc.backtrace.join("\n") : "")
+ @exc_locations << { 'message' => exc.message, 'backtrace' => exc.backtrace }
@exc_count+=1
#RHO
|
include fail locations info into mspec results
|
diff --git a/src/main/java/com/linuxense/javadbf/DBFWriter.java b/src/main/java/com/linuxense/javadbf/DBFWriter.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/linuxense/javadbf/DBFWriter.java
+++ b/src/main/java/com/linuxense/javadbf/DBFWriter.java
@@ -155,9 +155,12 @@ public class DBFWriter extends DBFBase implements java.io.Closeable {
this.header.read(this.raf, charset);
setCharset(this.header.getUsedCharset());
- /* position file pointer at the end of the raf */
+ // position file pointer at the end of the raf
// to ignore the END_OF_DATA byte at EoF
- this.raf.seek(this.raf.length() - 1);
+ // only if there are records,
+ if (this.raf.length() > header.headerLength) {
+ this.raf.seek(this.raf.length() - 1);
+ }
} catch (FileNotFoundException e) {
throw new DBFException("Specified file is not found. " + e.getMessage(), e);
} catch (IOException e) {
|
Fix bug writting in "Sync Mode" to files with only the header
|
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb b/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb
@@ -76,12 +76,6 @@ module ActiveRecord
select_values("SELECT * FROM TABLE(DBMS_XPLAN.DISPLAY)", "EXPLAIN").join("\n")
end
- # Returns an array of arrays containing the field values.
- # Order is the same as that returned by #columns.
- def select_rows(sql, name = nil, binds = [])
- exec_query(sql, name, binds).rows
- end
-
# New method in ActiveRecord 3.1
# Will add RETURNING clause in case of trigger generated primary keys
def sql_for_insert(sql, pk, id_value, sequence_name, binds)
|
Use Abstract `select_rows(arel, name = nil, binds = [])`
Refer rails/rails#<I>
|
diff --git a/primus.js b/primus.js
index <HASH>..<HASH> 100644
--- a/primus.js
+++ b/primus.js
@@ -458,7 +458,7 @@ Primus.prototype.initialise = function initialise(options) {
}
primus.latency = +new Date() - start;
- primus.timers.clear('ping, pong');
+ primus.timers.clear('ping', 'pong');
primus.heartbeat();
if (primus.buffer.length) {
|
[fix] Undo the broken clear.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -136,7 +136,7 @@ _recommended = [
'datashader',
'geopandas',
'gdal', 'libgdal', # TODO: doesn't gdal depend on libgdal? remove?
- 'netcdf4', # TODO: currently needed for libgdal on defaults (but not c-f)
+ 'netcdf4 <1.4.0', # TODO: currently needed for libgdal on defaults (but not c-f)
'jupyter',
'matplotlib',
'pandas',
|
Pinned netcdf to avoid netcdftime errors
|
diff --git a/web/static/js/controllers/DeployWizard.js b/web/static/js/controllers/DeployWizard.js
index <HASH>..<HASH> 100644
--- a/web/static/js/controllers/DeployWizard.js
+++ b/web/static/js/controllers/DeployWizard.js
@@ -153,7 +153,15 @@ function DeployWizard($scope, resourcesService) {
};
$scope.wizard_finish = function() {
+
+ closeModal = function(){
+ $('#addApp').modal('hide');
+ $("#deploy-save-button").removeAttr("disabled");
+ resetStepPage();
+ }
+
$("#deploy-save-button").toggleClass('active');
+ $("#deploy-save-button").attr("disabled", "disabled");
nextClicked = true;
if ($scope.steps[step].validate) {
@@ -192,12 +200,8 @@ function DeployWizard($scope, resourcesService) {
}
});
- $('#addApp').modal('hide');
- resetStepPage();
- }, function(result){
- $('#addApp').modal('hide');
- resetStepPage();
- }
+ closeModal();
+ }, closeModal
);
}
|
refactor close modal and disable save button after it's clicked.
|
diff --git a/lib/geos_extensions.rb b/lib/geos_extensions.rb
index <HASH>..<HASH> 100644
--- a/lib/geos_extensions.rb
+++ b/lib/geos_extensions.rb
@@ -16,7 +16,7 @@ module Geos
autoload :ActiveRecord, File.join(GEOS_EXTENSIONS_BASE, 'active_record_extensions')
autoload :GoogleMaps, File.join(GEOS_EXTENSIONS_BASE, 'google_maps')
- REGEXP_WKT = /^(?:SRID=([0-9]+);)?(\s*[PLMCG].+)/i
+ REGEXP_WKT = /^(?:SRID=(-?[0-9]+);)?(\s*[PLMCG].+)/i
REGEXP_WKB_HEX = /^[A-Fa-f0-9\s]+$/
REGEXP_G_LAT_LNG_BOUNDS = /^
\(
|
Allow for negative SRIDs.
|
diff --git a/addons/batikvis/src/main/java/de/lmu/ifi/dbs/elki/visualization/VisualizerParameterizer.java b/addons/batikvis/src/main/java/de/lmu/ifi/dbs/elki/visualization/VisualizerParameterizer.java
index <HASH>..<HASH> 100644
--- a/addons/batikvis/src/main/java/de/lmu/ifi/dbs/elki/visualization/VisualizerParameterizer.java
+++ b/addons/batikvis/src/main/java/de/lmu/ifi/dbs/elki/visualization/VisualizerParameterizer.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2014
+ Copyright (C) 2015
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -95,8 +95,6 @@ public class VisualizerParameterizer {
* These are {@code *.properties} files in the package
* {@link de.lmu.ifi.dbs.elki.visualization.style}.
* </p>
- *
- *
*/
public static final OptionID STYLELIB_ID = new OptionID("visualizer.stylesheet", "Style properties file to use, included properties: classic, default, greyscale, neon, presentation, print");
|
Minimize changes here, too.
|
diff --git a/src/Adapter/Sqlite.php b/src/Adapter/Sqlite.php
index <HASH>..<HASH> 100644
--- a/src/Adapter/Sqlite.php
+++ b/src/Adapter/Sqlite.php
@@ -22,7 +22,12 @@ class Sqlite extends DabbleAdapter
$password = null,
array $options = []
) {
- return parent::__construct("sqlite:$d", $n, $p, $o);
+ return parent::__construct(
+ "sqlite:$dsn",
+ $username,
+ $password,
+ $ooptions
+ );
}
public function value($value, &$bind)
|
ehm, renamed
|
diff --git a/lib/sunspot/queue/helpers.rb b/lib/sunspot/queue/helpers.rb
index <HASH>..<HASH> 100644
--- a/lib/sunspot/queue/helpers.rb
+++ b/lib/sunspot/queue/helpers.rb
@@ -7,7 +7,7 @@ module Sunspot::Queue
# Pop off the queueing proxy for the block if it's in place so we don't
# requeue the same job multiple times.
- if Sunspot.session.instance_of?(SessionProxy)
+ if Sunspot.session.is_a?(SessionProxy)
proxy = Sunspot.session
Sunspot.session = proxy.session
end
|
Allow subclasses of Sunspot::Queue::SessionProxy in without_proxy helper
To be able to customize the behaviour of the SessionProxy in your own
application, you should be able to subclass it. This changes the
without_proxy helper method to allow subclasses as well.
|
diff --git a/spec/uploader/direct_url_spec.rb b/spec/uploader/direct_url_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/uploader/direct_url_spec.rb
+++ b/spec/uploader/direct_url_spec.rb
@@ -28,7 +28,7 @@ describe CarrierWaveDirect::Uploader::DirectUrl do
end
context "#key is set to '#{sample(:path_with_escaped_chars)}'" do
- before { subject.key = escaped_path }
+ before { subject.key = sample(:path_with_escaped_chars) }
it "should return the full url with '/#{sample(:path_with_escaped_chars)}' as the path" do
direct_fog_url = CarrierWave::Storage::Fog::File.new(
|
Update for removal of let() helper
|
diff --git a/src/DebugBar/Resources/widgets.js b/src/DebugBar/Resources/widgets.js
index <HASH>..<HASH> 100644
--- a/src/DebugBar/Resources/widgets.js
+++ b/src/DebugBar/Resources/widgets.js
@@ -48,7 +48,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
*/
var highlight = PhpDebugBar.Widgets.highlight = function(code, lang) {
if (typeof(code) === 'string') {
- if (!hljs) {
+ if (typeof(hljs) === 'undefined') {
return htmlize(code);
}
if (lang) {
@@ -57,7 +57,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
return hljs.highlightAuto(code).value;
}
- if (hljs) {
+ if (typeof(hljs) === 'object') {
code.each(function(i, e) { hljs.highlightBlock(e); });
}
return code;
|
Check if hljs is defined
Really fixes #<I> and #<I>
|
diff --git a/tests/db/fields_test.py b/tests/db/fields_test.py
index <HASH>..<HASH> 100644
--- a/tests/db/fields_test.py
+++ b/tests/db/fields_test.py
@@ -162,3 +162,12 @@ class OqNullBooleanFieldTestCase(unittest.TestCase):
for fc in false_cases:
self.assertEqual(False, field.to_python(fc))
+
+
+class NullFloatFieldTestCase(unittest.TestCase):
+
+ def test_get_prep_value_empty_str(self):
+ field = fields.NullFloatField()
+ self.assertIsNone(field.get_prep_value(''))
+ self.assertIsNone(field.get_prep_value(' '))
+ self.assertIsNone(field.get_prep_value('\t'))
|
tests/db/fields_test:
Added tests for NullFloatField.
|
diff --git a/pyvista/utilities/reader.py b/pyvista/utilities/reader.py
index <HASH>..<HASH> 100644
--- a/pyvista/utilities/reader.py
+++ b/pyvista/utilities/reader.py
@@ -1223,7 +1223,7 @@ class CGNSReader(BaseReader, PointCellDataSelection):
"""Return or set using an unsteady pattern.
When set to ``True`` (default is ``False``), the reader will try to
- determine to determine FlowSolution_t nodes to read with a pattern
+ determine FlowSolution_t nodes to read with a pattern
matching This can be useful for unsteady solutions when
FlowSolutionPointers are not reliable.
|
Fix typo (#<I>)
|
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index <HASH>..<HASH> 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -161,8 +161,21 @@ class SetupController extends AbstractBaseController
return $this->step3DatabaseType($data);
}
- if ($data['dbtype'] === 'sqlite' && $data['dbname'] === '') {
- $data['dbname'] ='webtrees';
+ switch ($data['dbtype']) {
+ case 'sqlite':
+ $data['warnings'][] = I18N::translate('SQLite is only suitable for small sites, testing and evaluation.');
+ if ($data['dbname'] === '') {
+ $data['dbname'] ='webtrees';
+ }
+ break;
+ case 'pgsql':
+ $data['warnings'][] = I18N::translate('Support for PostgreSQL is experimental.\') . \' \' . I18N::translate(\'Please report any problems to the developers.');
+ break;
+
+ case 'sqlsvr':
+ $data['warnings'][] = I18N::translate('Support for SQL Server is experimental.') . ' ' . I18N::translate('Please report any problems to the developers.');
+ break;
+
}
return $this->viewResponse('setup/step-4-database-' . $data['dbtype'], $data);
|
Add warnings for PostgreSQL and SQL Server
|
diff --git a/evergreen/core/utils.py b/evergreen/core/utils.py
index <HASH>..<HASH> 100644
--- a/evergreen/core/utils.py
+++ b/evergreen/core/utils.py
@@ -54,7 +54,7 @@ class Result(object):
if self._exc == self._value == Null:
self._cond.wait()
if self._exc != Null:
- raise exc
+ raise self._exc
assert self._value != Null
return self._value
finally:
|
Fixed raising exception in Result.get
|
diff --git a/lib/instana/version.rb b/lib/instana/version.rb
index <HASH>..<HASH> 100644
--- a/lib/instana/version.rb
+++ b/lib/instana/version.rb
@@ -1,4 +1,4 @@
module Instana
- VERSION = "1.10.4"
+ VERSION = "1.10.5"
VERSION_FULL = "instana-#{VERSION}"
end
|
Bump gem version to <I>
|
diff --git a/src/AbstractUri.php b/src/AbstractUri.php
index <HASH>..<HASH> 100644
--- a/src/AbstractUri.php
+++ b/src/AbstractUri.php
@@ -290,7 +290,7 @@ abstract class AbstractUri implements UriInterface
*
* @since 1.0
*/
- public function isSSL()
+ public function isSsl()
{
return $this->getScheme() == 'https' ? true : false;
}
|
[codestyle] Fixed first letter casing in method names
|
diff --git a/recipe/laravel.php b/recipe/laravel.php
index <HASH>..<HASH> 100644
--- a/recipe/laravel.php
+++ b/recipe/laravel.php
@@ -8,7 +8,13 @@
require_once __DIR__ . '/common.php';
// Laravel shared dirs
-set('shared_dirs', ['storage']);
+set('shared_dirs', [
+ 'storage/app',
+ 'storage/framework/cache',
+ 'storage/framework/sessions',
+ 'storage/framework/views',
+ 'storage/framework/logs',
+]);
// Laravel 5 shared file
set('shared_files', ['.env']);
|
Updated laravel shared dirs
|
diff --git a/IndexSchema.php b/IndexSchema.php
index <HASH>..<HASH> 100644
--- a/IndexSchema.php
+++ b/IndexSchema.php
@@ -1,7 +1,7 @@
<?php
/**
* @link http://www.yiiframework.com/
- * @copyright Copyright © 2008-2011 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
|
fixed file PHPdoc
issue #<I>
|
diff --git a/app/controllers/para/admin/resources_controller.rb b/app/controllers/para/admin/resources_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/para/admin/resources_controller.rb
+++ b/app/controllers/para/admin/resources_controller.rb
@@ -49,7 +49,7 @@ module Para
def destroy
resource.destroy
flash_message(:success, resource)
- redirect_to @component.path
+ redirect_to after_form_submit_path
end
def order
diff --git a/lib/para/markup/resources_table.rb b/lib/para/markup/resources_table.rb
index <HASH>..<HASH> 100644
--- a/lib/para/markup/resources_table.rb
+++ b/lib/para/markup/resources_table.rb
@@ -169,7 +169,7 @@ module Para
end
def delete_button(resource)
- path = component.relation_path(resource)
+ path = component.relation_path(resource, return_to: view.request.fullpath)
options = {
method: :delete,
@@ -178,7 +178,7 @@ module Para
},
class: 'btn btn-sm btn-icon-danger btn-shadow hint--left',
aria: {
- label: ::I18n.t('para.shared.destroy')
+ label: ::I18n.t('para.shared.destroy')
}
}
|
make resource deletion return to the referer page instead of table index
|
diff --git a/Swat/SwatCascadeFlydown.php b/Swat/SwatCascadeFlydown.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatCascadeFlydown.php
+++ b/Swat/SwatCascadeFlydown.php
@@ -195,7 +195,7 @@ class SwatCascadeFlydown extends SwatFlydown
protected function getParentValue()
{
return ($this->cascade_from instanceof SwatFlydown) ?
- $this->cascade_from->value : 'null';
+ $this->cascade_from->value : null;
}
// }}}
|
not sure what possesed me to return null as a string. This was only broken for one commit, and no releases.
svn commit r<I>
|
diff --git a/src/transformers/generation_logits_process.py b/src/transformers/generation_logits_process.py
index <HASH>..<HASH> 100644
--- a/src/transformers/generation_logits_process.py
+++ b/src/transformers/generation_logits_process.py
@@ -354,7 +354,7 @@ class NoBadWordsLogitsProcessor(LogitsProcessor):
The id of the `end-of-sequence` token.
"""
- def __init__(self, bad_words_ids: Iterable[Iterable[int]], eos_token_id: int):
+ def __init__(self, bad_words_ids: List[List[int]], eos_token_id: int):
if not isinstance(bad_words_ids, List) or len(bad_words_ids) == 0:
raise ValueError(f"`bad_words_ids` has to be a non-emtpy list, but is {bad_words_ids}.")
|
Update typing in generation_logits_process.py (#<I>)
While `Iterable[Iterable[int]]` is a nicer annotation (it's covariant!), the defensive statements parsing out `bad_words_ids` in `__init__(...)` force the caller to pass in `List[List[int]]`. I've changed the annotation to make that clear.
|
diff --git a/test/test.load.js b/test/test.load.js
index <HASH>..<HASH> 100644
--- a/test/test.load.js
+++ b/test/test.load.js
@@ -68,4 +68,14 @@ describe(".load([callback])", function () {
it('should initially load in editor mode', function () {
expect(editor.getElement('editorIframe').style.display).to.be('block');
});
+
+ it('should open preview mode if preview mode was the last mode it was on before unloading', function () {
+ editor.preview();
+ expect(editor.getElement('editorIframe').style.display).to.be('none');
+ expect(editor.getElement('previewerIframe').style.display).to.be('block');
+ editor.unload();
+ editor.load();
+ expect(editor.getElement('editorIframe').style.display).to.be('none');
+ expect(editor.getElement('previewerIframe').style.display).to.be('block');
+ });
});
|
Ticket #<I> - Added test to make sure preview state is retained.
|
diff --git a/library/src/net/simonvt/widget/MenuDrawer.java b/library/src/net/simonvt/widget/MenuDrawer.java
index <HASH>..<HASH> 100644
--- a/library/src/net/simonvt/widget/MenuDrawer.java
+++ b/library/src/net/simonvt/widget/MenuDrawer.java
@@ -1060,6 +1060,7 @@ public abstract class MenuDrawer extends ViewGroup {
switch (action) {
case MotionEvent.ACTION_DOWN: {
mLastMotionX = mInitialMotionX = ev.getX();
+ mLastMotionY = ev.getY();
final boolean allowDrag = onDownAllowDrag(ev);
if (allowDrag) {
|
Fix touch handling when the drawer is open.
|
diff --git a/javascript/extensible-search-suggestions.js b/javascript/extensible-search-suggestions.js
index <HASH>..<HASH> 100644
--- a/javascript/extensible-search-suggestions.js
+++ b/javascript/extensible-search-suggestions.js
@@ -11,6 +11,10 @@
var search = $(this);
var URL = search.parents('form').attr('action').replace('getForm', 'getSuggestions');
search.autocomplete({
+
+ // Enforce a minimum autocomplete length.
+
+ minLength: 3,
source: function(request, response) {
$.get(URL, {
term: request.term
@@ -18,11 +22,7 @@
.success(function(data) {
response(data);
});
- },
-
- // Enforce a minimum autocomplete length.
-
- minLength: 3
+ }
});
}
});
|
Minor update to the suggestions javascript.
|
diff --git a/txproductpages/tests/test_txproductpages.py b/txproductpages/tests/test_txproductpages.py
index <HASH>..<HASH> 100644
--- a/txproductpages/tests/test_txproductpages.py
+++ b/txproductpages/tests/test_txproductpages.py
@@ -19,7 +19,7 @@ class _ReleaseTestResource(Resource):
def _fixture(self, url):
""" Return path to our static fixture file. """
- filename = url.replace('/pp-admin/api/v1', FIXTURES_DIR)
+ filename = url.replace('/pp/api/v6', FIXTURES_DIR)
# If we need to represent this API endpoint as both a directory and a
# file, check for a ".body" file.
if os.path.isdir(filename):
|
tests: correct endpoint when loading fixtures
When loading the fixture files, I was expecting the URL to be a very old
URL scheme that I no longer use.
Update the tests to use the latest URL pattern, so we load from the
correct fixture file path.
|
diff --git a/src/de/lmu/ifi/dbs/elki/math/statistics/distribution/GeneralizedLogisticDistribution.java b/src/de/lmu/ifi/dbs/elki/math/statistics/distribution/GeneralizedLogisticDistribution.java
index <HASH>..<HASH> 100644
--- a/src/de/lmu/ifi/dbs/elki/math/statistics/distribution/GeneralizedLogisticDistribution.java
+++ b/src/de/lmu/ifi/dbs/elki/math/statistics/distribution/GeneralizedLogisticDistribution.java
@@ -25,11 +25,13 @@ package de.lmu.ifi.dbs.elki.math.statistics.distribution;
import java.util.Random;
/**
- * Generalized logistic distribution. (Type I, skew-logistic distribution)
+ * Generalized logistic distribution. (Type I, Skew-logistic distribution)
*
* One of multiple ways of generalizing the logistic distribution.
*
- * {@code f(x) = shape * Math.exp(-x) / (1 + Math.exp(-x))**(shape+1)}
+ * {@code pdf(x) = shape * Math.exp(-x) / (1 + Math.exp(-x))**(shape+1)}
+ *
+ * {@code cdf(x) = Math.pow(1+Math.exp(-x), -shape)}
*
* Where {@code shape=1} yields the regular logistic distribution.
*
|
also mention cdf, to avoid confusions.
|
diff --git a/molo/commenting/wagtail_hooks.py b/molo/commenting/wagtail_hooks.py
index <HASH>..<HASH> 100644
--- a/molo/commenting/wagtail_hooks.py
+++ b/molo/commenting/wagtail_hooks.py
@@ -79,8 +79,8 @@ class MoloCommentsModelAdmin(ModelAdmin, MoloCommentAdmin):
def content(self, obj, *args, **kwargs):
if obj.content_object and obj.parent is None:
return (
- '<a href="/admin/pages/{0}/edit/">{1}</a>'
- .format(obj.content_object.pk, obj.content_object.title))
+ '<a href="{0}" target="_blank">{1}</a>'
+ .format(obj.content_object.url, obj.content_object.title))
return
content.allow_tags = True
|
changed article link to go to frontend page
|
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
@@ -247,6 +247,8 @@ class TestParse(unittest.TestCase):
bad_blocks = (
"Group = name bob = uncle END_OBJECT",
"GROUP= name = bob = uncle END_GROUP",
+ "OBJECT = L1 V = 123 END_OBJECT = bad",
+ "OBJECT = L1 OBJECT = L2 V = 123 END_OBJECT = bad END_OBJECT = L1"
"",
)
for b in bad_blocks:
|
test(test_parser.py): Added a nested set of agg blocks that should raise cleanly, but don't. Issue <I>.
|
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index <HASH>..<HASH> 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -299,7 +299,7 @@ const TryOut = props => {
return (
<Container
padding={['bottom', 'top']}
- background="highlight"
+ background="dark"
align={'center'}
id="try">
<div className="productShowcaseSection paddingBottom">
diff --git a/website/siteConfig.js b/website/siteConfig.js
index <HASH>..<HASH> 100644
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -96,7 +96,7 @@ const siteConfig = {
zIndex: 1000
},
- editUrl: 'https://github.com/JKHeadley/rest-hapi-docs/tree/master/docs/'
+ editUrl: 'https://github.com/JKHeadley/rest-hapi/tree/master/docs/'
// You may provide arbitrary config keys to be used as needed by your
// template. For example, if you need your repo's URL...
// repoUrl: 'https://github.com/facebook/test-site',
|
- Fixed edit url
- Changed try it out background
|
diff --git a/umap/spectral.py b/umap/spectral.py
index <HASH>..<HASH> 100644
--- a/umap/spectral.py
+++ b/umap/spectral.py
@@ -84,8 +84,6 @@ def component_layout(
for label in range(n_components):
component_centroids[label] = data[component_labels == label].mean(axis=0)
- print(metric)
-
if metric in SPECIAL_METRICS:
distance_matrix = pairwise_special_metric(
component_centroids, metric=metric
|
Remove unrequired print introduced while debugging #<I>
|
diff --git a/lib/directive_record/query/sql.rb b/lib/directive_record/query/sql.rb
index <HASH>..<HASH> 100644
--- a/lib/directive_record/query/sql.rb
+++ b/lib/directive_record/query/sql.rb
@@ -196,12 +196,13 @@ SQL
regexp, aliases = /^\S+/, options[:aliases].invert
where, having = (options[:where] || []).partition do |statement|
+ !options[:aggregated].keys.include?(statement.strip.match(regexp).to_s) &&
statement.gsub(/((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1/, " ")
.split(/\b(and|or)\b/i).reject{|sql| %w(and or).include? sql.downcase}
.collect{|sql| sql = sql.strip; (sql[0] == "(" && sql[-1] == ")" ? sql[1..-1] : sql)}
.all? do |sql|
sql.match /(.*)\s*(=|<=>|>=|>|<=|<|<>|!=|is|like|rlike|regexp|in|between|not|sounds|soundex)(\b|\s|$)/i
- path = $1.strip rescue binding.pry
+ path = $1.strip
!(aliases[path] || path).match(/\b(count|sum|min|max|avg)\(/i)
end
end
|
So auto-applying aggregate method for paths within conditions
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.