diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/test/test_helper.rb b/test/test_helper.rb
index <HASH>..<HASH> 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,7 +1,7 @@
require 'simplecov'
require 'minitest/rg'
-SimpleCov.minimum_coverage_by_file 80
+SimpleCov.minimum_coverage_by_file 100
SimpleCov.start do
add_filter '/test/'
end
|
Increase test coverage requirement from <I>% to <I>%
|
diff --git a/config/protractor-ci.conf.js b/config/protractor-ci.conf.js
index <HASH>..<HASH> 100644
--- a/config/protractor-ci.conf.js
+++ b/config/protractor-ci.conf.js
@@ -1,4 +1,5 @@
exports.config = {
+ baseUrl: 'http://abs.danmind.ru/#!',
sauceUser: SAUCE_USERNAME,
sauceKey: SAUCE_ACCESS_KEY,
specs: ['../build/src/**/*.protractor.js', '../build/src/**/*.e2e.js'],
|
changed baseUrl for CI tests
|
diff --git a/mvc/attribute/$manager.js b/mvc/attribute/$manager.js
index <HASH>..<HASH> 100644
--- a/mvc/attribute/$manager.js
+++ b/mvc/attribute/$manager.js
@@ -48,7 +48,7 @@ attributeManager.prototype = {
utils.each(require('./httpMethod'), function(name) { self.register(name, this); });
// internal used attribute:
// name contains brackets that will never valid for attribute name
- this.register('(paramModelAttribute)', require('./$paramModel.js'));
+ this._inner.set('(paramModel)', require('./$paramModel.js'));
},
resolve: function(attrName, attrSett) {
|
use _inner to do internal register to avoid the unvalid attribute name
|
diff --git a/lib/query/Query.js b/lib/query/Query.js
index <HASH>..<HASH> 100644
--- a/lib/query/Query.js
+++ b/lib/query/Query.js
@@ -45,6 +45,8 @@ Query.prototype.constructor = Query;
Query.prototype.generate = function(options, values) {
const ctx = {};
+ if (this.pool && this.pool.config)
+ Object.assign(ctx, this.pool.config);
if (options)
Object.assign(ctx, options);
ctx.values = values || {};
|
[+] generate() will use pool config as default
|
diff --git a/anyconfig/mergeabledict.py b/anyconfig/mergeabledict.py
index <HASH>..<HASH> 100644
--- a/anyconfig/mergeabledict.py
+++ b/anyconfig/mergeabledict.py
@@ -538,6 +538,9 @@ def create_from(obj=None, ac_ordered=False,
if ac_merge not in MERGE_STRATEGIES:
raise ValueError("Wrong merge strategy: %r" % ac_merge)
+ if getattr(options, "ac_namedtuple", False):
+ ac_ordered = True # To keep the order of items.
+
cls = _get_mdict_class(ac_merge=ac_merge, ac_ordered=ac_ordered)
if obj is None:
return cls()
|
fix: keep order of items if ac_namedtuple in .mergeabledict.create_from
|
diff --git a/chempy/util/_expr.py b/chempy/util/_expr.py
index <HASH>..<HASH> 100644
--- a/chempy/util/_expr.py
+++ b/chempy/util/_expr.py
@@ -605,7 +605,7 @@ def create_Piecewise(parameter_name, nan_fallback=False):
return Expr.from_callback(_pw, parameter_keys=(parameter_name,))
-def create_Poly(parameter_name, reciprocal=False, shift=None, name=None):
+def create_Poly(parameter_name, reciprocal=False, shift=None, name=None, transform_x=lambda x, backend: x):
"""
Examples
--------
@@ -636,6 +636,9 @@ def create_Poly(parameter_name, reciprocal=False, shift=None, name=None):
coeffs = args[1:]
x_shift = args[0]
x0 = x - x_shift
+
+ x = transform_x(x, backend=backend)
+
cur = 1
res = None
for coeff in coeffs:
|
Non-public API: add transform_x to create_Poly
|
diff --git a/core/Menu/MenuReporting.php b/core/Menu/MenuReporting.php
index <HASH>..<HASH> 100644
--- a/core/Menu/MenuReporting.php
+++ b/core/Menu/MenuReporting.php
@@ -69,7 +69,9 @@ class MenuReporting extends MenuAbstract
Piwik::postEvent('Menu.Reporting.addItems', array());
foreach (Report::getAllReports() as $report) {
- $report->configureReportingMenu($this);
+ if ($report->isEnabled()) {
+ $report->configureReportingMenu($this);
+ }
}
foreach ($this->getAvailableMenus() as $menu) {
diff --git a/core/WidgetsList.php b/core/WidgetsList.php
index <HASH>..<HASH> 100644
--- a/core/WidgetsList.php
+++ b/core/WidgetsList.php
@@ -85,7 +85,9 @@ class WidgetsList extends Singleton
$widgetsList = self::getInstance();
foreach (Report::getAllReports() as $report) {
- $report->configureWidget($widgetsList);
+ if ($report->isEnabled()) {
+ $report->configureWidget($widgetsList);
+ }
}
foreach ($widgets as $widget) {
|
add report to widgetslist or menu only if enabled, should fix some tests
|
diff --git a/dhooks/client.py b/dhooks/client.py
index <HASH>..<HASH> 100644
--- a/dhooks/client.py
+++ b/dhooks/client.py
@@ -116,9 +116,8 @@ class Webhook:
""" # noqa: W605
- REGEX = r'^(https://)?discordapp.com/api/webhooks/' \
- r'(?P<id>[0-9]+)/(?P<token>[A-Za-z0-9\.\-\_]+)/?$'
- # TODO: if the token exceeds 68, the url's still deemed valid
+ URL_REGEX = r'^(https://)?discordapp.com/api/webhooks/' \
+ r'(?P<id>[0-9]+)/(?P<token>[A-Za-z0-9\.\-\_]+)/?$'
ENDPOINT = 'https://discordapp.com/api/webhooks/{id}/{token}'
CDN = r'https://cdn.discordapp.com/avatars/' \
r'{0.id}/{0.default_avatar}.{1}?size={2}'
@@ -479,7 +478,7 @@ class Webhook:
if not self.url:
self.url = self.ENDPOINT.format(id=self.id, token=self.token)
else:
- match = re.match(self.REGEX, self.url)
+ match = re.match(self.URL_REGEX, self.url)
if match is None:
raise ValueError('Invalid webhook URL provided.')
|
Renamed REGEX -> URL_REGEX for Webhook; removed a TODO
|
diff --git a/app/models/marty/enum.rb b/app/models/marty/enum.rb
index <HASH>..<HASH> 100644
--- a/app/models/marty/enum.rb
+++ b/app/models/marty/enum.rb
@@ -6,14 +6,9 @@ module Marty::Enum
res = @LOOKUP_CACHE[index] ||= find_by_name(index)
- return res if res
+ raise "no such #{self.name}: '#{index}'" unless res
- raise "no such #{self.name}: '#{index}'"
- end
-
- def to_s
- # FIXME: hacky since not all enums have name
- self.name
+ res
end
def clear_lookup_cache!
|
removed bogus to_s function.
|
diff --git a/lib/running.js b/lib/running.js
index <HASH>..<HASH> 100644
--- a/lib/running.js
+++ b/lib/running.js
@@ -171,7 +171,25 @@ exports.run = function(list, args, cb) {
// finish so assume we can exit with the number of 'problems'
if (typeof cb == 'undefined') {
cb = function (problems) {
- process.exit(problems);
+ // we only want to exit once we know everything has been written to stdout,
+ // otherwise sometimes not all the output from tests will have been written.
+ // So we write an empty string to stdout and then make sure it is done before
+ // exiting
+
+ var written = process.stdout.write('');
+ if (written) {
+ exit();
+ }
+ else {
+ process.stdout.on('drain', function drained() {
+ process.stdout.removeListener('drain', drained);
+ exit();
+ });
+ }
+
+ function exit() {
+ process.exit(problems);
+ }
}
}
runner(list, options, cb);
|
Fix bug where sometimes console output would stop randomly with '%'
|
diff --git a/local_repository.go b/local_repository.go
index <HASH>..<HASH> 100644
--- a/local_repository.go
+++ b/local_repository.go
@@ -130,7 +130,7 @@ func (repo *LocalRepository) VCS() *VCSBackend {
return nil
}
-var vcsDirs = []string{".git", ".hg"}
+var vcsDirs = []string{".git", ".svn", ".hg"}
func walkLocalRepositories(callback func(*LocalRepository)) {
for _, root := range localRepositoryRoots() {
|
Enable to work ghq list and ghq look on Subversion repository.
|
diff --git a/lib/AppInstance.class.php b/lib/AppInstance.class.php
index <HASH>..<HASH> 100644
--- a/lib/AppInstance.class.php
+++ b/lib/AppInstance.class.php
@@ -146,4 +146,3 @@ class AppInstance
return $r;
}
}
-class FastCGI_AppInstance extends AppInstance {}
diff --git a/lib/WebSocketRoute.class.php b/lib/WebSocketRoute.class.php
index <HASH>..<HASH> 100644
--- a/lib/WebSocketRoute.class.php
+++ b/lib/WebSocketRoute.class.php
@@ -10,14 +10,16 @@
class WebSocketRoute
{
public $client; // Remote client
+ public $appInstance;
/* @method __construct
@description Called when client connected.
@param object Remote client (WebSocketSession).
@return void
*/
- public function __construct($client)
+ public function __construct($client,$appInstance = NULL)
{
$this->client = $client;
+ if ($appInstance) {$this->appInstance = $appInstance;}
}
/* @method onHandshake
@description Called when the connection is handshaked.
|
Removed unused class FastCGI_AppInstance. Minor improvements in WebSocketRoute.class.php
|
diff --git a/lib/neo4j/active_node/query/query_proxy_link.rb b/lib/neo4j/active_node/query/query_proxy_link.rb
index <HASH>..<HASH> 100644
--- a/lib/neo4j/active_node/query/query_proxy_link.rb
+++ b/lib/neo4j/active_node/query/query_proxy_link.rb
@@ -115,7 +115,11 @@ module Neo4j
end
def converted_key(model, key)
- (model && key.to_sym == :id) ? model.id_property_name : key
+ if key.to_sym == :id
+ model ? model.id_property_name : :uuid
+ else
+ key
+ end
end
def converted_value(model, key, value)
|
Probably a better way to approach it
|
diff --git a/telethon/network/mtproto_sender.py b/telethon/network/mtproto_sender.py
index <HASH>..<HASH> 100644
--- a/telethon/network/mtproto_sender.py
+++ b/telethon/network/mtproto_sender.py
@@ -39,7 +39,7 @@ class MtProtoSender:
self._logger = logging.getLogger(__name__)
# Message IDs that need confirmation
- self._need_confirmation = []
+ self._need_confirmation = set()
# Requests (as msg_id: Message) sent waiting to be received
self._pending_receive = {}
@@ -74,7 +74,7 @@ class MtProtoSender:
# Pack everything in the same container if we need to send AckRequests
if self._need_confirmation:
messages.append(
- TLMessage(self.session, MsgsAck(self._need_confirmation))
+ TLMessage(self.session, MsgsAck(list(self._need_confirmation)))
)
self._need_confirmation.clear()
@@ -183,7 +183,7 @@ class MtProtoSender:
)
return False
- self._need_confirmation.append(msg_id)
+ self._need_confirmation.add(msg_id)
code = reader.read_int(signed=False)
reader.seek(-4)
|
Make MtProtoSender._need_confirmation a set
This will avoid adding duplicated items to it
|
diff --git a/test/TwitchApi/Resources/UsersTest.php b/test/TwitchApi/Resources/UsersTest.php
index <HASH>..<HASH> 100644
--- a/test/TwitchApi/Resources/UsersTest.php
+++ b/test/TwitchApi/Resources/UsersTest.php
@@ -7,10 +7,10 @@ namespace TwitchApi\Tests\Resources;
use GuzzleHttp\Handler\MockHandler;
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Psr7\Response;
+use PHPUnit\Framework\TestCase;
use TwitchApi\HelixGuzzleClient;
use TwitchApi\RequestGenerator;
use TwitchApi\Resources\UsersApi;
-use PHPUnit\Framework\TestCase;
class UsersTest extends TestCase
{
|
Updated Tests to Resolve CS Issue
|
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index <HASH>..<HASH> 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -22,6 +22,12 @@ import (
"os"
"testing"
+ // Never, ever remove the line with "/ginkgo". Without it,
+ // the ginkgo test runner will not detect that this
+ // directory contains a Ginkgo test suite.
+ // See https://github.com/kubernetes/kubernetes/issues/74827
+ // "github.com/onsi/ginkgo"
+
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/framework/testfiles"
"k8s.io/kubernetes/test/e2e/framework/viperconfig"
|
test/e2e: fix `ginkgo ./test/e2e`
When running ginkgo directly against the source code of the test suite
instead of using some pre-compiled e2e.test binary, ginkgo no longer
recognized that it runs a Ginkgo testsuite, which broke "-focus" and
"-p".
By re-inserting the magic strings that ginkgo looks for into a
comment, we can restore the desired behavior without affecting the
code.
Fixes: #<I>
|
diff --git a/includes/functions-deprecated.php b/includes/functions-deprecated.php
index <HASH>..<HASH> 100644
--- a/includes/functions-deprecated.php
+++ b/includes/functions-deprecated.php
@@ -28,17 +28,6 @@ function yourls_get_duplicate_keywords( $longurl ) {
}
/**
- * Check if we'll need interface display function (ie not API or redirection)
- *
- */
-function yourls_has_interface() {
- yourls_deprecated_function( __FUNCTION__, '1.7' );
- if( yourls_is_API() or yourls_is_GO() )
- return false;
- return true;
-}
-
-/**
* Make sure a integer is safe
*
* Note: this function is dumb and dumbly named since it does not intval(). DO NOT USE.
diff --git a/includes/functions.php b/includes/functions.php
index <HASH>..<HASH> 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1695,6 +1695,16 @@ function yourls_statlink( $keyword = '' ) {
}
/**
+ * Check if we'll need interface display function (ie not API or redirection)
+ *
+ */
+function yourls_has_interface() {
+ if( yourls_is_API() or yourls_is_GO() )
+ return false;
+ return true;
+}
+
+/**
* Check if we're in API mode. Returns bool
*
*/
|
Undeprecate: yourls_has_interface() is used in the future
|
diff --git a/pygsp/tests/test_graphs.py b/pygsp/tests/test_graphs.py
index <HASH>..<HASH> 100644
--- a/pygsp/tests/test_graphs.py
+++ b/pygsp/tests/test_graphs.py
@@ -764,7 +764,7 @@ class TestImportExport(unittest.TestCase):
graph = graphs.BarabasiAlbert(N=100, seed=42)
rng = np.random.default_rng(42)
signal1 = rng.normal(0, 1, graph.N)
- signal2 = rng.integers(0, 1, graph.N)
+ signal2 = rng.integers(0, 10, graph.N)
graph.set_signal(signal1, "signal1")
graph.set_signal(signal2, "signal2")
graph_nx = graph.to_networkx()
@@ -780,7 +780,7 @@ class TestImportExport(unittest.TestCase):
g = graphs.Logo()
rng = np.random.default_rng(42)
s = rng.normal(0, 1, size=g.N)
- s2 = rng.integers(0, 1, size=g.N)
+ s2 = rng.integers(0, 10, size=g.N)
g.set_signal(s, "signal1")
g.set_signal(s2, "signal2")
g_gt = g.to_graphtool()
|
tests: fix import/export integer signals
|
diff --git a/Model/Api/CreateOrder.php b/Model/Api/CreateOrder.php
index <HASH>..<HASH> 100644
--- a/Model/Api/CreateOrder.php
+++ b/Model/Api/CreateOrder.php
@@ -54,6 +54,7 @@ class CreateOrder implements CreateOrderInterface
const E_BOLT_DISCOUNT_CANNOT_APPLY = 2001006;
const E_BOLT_DISCOUNT_CODE_DOES_NOT_EXIST = 2001007;
const E_BOLT_SHIPPING_EXPIRED = 2001008;
+ const E_BOLT_REJECTED_ORDER = 2001010;
/**
* @var HookHelper
@@ -210,6 +211,14 @@ class CreateOrder implements CreateOrderInterface
$createdOrder = $this->orderHelper->processNewOrder($quote, $transaction);
}
+ if($createdOrder->isCanceled()){
+ throw new BoltException(
+ __('Order has been canceled due to the previously declined payment',
+ null,
+ self::E_BOLT_REJECTED_ORDER
+ ));
+ }
+
$this->sendResponse(200, [
'status' => 'success',
'message' => 'Order create was successful',
|
Do not allow checkout after Declined Payment card (#<I>)
* allow rejected -> completed transition when cards change
* transition change reverted
* Declined payment - throw on canceled order
* Declined payment - message update
|
diff --git a/plexapi/config.py b/plexapi/config.py
index <HASH>..<HASH> 100644
--- a/plexapi/config.py
+++ b/plexapi/config.py
@@ -62,4 +62,5 @@ def reset_base_headers():
'X-Plex-Device-Name': plexapi.X_PLEX_DEVICE_NAME,
'X-Plex-Client-Identifier': plexapi.X_PLEX_IDENTIFIER,
'X-Plex-Sync-Version': '2',
+ 'X-Plex-Features': 'external-media',
}
|
Enable external media in responses, e.g. Tidal (#<I>)
|
diff --git a/gem/lib/frank-cucumber/version.rb b/gem/lib/frank-cucumber/version.rb
index <HASH>..<HASH> 100644
--- a/gem/lib/frank-cucumber/version.rb
+++ b/gem/lib/frank-cucumber/version.rb
@@ -1,5 +1,5 @@
module Frank
module Cucumber
- VERSION = "1.1.4.pre1"
+ VERSION = "1.1.5"
end
end
|
very non-sem-ver update from <I>.pre to <I>
|
diff --git a/daemon/cluster/filters.go b/daemon/cluster/filters.go
index <HASH>..<HASH> 100644
--- a/daemon/cluster/filters.go
+++ b/daemon/cluster/filters.go
@@ -53,6 +53,10 @@ func newListTasksFilters(filter filters.Args, transformFunc func(filters.Args) e
"service": true,
"node": true,
"desired-state": true,
+ // UpToDate is not meant to be exposed to users. It's for
+ // internal use in checking create/update progress. Therefore,
+ // we prefix it with a '_'.
+ "_up-to-date": true,
}
if err := filter.Validate(accepted); err != nil {
return nil, err
@@ -68,6 +72,7 @@ func newListTasksFilters(filter filters.Args, transformFunc func(filters.Args) e
Labels: runconfigopts.ConvertKVStringsToMap(filter.Get("label")),
ServiceIDs: filter.Get("service"),
NodeIDs: filter.Get("node"),
+ UpToDate: len(filter.Get("_up-to-date")) != 0,
}
for _, s := range filter.Get("desired-state") {
|
Add support for UpToDate filter, for internal use
|
diff --git a/instaloader.py b/instaloader.py
index <HASH>..<HASH> 100755
--- a/instaloader.py
+++ b/instaloader.py
@@ -21,6 +21,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
import requests
import requests.utils
+import urllib3
# To get version from setup.py for instaloader --version
@@ -164,7 +165,7 @@ class Instaloader:
shutil.copyfileobj(resp.raw, file)
else:
raise ConnectionException("Request returned HTTP error code {}.".format(resp.status_code))
- except (ConnectionResetError, ConnectionException) as err:
+ except (urllib3.exceptions.HTTPError, requests.exceptions.RequestException, ConnectionException) as err:
print("URL: " + url + "\n" + err, file=sys.stderr)
if tries <= 1:
raise err
|
Additionally catch HTTPError and RequestException
Concerns issue #<I>.
|
diff --git a/docs/examples/Runner.php b/docs/examples/Runner.php
index <HASH>..<HASH> 100644
--- a/docs/examples/Runner.php
+++ b/docs/examples/Runner.php
@@ -4,12 +4,14 @@ declare(strict_types = 1);
namespace Apha\Examples;
/* @var $loader \Composer\Autoload\ClassLoader */
+use Doctrine\Common\Annotations\AnnotationRegistry;
+
$loader = require_once __DIR__ . '/../../vendor/autoload.php';
$loader->addPsr4("Apha\\Examples\\", __DIR__ . "/");
-\Doctrine\Common\Annotations\AnnotationRegistry::registerAutoloadNamespace(
- 'JMS\Serializer\Annotation', __DIR__ . '/../../vendor/jms/serializer/src'
-);
+AnnotationRegistry::registerLoader(function (string $className) use ($loader) {
+ return $loader->loadClass($className);
+});
abstract class Runner
{
|
Use regular autoloader for loading annotations.
|
diff --git a/packages/xod-fs/src/unpack.js b/packages/xod-fs/src/unpack.js
index <HASH>..<HASH> 100644
--- a/packages/xod-fs/src/unpack.js
+++ b/packages/xod-fs/src/unpack.js
@@ -4,19 +4,13 @@ import * as XP from 'xod-project';
import { IMPL_FILENAMES } from './loadLibs';
-// "-- Awesome name --" -> "awesome-name"
-export const fsSafeName = R.compose(
- R.replace(/-$/g, ''),
- R.replace(/^-/g, ''),
- R.replace(/(-)\1+/g, '-'),
- R.replace(/[^a-z0-9]/gi, '-'),
- R.toLower
-);
+export const fsSafeName = XP.toIdentifier;
const getLibNames = R.compose(
- R.reject(R.equals('xod/built-in')), // TODO: hardcoded magic name
R.uniq,
- R.map(R.pipe(XP.getPatchPath, XP.getLibraryName)),
+ R.map(XP.getLibraryName),
+ R.reject(XP.isPathBuiltIn),
+ R.map(XP.getPatchPath),
XP.listLibraryPatches
);
|
refactor(xod-fs): reuse some functions from xod-project
|
diff --git a/lib/blueprinter/extractors/auto_extractor.rb b/lib/blueprinter/extractors/auto_extractor.rb
index <HASH>..<HASH> 100644
--- a/lib/blueprinter/extractors/auto_extractor.rb
+++ b/lib/blueprinter/extractors/auto_extractor.rb
@@ -1,4 +1,5 @@
module Blueprinter
+ # @api private
class AutoExtractor < Extractor
def initialize
@hash_extractor = HashExtractor.new
|
Add private tag to AutoExtractor
|
diff --git a/KairosProject/ApiLoader/Loader/AbstractApiLoader.php b/KairosProject/ApiLoader/Loader/AbstractApiLoader.php
index <HASH>..<HASH> 100644
--- a/KairosProject/ApiLoader/Loader/AbstractApiLoader.php
+++ b/KairosProject/ApiLoader/Loader/AbstractApiLoader.php
@@ -104,7 +104,7 @@ abstract class AbstractApiLoader implements ApiLoaderInterface
*
* @var boolean
*/
- private const NO_ITEM_EXCEPTION = true;
+ protected const NO_ITEM_EXCEPTION = true;
/**
* Logger.
|
#<I> set default no item exception configuration as protected constant
|
diff --git a/can-observe.js b/can-observe.js
index <HASH>..<HASH> 100644
--- a/can-observe.js
+++ b/can-observe.js
@@ -24,7 +24,7 @@ var observe = function(obj){
target[key] = observe(value);
}
if (key !== "_cid" && has.call(target, key)) {
- Observation.add(target, key);
+ Observation.add(target, key.toString());
}
return target[key];
},
|
Pass Observation.add() a string event rather than a symbol
|
diff --git a/firecloud/fiss.py b/firecloud/fiss.py
index <HASH>..<HASH> 100644
--- a/firecloud/fiss.py
+++ b/firecloud/fiss.py
@@ -1995,12 +1995,13 @@ def main(argv=None):
subp.set_defaults(func=health)
subp = subparsers.add_parser('attr_get',
- description='Retrieve values of attribute(s) from given entity',
+ description='Retrieve attribute values from an entity identified by '\
+ 'name and type. If either name or type are omitted then workspace '\
+ 'attributes will be returned.',
parents=[workspace_parent, attr_parent])
# etype_parent not used for attr_get, because entity type is optional
etype_help = 'Entity type to retrieve annotations from. '
- etype_help += 'If omitted, workspace attributes will be retrieved'
etype_choices=['participant', 'participant_set', 'sample', 'sample_set',
'pair', 'pair_set' ]
subp.add_argument('-t', '--entity-type', choices=etype_choices,
|
clarify how attr_get works, as a partial response to issue #<I>
|
diff --git a/spec/rtens/mockster/FilterFixture.php b/spec/rtens/mockster/FilterFixture.php
index <HASH>..<HASH> 100644
--- a/spec/rtens/mockster/FilterFixture.php
+++ b/spec/rtens/mockster/FilterFixture.php
@@ -14,7 +14,7 @@ class FilterFixture extends Fixture {
/**
* @var array|\ReflectionMethod[]
*/
- private $filterOutput = [];
+ private $filterOutput = array();
public function givenTheFilterWithTheBitMask($bitmask) {
$this->filter = new Filter($bitmask);
|
fixed array declaration in FilterFixture to be compatible with PHP <I>
|
diff --git a/template/gulpfile.js b/template/gulpfile.js
index <HASH>..<HASH> 100644
--- a/template/gulpfile.js
+++ b/template/gulpfile.js
@@ -1,4 +1,5 @@
var args = require('yargs').argv;
+var clear = require('cli-clear');
if (args.env && ['staging', 'production'].indexOf(args.env) > -1) {
process.env.NODE_ENV = args.env;
@@ -145,7 +146,7 @@ gulp.task('preview', function (cb) {
});
gulp.task('banner', function () {
- spawn('clear', [null], { stdio: 'inherit' });
+ clear();
console.log(
chalk.magenta(
figlet.textSync('Reactatouille', { horizontalLayout: 'full' })
|
clear fix as seen in issue #1 for for compat in windows
|
diff --git a/wafer/talks/forms.py b/wafer/talks/forms.py
index <HASH>..<HASH> 100644
--- a/wafer/talks/forms.py
+++ b/wafer/talks/forms.py
@@ -102,8 +102,8 @@ class TalkForm(forms.ModelForm):
self.helper = FormHelper(self)
self.helper.include_media = False
- submit_button = Submit('submit', _('Submit'))
instance = kwargs['instance']
+ submit_button = Submit('submit', _('Save') if instance else _('Submit'))
if instance:
self.helper.layout.append(
FormActions(
|
When editing an existing talk, offer to Save, not Submit it
|
diff --git a/tests/parser/features/test_gas.py b/tests/parser/features/test_gas.py
index <HASH>..<HASH> 100644
--- a/tests/parser/features/test_gas.py
+++ b/tests/parser/features/test_gas.py
@@ -1,7 +1,3 @@
-from vyper.parser import parser_utils
-from vyper.parser.parser import parse_to_lll
-
-
def test_gas_call(get_contract_with_gas_estimation):
gas_call = """
@external
@@ -13,19 +9,3 @@ def foo() -> uint256:
assert c.foo(call={"gas": 50000}) < 50000
assert c.foo(call={"gas": 50000}) > 25000
-
- print("Passed gas test")
-
-
-def test_gas_estimate_repr():
- code = """
-x: int128
-
-@external
-def __init__():
- self.x = 1
- """
- parser_utils.LLLnode.repr_show_gas = True
- out = parse_to_lll(code)
- assert "35261" in str(out)[:28]
- parser_utils.LLLnode.repr_show_gas = False
|
test: remove test that brings me no joy
|
diff --git a/src/Importer.php b/src/Importer.php
index <HASH>..<HASH> 100755
--- a/src/Importer.php
+++ b/src/Importer.php
@@ -300,7 +300,7 @@ class Importer
// @todo Винести це в конігурацію.
// INSERT/UPDATE statement in STRICT mode
// throw error SQLSTATE[HY000]: General error: 1364 Field 'fieldName' doesn't have a default value
- $this->getDb()->exec('SET SESSION sql_mode = "NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"');
+ $this->getDb()->exec('SET SESSION sql_mode = "NO_ENGINE_SUBSTITUTION"');
$sqlMode = true;
}
$this->saveMode($row, $table);
|
Support for MYSQL 8
|
diff --git a/phy/cluster/manual/session.py b/phy/cluster/manual/session.py
index <HASH>..<HASH> 100644
--- a/phy/cluster/manual/session.py
+++ b/phy/cluster/manual/session.py
@@ -33,6 +33,18 @@ class Session(object):
"""Register a view so that it gets updated after clustering actions."""
self._views.append(view)
+ def select(self, clusters):
+ self.selector.selected_clusters = clusters
+ self._update_views()
+
+ def _update_views(self):
+ for view in self._views:
+ self._update_view(view)
+
+ def _update_view(self, view):
+ # TODO
+ pass
+
def _clustering_updated(self, up):
"""Update the selectors and views with an UpdateInfo object."""
|
Added select() method in session.
|
diff --git a/SUFIA_VERSION b/SUFIA_VERSION
index <HASH>..<HASH> 100644
--- a/SUFIA_VERSION
+++ b/SUFIA_VERSION
@@ -1 +1 @@
-3.6.0
+3.6.1
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.6.0"
+ VERSION = "3.6.1"
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.6.0"
+ VERSION = "3.6.1"
end
end
|
Preparing for <I> release
|
diff --git a/jax/core.py b/jax/core.py
index <HASH>..<HASH> 100644
--- a/jax/core.py
+++ b/jax/core.py
@@ -618,9 +618,6 @@ class MainTrace:
class TraceStack:
# See comments in https://github.com/google/jax/pull/3370
- upward: List[MainTrace]
- downward: List[MainTrace]
-
def __init__(self):
eval_trace = MainTrace(0, EvalTrace)
self.stack = [eval_trace]
@@ -766,7 +763,7 @@ def find_top_trace(xs) -> Trace:
default=None, key=attrgetter('level'))
dynamic = thread_local_state.trace_state.trace_stack.dynamic
top_main = (dynamic if top_main is None or dynamic.level > top_main.level
- else top_main)
+ else top_main)
return top_main and top_main.with_cur_sublevel() # type: ignore
|
Rm old attribute annotations from TraceStack
|
diff --git a/shared/local-debug.desktop.js b/shared/local-debug.desktop.js
index <HASH>..<HASH> 100644
--- a/shared/local-debug.desktop.js
+++ b/shared/local-debug.desktop.js
@@ -56,14 +56,22 @@ if (!__STORYBOOK__) {
if (PERF) {
console.warn('\n\n\nlocal debug PERF is ONNNNNn!!!!!1!!!11!!!!\nAll console.logs disabled!\n\n\n')
+ // $FlowIssue doens't like messing w/ console
console._log = console.log
+ // $FlowIssue doens't like messing w/ console
console._warn = console.warn
+ // $FlowIssue doens't like messing w/ console
console._error = console.error
+ // $FlowIssue doens't like messing w/ console
console._info = console.info
+ // $FlowIssue doens't like messing w/ console
console.log = noop
+ // $FlowIssue doens't like messing w/ console
console.warn = noop
+ // $FlowIssue doens't like messing w/ console
console.error = noop
+ // $FlowIssue doens't like messing w/ console
console.info = noop
config.enableActionLogging = false
|
fix flow (#<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -17,12 +17,12 @@ setup(
install_requires=["requests", "beautifulsoup4"],
tests_require=['unittest', 'vcrpy'],
classifiers=[
- 'Development Status :: Beta',
+ 'Development Status :: 4 - Beta',
'Environment :: Console',
'Intended Audience :: Developers',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
- 'Topic :: Software Development :: Web',
- 'License :: MIT License'
+ 'Topic :: Internet :: WWW/HTTP',
+ 'License :: OSI Approved :: MIT License'
]
)
|
<I> uploaded to pypi
|
diff --git a/peri/opt/optimize.py b/peri/opt/optimize.py
index <HASH>..<HASH> 100644
--- a/peri/opt/optimize.py
+++ b/peri/opt/optimize.py
@@ -1665,6 +1665,13 @@ def do_levmarq_all_particle_groups(s, region_size=40, max_iter=2, damping=1.0,
def do_levmarq_one_direction(s, direction, max_iter=2, run_length=2,
damping=1e-3, collect_stats=False, **kwargs):
+ """
+ Optimization of a state along one direction.
+ s : state
+ direction : np.ndarray; transformed to a unit vector internally
+ The rest are the same **kwargs in LMEngine.
+ """
+ normal = direction / np.sqrt(np.dot(direction, direction))
obj = OptState(s, direction)
lo = LMOptObj(obj, max_iter=max_iter, run_length=run_length, damping=damping,
**kwargs)
|
opt: levmarq 1 direction transforms direction into a normal.
|
diff --git a/test.js b/test.js
index <HASH>..<HASH> 100644
--- a/test.js
+++ b/test.js
@@ -34,6 +34,17 @@ test('run array of promises sequentially', function (t) {
})
})
+test('run array consisting of only one promise', function (t) {
+ t.plan(1)
+
+ return promiseWaterfall([
+ addOne
+ ])
+ .then(function (sum) {
+ t.equals(sum, 1)
+ })
+})
+
test('reject array', function (t) {
t.plan(1)
|
add test for array consisting of one promise
|
diff --git a/lib/model.js b/lib/model.js
index <HASH>..<HASH> 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -233,7 +233,8 @@ Model.prototype.updateIndexes = function (oldDoc, newDoc) {
for (i = 0; i < keys.length; i += 1) {
try {
- if (skipId && keys[i] != '_id') this.indexes[keys[i]].update(oldDoc, newDoc);
+ // if (! (skipId && keys[i] == '_id')) this.indexes[keys[i]].update(oldDoc, newDoc);
+ this.indexes[keys[i]].update(oldDoc, newDoc);
} catch (e) {
failingIndex = i;
error = e;
|
Radical fix, revert skipId
|
diff --git a/lib/ffi_yajl/encoder.rb b/lib/ffi_yajl/encoder.rb
index <HASH>..<HASH> 100644
--- a/lib/ffi_yajl/encoder.rb
+++ b/lib/ffi_yajl/encoder.rb
@@ -47,7 +47,7 @@ module FFI_Yajl
if str.respond_to?(:scrub)
str.scrub!
else
- str.encode!("UTF-8", undef: :replace, invalid: :replace)
+ str.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!('UTF-8')
end
end
str
@@ -68,7 +68,7 @@ module FFI_Yajl
if token.respond_to?(:scrub)
token.scrub!
else
- token.encode("utf-8", undef: :replace, invalid: :replace)
+ token.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!('UTF-8')
end
case status
when 1 # yajl_gen_keys_must_be_strings
|
fixes for <I> and <I>
this is kind of shitty code, but once <I> and <I> are dropped and we
can use #scrub then all the shitty code can go away...
|
diff --git a/apluslms_roman/builder.py b/apluslms_roman/builder.py
index <HASH>..<HASH> 100644
--- a/apluslms_roman/builder.py
+++ b/apluslms_roman/builder.py
@@ -1,4 +1,4 @@
-from os import environ, getuid, getegid
+from os import environ, getuid, getegid, mkdir
from os.path import isdir
from apluslms_yamlidator.utils.decorator import cached_property
@@ -38,6 +38,9 @@ class Builder:
backend.prepare(task, observer)
observer.enter_build()
+ # FIXME: add support for other build paths
+ if not isdir('_build'):
+ mkdir('_build')
result = backend.build(task, observer)
observer.done(data=result)
|
Fix build in folder without _build
|
diff --git a/salt/states/pip.py b/salt/states/pip.py
index <HASH>..<HASH> 100644
--- a/salt/states/pip.py
+++ b/salt/states/pip.py
@@ -160,7 +160,6 @@ def installed(name,
def removed(name,
- packages=None,
requirements=None,
bin_env=None,
log=None,
|
rm unused arg `packages` from states.pip.removed
|
diff --git a/lib/xcodeproj/project/object/native_target.rb b/lib/xcodeproj/project/object/native_target.rb
index <HASH>..<HASH> 100644
--- a/lib/xcodeproj/project/object/native_target.rb
+++ b/lib/xcodeproj/project/object/native_target.rb
@@ -189,7 +189,7 @@ module Xcodeproj
# @!group Build Phases Helpers
# @return [PBXFrameworksBuildPhase]
- # the copy files build phases of the target.
+ # the frameworks build phases of the target.
#
def frameworks_build_phases
build_phases.find { |bp| bp.class == PBXFrameworksBuildPhase }
@@ -203,7 +203,7 @@ module Xcodeproj
end
# @return [Array<PBXShellScriptBuildPhase>]
- # the copy files build phases of the target.
+ # the shell script build phases of the target.
#
def shell_script_build_phases
build_phases.grep(PBXShellScriptBuildPhase)
|
Fix invalid docs for build_phases methods
|
diff --git a/includes/class-freemius.php b/includes/class-freemius.php
index <HASH>..<HASH> 100755
--- a/includes/class-freemius.php
+++ b/includes/class-freemius.php
@@ -10717,7 +10717,9 @@
'license_key' => $fs->apply_filters( 'license_key', $license_key )
);
- $install = $api->call( '/', 'put', $params );
+ $path = $fs->add_show_pending( '/' );
+
+ $install = $api->call( $path, 'put', $params );
if ( FS_Api::is_api_error( $install ) ) {
$error = FS_Api::is_api_error_object( $install ) ?
@@ -13435,6 +13437,9 @@
);
$url = WP_FS__ADDRESS . '/action/service/user/install/';
+
+ $url = $this->add_show_pending( $url );
+
$response = self::safe_remote_post( $url, $request );
if ( is_wp_error( $response ) ) {
|
[api] [license] Include the `show_pending` param in the API request when activating a license so that activation will work with pending plans.
|
diff --git a/tensorflow_datasets/image_classification/imagenet2012_real.py b/tensorflow_datasets/image_classification/imagenet2012_real.py
index <HASH>..<HASH> 100644
--- a/tensorflow_datasets/image_classification/imagenet2012_real.py
+++ b/tensorflow_datasets/image_classification/imagenet2012_real.py
@@ -58,7 +58,10 @@ _REAL_LABELS_URL = 'https://raw.githubusercontent.com/google-research/reassessed
class Imagenet2012Real(tfds.core.GeneratorBasedBuilder):
"""ImageNet validation images with ReaL labels."""
- VERSION = tfds.core.Version('1.0.0', 'Initial release.')
+ VERSION = tfds.core.Version('1.0.0')
+ RELEASE_NOTES = {
+ '1.0.0': 'Initial release',
+ }
MANUAL_DOWNLOAD_INSTRUCTIONS = """\
manual_dir should contain `ILSVRC2012_img_val.tar` file.
|
Add release notes for imagenet<I>_real
|
diff --git a/hawkular-wildfly-agent/src/main/java/org/hawkular/agent/monitor/cmd/AbstractResourcePathCommand.java b/hawkular-wildfly-agent/src/main/java/org/hawkular/agent/monitor/cmd/AbstractResourcePathCommand.java
index <HASH>..<HASH> 100644
--- a/hawkular-wildfly-agent/src/main/java/org/hawkular/agent/monitor/cmd/AbstractResourcePathCommand.java
+++ b/hawkular-wildfly-agent/src/main/java/org/hawkular/agent/monitor/cmd/AbstractResourcePathCommand.java
@@ -114,7 +114,7 @@ RESP extends ResourcePathResponse> implements Command<REQ, RESP> {
if (endpointService == null) {
throw new IllegalArgumentException(String.format(
"Cannot perform [%s] on a [%s] given by inventory path [%s]: unknown managed server [%s]",
- this.getOperationName(envelope), entityType, managedServerName));
+ this.getOperationName(envelope), entityType, resourceId, managedServerName));
}
validate(envelope, endpointService.getMonitoredEndpoint());
|
forgot to pass argument for %s
|
diff --git a/src/main/groovy/json/JsonTokenType.java b/src/main/groovy/json/JsonTokenType.java
index <HASH>..<HASH> 100644
--- a/src/main/groovy/json/JsonTokenType.java
+++ b/src/main/groovy/json/JsonTokenType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2011 the original author or authors.
+ * Copyright 2003-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
|
One more dummy commit to test github post receive hook
|
diff --git a/competency/classes/api.php b/competency/classes/api.php
index <HASH>..<HASH> 100644
--- a/competency/classes/api.php
+++ b/competency/classes/api.php
@@ -2409,6 +2409,9 @@ class api {
$sql .= " AND p.userid $insql";
$params += $inparams;
+ // Order by last updated, seconded by ID to prevent random ordering.
+ $sql .= " ORDER BY p.timemodified DESC, p.id ASC";
+
$plans = array();
$records = $DB->get_recordset_sql($select . $sql, $params, $skip, $limit);
foreach ($records as $record) {
|
MDL-<I> competency: False negative when listing plans to review
|
diff --git a/salt/client.py b/salt/client.py
index <HASH>..<HASH> 100644
--- a/salt/client.py
+++ b/salt/client.py
@@ -224,7 +224,6 @@ class LocalClient(object):
arg,
expr_form,
ret,
- timeout,
**kwargs)
try:
return pub_data['jid']
|
Don't pass through timeout with cmd_async
|
diff --git a/roaringbitmap/src/main/java/org/roaringbitmap/ContainerAppender.java b/roaringbitmap/src/main/java/org/roaringbitmap/ContainerAppender.java
index <HASH>..<HASH> 100644
--- a/roaringbitmap/src/main/java/org/roaringbitmap/ContainerAppender.java
+++ b/roaringbitmap/src/main/java/org/roaringbitmap/ContainerAppender.java
@@ -81,7 +81,10 @@ public class ContainerAppender<C extends WordStorage<C>,
currentKey = key;
}
}
- container = container.add(lowbits(value));
+ C tmp = container.add(lowbits(value));
+ if (tmp != container) {
+ container = tmp;
+ }
}
@Override
|
avoid potentially costly write barrier when container instance hasn't changed (#<I>)
|
diff --git a/src/NafUtil.js b/src/NafUtil.js
index <HASH>..<HASH> 100644
--- a/src/NafUtil.js
+++ b/src/NafUtil.js
@@ -16,6 +16,8 @@ module.exports.getNetworkOwner = function(entity) {
var components = entity.components;
if (components.hasOwnProperty('networked-remote')) {
return entity.components['networked-remote'].data.owner;
+ } else if (components.hasOwnProperty('networked-share')) {
+ return entity.components['networked-share'].data.owner;
} else if (components.hasOwnProperty('networked')) {
return entity.components['networked'].owner;
}
|
add networked-share to getNetworkOwner
|
diff --git a/openquake/server/views.py b/openquake/server/views.py
index <HASH>..<HASH> 100644
--- a/openquake/server/views.py
+++ b/openquake/server/views.py
@@ -149,6 +149,8 @@ def calc_info(request, calc_id):
calc = oqe_models.OqJob.objects.get(pk=calc_id)
response_data = vars(calc.get_oqparam())
response_data['status'] = calc.status
+ response_data['start_time'] = str(calc.jobstats.start_time)
+ response_data['stop_time'] = str(calc.jobstats.stop_time)
except ObjectDoesNotExist:
return HttpResponseNotFound()
|
Added start_time and stop_time to the response_data for engine server calculations
|
diff --git a/svc/control_plane.go b/svc/control_plane.go
index <HASH>..<HASH> 100644
--- a/svc/control_plane.go
+++ b/svc/control_plane.go
@@ -422,7 +422,10 @@ func (s *ControlSvc) getDefaultResourcePool() (pool *serviced.ResourcePool, err
err = dbmap.Insert(&default_pool)
return &default_pool, err
}
- *pool = *obj.(*serviced.ResourcePool)
+ pool, ok := obj.(*serviced.ResourcePool)
+ if !ok {
+ log.Printf("Could not cast obj.")
+ }
return pool, err
}
|
handle type assertion correctly when retriving pool from database.
|
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index <HASH>..<HASH> 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1754,7 +1754,7 @@ function set_send_count($user,$reset=false) {
$pref->name = 'email_send_count';
$pref->value = 1;
$pref->userid = $user->id;
- insert_record('user_preferences',$pref);
+ insert_record('user_preferences',$pref, false);
}
}
@@ -1772,7 +1772,7 @@ function set_bounce_count($user,$reset=false) {
$pref->name = 'email_bounce_count';
$pref->value = 1;
$pref->userid = $user->id;
- insert_record('user_preferences',$pref);
+ insert_record('user_preferences',$pref, false);
}
}
|
Merged from MOODLE_<I>_STABLE - Tell insert record we don't care about inserted id
|
diff --git a/benchexec/tablegenerator/react-table/src/components/Overview.js b/benchexec/tablegenerator/react-table/src/components/Overview.js
index <HASH>..<HASH> 100644
--- a/benchexec/tablegenerator/react-table/src/components/Overview.js
+++ b/benchexec/tablegenerator/react-table/src/components/Overview.js
@@ -31,7 +31,7 @@ const menuItems = [
}
];
-const getCurrentPath = () => document.location.hash.substr(1);
+const getCurrentPath = () => document.location.hash.split("?")[0].substr(1);
export default class Overview extends React.Component {
constructor(props) {
@@ -61,7 +61,9 @@ export default class Overview extends React.Component {
filtered: [],
tabIndex: 0,
- active: menuItems.find(i => i.path === getCurrentPath()).key,
+ active: (
+ menuItems.find(i => i.path === getCurrentPath()) || { key: "summary" }
+ ).key,
quantilePreSelection: tools[0].columns[1]
};
|
Fix selection of active tab on initial load
|
diff --git a/GPy/testing/rv_transformation_tests.py b/GPy/testing/rv_transformation_tests.py
index <HASH>..<HASH> 100644
--- a/GPy/testing/rv_transformation_tests.py
+++ b/GPy/testing/rv_transformation_tests.py
@@ -68,10 +68,16 @@ class RVTransformationTestCase(unittest.TestCase):
def test_Logexp(self):
self._test_trans(GPy.constraints.Logexp())
+
+ @unittest.skip("Gradient not checking right, @jameshensman what is going on here?")
+ def test_Logexp_grad(self):
self._test_grad(GPy.constraints.Logexp())
def test_Exponent(self):
self._test_trans(GPy.constraints.Exponent())
+
+ @unittest.skip("Gradient not checking right, @jameshensman what is going on here?")
+ def test_Exponent_grad(self):
self._test_grad(GPy.constraints.Exponent())
|
[rv tests] Gradient not checking right, @jameshensman what is going on here?
|
diff --git a/lib/serverengine/daemon_logger.rb b/lib/serverengine/daemon_logger.rb
index <HASH>..<HASH> 100644
--- a/lib/serverengine/daemon_logger.rb
+++ b/lib/serverengine/daemon_logger.rb
@@ -19,6 +19,15 @@ module ServerEngine
require 'logger'
+ class ::Logger::LogDevice
+ def reopen!
+ if filename = @filename
+ @dev.reopen(filename, 'a')
+ @dev.sync = true
+ end
+ end
+ end
+
class DaemonLogger < Logger
def initialize(logdev, config={})
@rotate_age = config[:log_rotate_age] || 5
diff --git a/spec/daemon_logger_spec.rb b/spec/daemon_logger_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/daemon_logger_spec.rb
+++ b/spec/daemon_logger_spec.rb
@@ -11,9 +11,13 @@ describe ServerEngine::DaemonLogger do
it 'reopen' do
subject.warn "ABCDEF"
File.open('tmp/se1.log', "w") {|f| }
- subject.warn "test2"
+ subject.warn "test2"
File.read('tmp/se1.log').should_not =~ /ABCDEF/
+
+ subject.reopen!
+ subject.warn "test3"
+ File.read('tmp/se1.log').should =~ /test3/
end
it 'reset path' do
|
fixed DaemonLogger at Ruby >= <I>
|
diff --git a/hepnames/fields/bd1xx.py b/hepnames/fields/bd1xx.py
index <HASH>..<HASH> 100644
--- a/hepnames/fields/bd1xx.py
+++ b/hepnames/fields/bd1xx.py
@@ -175,10 +175,11 @@ def ids(self, key, value):
a_value = _try_to_correct_value(type_, a_value)
- return {
- 'type': type_,
- 'value': a_value,
- }
+ if type_ and a_value:
+ return {
+ 'type': type_,
+ 'value': a_value,
+ }
@hepnames2marc.over('035', '^ids$')
|
dojson: don't produce incomplete ids
|
diff --git a/src/main/java/org/acra/config/ACRAConfiguration.java b/src/main/java/org/acra/config/ACRAConfiguration.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/acra/config/ACRAConfiguration.java
+++ b/src/main/java/org/acra/config/ACRAConfiguration.java
@@ -42,7 +42,6 @@ import java.io.Serializable;
*
* Use {@link ConfigurationBuilder} to programmatically construct an ACRAConfiguration.
*/
-@SuppressWarnings("unused")
public final class ACRAConfiguration implements Serializable {
private final ImmutableSet<String> additionalDropBoxTags;
|
remove unused suppress on configuration: this should not contain anything unused
|
diff --git a/lib/cursor.js b/lib/cursor.js
index <HASH>..<HASH> 100644
--- a/lib/cursor.js
+++ b/lib/cursor.js
@@ -150,7 +150,7 @@ MongolianCursor.prototype.nextBatch = function(callback) {
* Returns the next available document, or undefined if there is none
*/
MongolianCursor.prototype.next = function(callback) {
- if (callback && !(callback instanceof Function)) throw new Error("callback is not a function!")
+ if (!(callback instanceof Function)) throw new Error("callback is not a function!")
var self = this
// We have a retrieved batch that hasn't been exhausted
if (self._currentBatch && self._currentIndex < self._currentBatch.numberReturned) {
|
cursor.next() requires a callback now
|
diff --git a/tests/ProxyManagerTest/Functional/MultipleProxyGenerationTest.php b/tests/ProxyManagerTest/Functional/MultipleProxyGenerationTest.php
index <HASH>..<HASH> 100644
--- a/tests/ProxyManagerTest/Functional/MultipleProxyGenerationTest.php
+++ b/tests/ProxyManagerTest/Functional/MultipleProxyGenerationTest.php
@@ -99,7 +99,7 @@ class MultipleProxyGenerationTest extends PHPUnit_Framework_TestCase
*/
public function getTestedClasses()
{
- return array(
+ $data = array(
array('ProxyManagerTestAsset\\BaseClass'),
array('ProxyManagerTestAsset\\ClassWithMagicMethods'),
array('ProxyManagerTestAsset\\ClassWithByRefMagicMethods'),
@@ -109,7 +109,13 @@ class MultipleProxyGenerationTest extends PHPUnit_Framework_TestCase
array('ProxyManagerTestAsset\\ClassWithPublicProperties'),
array('ProxyManagerTestAsset\\EmptyClass'),
array('ProxyManagerTestAsset\\HydratedObject'),
- array('ProxyManagerTestAsset\\ClassWithSelfHint'),
);
+
+ if (PHP_VERSION_ID >= 50401) {
+ // PHP < 5.4.1 misbehaves, throwing strict standards, see https://bugs.php.net/bug.php?id=60573
+ $data[] = array('ProxyManagerTestAsset\\ClassWithSelfHint');
+ }
+
+ return $data;
}
}
|
Skipping `self` hint tests for PHP < <I> as of <URL>
|
diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index <HASH>..<HASH> 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -156,7 +156,7 @@ final class ControllerMethodReader
if ($classShortname === $defaultController) {
$pattern = '#' . preg_quote(lcfirst($defaultController), '#') . '\z#';
- $routeWithoutController = preg_replace($pattern, '', $uriByClass);
+ $routeWithoutController = rtrim(preg_replace($pattern, '', $uriByClass), '/');
$routeWithoutController = $routeWithoutController ?: '/';
$output[] = [
|
fix: remove / after sub-directory
|
diff --git a/lib/gtx.js b/lib/gtx.js
index <HASH>..<HASH> 100644
--- a/lib/gtx.js
+++ b/lib/gtx.js
@@ -101,7 +101,6 @@ function wrapGrunt(grunt) {
// helper
gtx.call = function (name, func) {
- grunt.log.writeln('call ' + name + ' ' + (typeof func));
if (arguments.length === 1) {
func = name;
name = lib.getNameUID(prefix);
|
killed debug log in gtx.call()
|
diff --git a/src/Awjudd/AssetProcessor/AssetProcessor.php b/src/Awjudd/AssetProcessor/AssetProcessor.php
index <HASH>..<HASH> 100644
--- a/src/Awjudd/AssetProcessor/AssetProcessor.php
+++ b/src/Awjudd/AssetProcessor/AssetProcessor.php
@@ -298,7 +298,7 @@ class AssetProcessor
)));
}
- return '';
+ return $output;
}
// Are we looking at CDNs?
|
Bug fix, returning $output instead of empty string in case of CDNs being used
|
diff --git a/src/Cygnite/Console/src/Apps/Controllers/Controller.php b/src/Cygnite/Console/src/Apps/Controllers/Controller.php
index <HASH>..<HASH> 100644
--- a/src/Cygnite/Console/src/Apps/Controllers/Controller.php
+++ b/src/Cygnite/Console/src/Apps/Controllers/Controller.php
@@ -1,4 +1,3 @@
-
namespace Apps\Controllers;
use Cygnite\Application;
@@ -71,7 +70,7 @@ class %controllerName% extends AbstractBaseController
public function indexAction()
{
$%controllerName% = array();
- $%controllerName% = %StaticModelName%::fetchAll(
+ $%controllerName% = %StaticModelName%::all(
array(
'orderBy' => 'id desc',
/*'paginate' => array(
|
Dynamic finder fetchAll() finder changed to all()
Dynamic finder fetchAll() finder changed to all()
|
diff --git a/lib/gateway/Shard.js b/lib/gateway/Shard.js
index <HASH>..<HASH> 100644
--- a/lib/gateway/Shard.js
+++ b/lib/gateway/Shard.js
@@ -110,15 +110,16 @@ class Shard extends EventEmitter {
this.emit("error", err, this.id);
}
+ this.ws = null;
+ this.reset();
+
/**
* Fired when the shard disconnects
* @event Shard#disconnect
* @prop {Error?} err The error, if any
*/
super.emit("disconnect", error || null);
- this.ws = null;
- this.reset();
if(options.reconnect === "auto" && this.client.options.autoreconnect) {
/**
* Fired when stuff happens and gives more info
|
Fix shard disconnect event logic (#<I>)
|
diff --git a/satpy/plugin_base.py b/satpy/plugin_base.py
index <HASH>..<HASH> 100644
--- a/satpy/plugin_base.py
+++ b/satpy/plugin_base.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2011 SMHI
+# Copyright (c) 2011-2017 PyTroll
# Author(s):
@@ -37,6 +37,7 @@ LOG = logging.getLogger(__name__)
class Plugin(object):
+
"""The base plugin class. It is not to be used as is, it has to be
inherited by other classes.
"""
|
pep8 editorial, and fixing copyright
|
diff --git a/tests/CouchDB/Tests/ConnectionTest.php b/tests/CouchDB/Tests/ConnectionTest.php
index <HASH>..<HASH> 100644
--- a/tests/CouchDB/Tests/ConnectionTest.php
+++ b/tests/CouchDB/Tests/ConnectionTest.php
@@ -21,6 +21,13 @@ class ConnectionTest extends TestCase
}
}
+ public function testIsConnected()
+ {
+ $this->assertFalse($this->conn->isConnected());
+ $this->conn->initialize();
+ $this->assertTrue($this->conn->isConnected());
+ }
+
public function testListDatabases()
{
$databases = $this->conn->listDatabases();
|
Add test for isConnected method
|
diff --git a/lib/gush/cli.rb b/lib/gush/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/gush/cli.rb
+++ b/lib/gush/cli.rb
@@ -111,6 +111,7 @@ module Gush
desc "viz [WorkflowClass]", "Displays graph, visualising job dependencies"
def viz(name)
+ client
workflow = name.constantize.new("start")
GraphViz.new(:G, type: :digraph, dpi: 200, compound: true) do |g|
g[:compound] = true
|
Initialize client with loads Gushfile.
|
diff --git a/tests/csvmanager_test.py b/tests/csvmanager_test.py
index <HASH>..<HASH> 100644
--- a/tests/csvmanager_test.py
+++ b/tests/csvmanager_test.py
@@ -44,6 +44,7 @@ class TableTestCase(unittest.TestCase):
with archive.open('b', 'w') as f:
f.write('3,4')
self.assertEqual(archive.extract_filenames(), set('ab'))
+ self.assertEqual(archive.open('a').read(), '1,2')
finally:
os.remove(archive.name)
|
Added a test for the zip archive functionality
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ setup(
name='cltk',
packages=find_packages(),
url='https://github.com/cltk/cltk',
- version='0.1.96',
+ version='0.1.97',
zip_safe=True,
test_suite='cltk.tests.test_cltk',
)
|
Bump vers for Akkadian
Completion of GSoC <I> project by Andrew Deloucas ( @adeloucas , PR #<I> )
|
diff --git a/upup/pkg/fi/cloudup/awstasks/securitygroup.go b/upup/pkg/fi/cloudup/awstasks/securitygroup.go
index <HASH>..<HASH> 100644
--- a/upup/pkg/fi/cloudup/awstasks/securitygroup.go
+++ b/upup/pkg/fi/cloudup/awstasks/securitygroup.go
@@ -91,7 +91,7 @@ func (e *SecurityGroup) findEc2(c *fi.Context) (*ec2.SecurityGroup, error) {
filters = append(filters, awsup.NewEC2Filter("vpc-id", *vpcID))
filters = append(filters, awsup.NewEC2Filter("group-name", *e.Name))
- request.Filters = cloud.BuildFilters(e.Name)
+ request.Filters = filters
}
response, err := cloud.EC2().DescribeSecurityGroups(request)
|
Fix bug in security group matching
We were matching only by the name tag, instead of using the group-name
If users had an SG with the same Name in different VPCs we could have
matched SGs in both VPCs. This seems unlikely, and particularly tricky
to then get through the remaining sanity checks (even in the find
function itself).
Fix #<I>
|
diff --git a/scripts/homestead.rb b/scripts/homestead.rb
index <HASH>..<HASH> 100644
--- a/scripts/homestead.rb
+++ b/scripts/homestead.rb
@@ -202,6 +202,12 @@ class Homestead
s.args = [site["map"].tr('^A-Za-z0-9', '')]
end
end
+ else
+ config.vm.provision "shell" do |s|
+ s.name = "Checking for old Schedule"
+ s.inline = "rm -f /etc/cron.d/$1"
+ s.args = [site["map"].tr('^A-Za-z0-9', '')]
+ end
end
end
end
|
Cleans up leftover schedules (#<I>)
|
diff --git a/lib/setupHttpRoutes.js b/lib/setupHttpRoutes.js
index <HASH>..<HASH> 100644
--- a/lib/setupHttpRoutes.js
+++ b/lib/setupHttpRoutes.js
@@ -406,9 +406,11 @@ function setupHttpRoutes(server, skynet){
// Returns all devices owned by authenticated user
// curl -X GET http://localhost:3000/mydevices/0d3a53a0-2a0b-11e3-b09c-ff4de847b2cc?token=qirqglm6yb1vpldixflopnux4phtcsor
server.get('/mydevices', function(req, res){
+ var query = req.query || {};
authorizeRequest(req, res, function(fromDevice){
skynet.sendActivity(getActivity('mydevices',req, fromDevice));
- getDevices(fromDevice, {owner: fromDevice.uuid}, true, function(data){
+ query.owner = fromDevice.uuid;
+ getDevices(fromDevice, query, true, function(data){
if(data.error){
errorResponse(data.error, res);
} else {
|
Enable queries in mydevices for HTTP
|
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index <HASH>..<HASH> 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -3748,7 +3748,14 @@ class flat_navigation extends navigation_node_collection {
if ($course->id > 1) {
// It's a real course.
$url = new moodle_url('/course/view.php', array('id' => $course->id));
- $flat = new flat_navigation_node(navigation_node::create($course->shortname, $url), 0);
+
+ $coursecontext = context_course::instance($course->id, MUST_EXIST);
+ // This is the name that will be shown for the course.
+ $coursename = empty($CFG->navshowfullcoursenames) ?
+ format_string($course->shortname, true, array('context' => $coursecontext)) :
+ format_string($course->fullname, true, array('context' => $coursecontext));
+
+ $flat = new flat_navigation_node(navigation_node::create($coursename, $url), 0);
$flat->key = 'coursehome';
$courseformat = course_get_format($course);
|
MDL-<I> navigation: Fix course names in flat nav
|
diff --git a/src/Message/Request/FetchPaymentMethodsRequest.php b/src/Message/Request/FetchPaymentMethodsRequest.php
index <HASH>..<HASH> 100755
--- a/src/Message/Request/FetchPaymentMethodsRequest.php
+++ b/src/Message/Request/FetchPaymentMethodsRequest.php
@@ -32,6 +32,23 @@ class FetchPaymentMethodsRequest extends AbstractMollieRequest
}
/**
+ * @param string $includeWallets
+ * @return $this
+ */
+ public function setIncludeWallets($includeWallets)
+ {
+ return $this->setParameter('includeWallets', $includeWallets);
+ }
+
+ /**
+ * @return string
+ */
+ public function getIncludeWallets()
+ {
+ return $this->getParameter('includeWallets');
+ }
+
+ /**
* @param string $locale
* @return $this
*/
@@ -106,6 +123,7 @@ class FetchPaymentMethodsRequest extends AbstractMollieRequest
'billingCountry' => $this->getBillingCountry(),
'locale' => $this->getLocale(),
'resource' => $this->getResource(),
+ 'includeWallets' => $this->getIncludeWallets(),
'sequenceType' => $this->getSequenceType(),
];
}
|
Add Apple Pay support to FetchPaymentMethodsRequest
|
diff --git a/src/messages/ru/hipanel.finance.billTypes.php b/src/messages/ru/hipanel.finance.billTypes.php
index <HASH>..<HASH> 100644
--- a/src/messages/ru/hipanel.finance.billTypes.php
+++ b/src/messages/ru/hipanel.finance.billTypes.php
@@ -44,6 +44,8 @@ return [
'Websa private Cloud monthly fee' => 'Абонплата Websa Private Cloud',
'Private Cloud backup disk usage' => 'Бэкап Private Cloud',
'Automatic VPS backup monthly fee' => 'Автобэекап',
+ 'DevOps support monthly fee' => 'DevOps поддержка',
+ 'DevOps support time' => 'DevOps поддержка',
'monthly' => 'абонплата',
'overuse' => 'перебор',
|
Add DevOps support translations
|
diff --git a/patroni/dcs/etcd.py b/patroni/dcs/etcd.py
index <HASH>..<HASH> 100644
--- a/patroni/dcs/etcd.py
+++ b/patroni/dcs/etcd.py
@@ -188,7 +188,8 @@ class AbstractEtcdClientWithFailover(etcd.Client):
logger.debug("Retrieved list of machines: %s", machines)
if machines:
random.shuffle(machines)
- self._update_dns_cache(self._dns_resolver.resolve_async, machines)
+ if not self._use_proxies:
+ self._update_dns_cache(self._dns_resolver.resolve_async, machines)
return machines
except Exception as e:
self.http.clear()
diff --git a/patroni/dcs/etcd3.py b/patroni/dcs/etcd3.py
index <HASH>..<HASH> 100644
--- a/patroni/dcs/etcd3.py
+++ b/patroni/dcs/etcd3.py
@@ -617,7 +617,7 @@ class Etcd3(AbstractEtcd):
return self.retry(self._do_refresh_lease)
except (Etcd3ClientError, RetryFailedError):
logger.exception('refresh_lease')
- raise Etcd3Error('Failed ro keepalive/grant lease')
+ raise Etcd3Error('Failed to keepalive/grant lease')
def create_lease(self):
while not self._lease:
|
Don't resolve cluster members when use_proxies is set (#<I>)
Close <URL>
|
diff --git a/src/Gica/MongoDB/Selector/Selector.php b/src/Gica/MongoDB/Selector/Selector.php
index <HASH>..<HASH> 100644
--- a/src/Gica/MongoDB/Selector/Selector.php
+++ b/src/Gica/MongoDB/Selector/Selector.php
@@ -99,6 +99,15 @@ class Selector implements \IteratorAggregate, Selectable
});
}
+ public function sortIfNecessary($field, ?bool $ascending): self
+ {
+ return $field
+ ? $this->mutate(function (self $selector) use ($field, $ascending) {
+ $selector->sort[$field] = ($ascending ? 1 : -1);
+ })
+ : $this;
+ }
+
public function clearSort(): self
{
return $this->mutate(function (self $selector) {
@@ -472,7 +481,7 @@ class Selector implements \IteratorAggregate, Selectable
$parent = '';
foreach ($fields as $field) {
$mongoStack[] = [
- '$unwind' => '$' . $parent . $field,
+ '$unwind' => '$' . $parent . $field,
];
$parent = $field . '.';
}
|
added \Gica\MongoDB\Selector\Selector::sortIfNecessary
|
diff --git a/host/pydaq/HL/spi.py b/host/pydaq/HL/spi.py
index <HASH>..<HASH> 100644
--- a/host/pydaq/HL/spi.py
+++ b/host/pydaq/HL/spi.py
@@ -85,6 +85,4 @@ class spi(HardwareLayer):
def get_data(self, addr=0, size=None):
if(size == None):
size = self._conf['mem_bytes']
- print "spi.get_data() 0x%x 0x%x"%(self._conf['base_addr'], self._conf['mem_bytes'])
- data=self._intf.read(self._conf['base_addr'] + 8 + self._conf['mem_bytes'], size)
- return data
+ return self._intf.read(self._conf['base_addr'] + 8 + self._conf['mem_bytes'], size)
|
MAINT: <I> was done by mistake, revert to <I>
|
diff --git a/recordlinkage/algorithms/numeric.py b/recordlinkage/algorithms/numeric.py
index <HASH>..<HASH> 100644
--- a/recordlinkage/algorithms/numeric.py
+++ b/recordlinkage/algorithms/numeric.py
@@ -12,7 +12,7 @@ def _step_sim(d, offset=0, origin=0):
expr = 'abs(d - origin) <= offset'
- return pandas.eval(expr).astype(np.int64)
+ return pandas.eval(expr).astype(np.float64)
def _linear_sim(d, scale, offset=0, origin=0):
|
Changed return type of step similarity algorithm into float
|
diff --git a/nameko/exceptions.py b/nameko/exceptions.py
index <HASH>..<HASH> 100644
--- a/nameko/exceptions.py
+++ b/nameko/exceptions.py
@@ -98,18 +98,22 @@ def deserialize_to_instance(exc_type):
return exc_type
+class BadRequest(Exception):
+ pass
+
+
@deserialize_to_instance
-class MalformedRequest(Exception):
+class MalformedRequest(BadRequest):
pass
@deserialize_to_instance
-class MethodNotFound(Exception):
+class MethodNotFound(BadRequest):
pass
@deserialize_to_instance
-class IncorrectSignature(Exception):
+class IncorrectSignature(BadRequest):
pass
|
add exception superclass for identifying bad requests
|
diff --git a/src/main/java/nl/garvelink/iban/package-info.java b/src/main/java/nl/garvelink/iban/package-info.java
index <HASH>..<HASH> 100644
--- a/src/main/java/nl/garvelink/iban/package-info.java
+++ b/src/main/java/nl/garvelink/iban/package-info.java
@@ -26,7 +26,7 @@
* IBAN iban = IBAN.valueOf( "NL91ABNA0417164300" );
*
* // Input may be formatted.
- * iban = IBAN.valueOf( "NL91 ABNA 0417 1643 00" );
+ * iban = IBAN.valueOf( "BE68 5390 0754 7034" );
*
* // The valueOf() method returns null if its argument is null.
* iban.valueOf( null );
@@ -39,11 +39,11 @@
* Collections.sort( ibans, IBAN.LEXICAL_ORDER );
*
* // You can use the Modulo97 class directly to compute or verify the check digits.
- * String candidate = "NL91ABNA0417164300";
+ * String candidate = "GB29 NWBK 6016 1331 9268 19";
* Modulo97.verifyCheckDigits( candidate );
*
* // API methods take CharSequence, not just String.
- * StringBuilder builder = new StringBuilder( "NL00ABNA0417164300" );
+ * StringBuilder builder = new StringBuilder( "LU280019400644750000" );
* int checkDigits = Modulo97.calculateCheckDigits( builder );
* </pre>
*
|
Use international sample IBAN's in the package summary javadoc.
|
diff --git a/mod/label/lib.php b/mod/label/lib.php
index <HASH>..<HASH> 100644
--- a/mod/label/lib.php
+++ b/mod/label/lib.php
@@ -181,7 +181,7 @@ function label_reset_userdata($data) {
*
* @return array
*/
-function lable_get_extra_capabilities() {
+function label_get_extra_capabilities() {
return array('moodle/site:accessallgroups');
}
|
MDL-<I> fix lable typo
credit goes to fautrero
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100755
--- a/index.js
+++ b/index.js
@@ -136,6 +136,7 @@ var inject = module.exports = function (cache, config) {
}),
paramap(function (pkg, cb) {
unpack(pkg, {target: pkg.path}, function (err, hash) {
+ if(err) return cb(err)
if(hash !== pkg.shasum) return cb(new Error(
'expected ' + pkg.name +'@' + pkg.version +'\n' +
'to have shasum=' + pkg.shasum + ' but was='+hash))
|
if there was an error, cb before making error about hash
|
diff --git a/spec/helpers_spec.rb b/spec/helpers_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/helpers_spec.rb
+++ b/spec/helpers_spec.rb
@@ -24,3 +24,12 @@ describe '#fixture' do
expect(data['success']).to eq(true)
end
end
+
+describe '#fixture_property' do
+ fixture :data, [:test]
+ fixture_property :data_success, :data, ['success']
+
+ it 'should define the test property correctly' do
+ expect(data_success).to eq(true)
+ end
+end
|
Add a spec for fixture_property
|
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java
index <HASH>..<HASH> 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java
@@ -338,6 +338,12 @@ public class Engine {
}
}
}
+ }
+ }
+ for (AnalysisPhase phase : AnalysisPhase.values()) {
+ final List<Analyzer> analyzerList = analyzers.get(phase);
+
+ for (Analyzer a : analyzerList) {
closeAnalyzer(a);
}
}
|
updated engine to fix bug with archive analyzer prematurely deleting fiels
Former-commit-id: dd<I>e3c<I>f2d9bf7bf3b<I>f<I>be<I>d6d<I>
|
diff --git a/tests/test_snap.py b/tests/test_snap.py
index <HASH>..<HASH> 100644
--- a/tests/test_snap.py
+++ b/tests/test_snap.py
@@ -15,6 +15,14 @@ class TestPrimTeardown(unittest.TestCase):
self.jr = PoppyErgoJr(simulator='poppy-simu', use_snap=True, snap_port=port)
self.base_url = 'http://127.0.0.1:{}'.format(port)
+ # Make sure the Snap API is running before actually testing.
+ while True:
+ try:
+ self.get('/')
+ break
+ except requests.exceptions.ConnectionError:
+ time.sleep(1)
+
def get(self, url):
url = '{}{}'.format(self.base_url, url)
return requests.get(url)
|
Make sure the Snap API is running before unit testing.
See <URL>
|
diff --git a/backtrader/lineiterator.py b/backtrader/lineiterator.py
index <HASH>..<HASH> 100644
--- a/backtrader/lineiterator.py
+++ b/backtrader/lineiterator.py
@@ -95,9 +95,14 @@ class MetaLineIterator(LineSeries.__class__):
if _obj._owner is not None:
_obj._owner.addindicator(_obj)
+ if _obj._ltype == _obj.IndType and _obj.fullsize() == 1:
+ # For single line indicators ... return only the 1st line
+ return _obj.line, args, kwargs
+
return _obj, args, kwargs
+
class LineIterator(six.with_metaclass(MetaLineIterator, LineSeries)):
_ltype = LineSeries.IndType
|
Single line LineSeries return line instead of object
|
diff --git a/closure/goog/log/log.js b/closure/goog/log/log.js
index <HASH>..<HASH> 100644
--- a/closure/goog/log/log.js
+++ b/closure/goog/log/log.js
@@ -90,6 +90,16 @@ goog.log.getLogger = function(name, opt_level) {
};
+/**
+ * Returns the root logger.
+ *
+ * @return {?goog.log.Logger} The root logger, or null if logging is disabled.
+ */
+goog.log.getRootLogger = function() {
+ return goog.log.getLogger(goog.log.ROOT_LOGGER_NAME);
+};
+
+
// TODO(johnlenz): try to tighten the types to these functions.
/**
* Adds a handler to the logger. This doesn't use the event system because
|
Add goog.log.getRootLogger.
RELNOTES[NEW]: goog.log.getRootLogger has been added.
PiperOrigin-RevId: <I>
|
diff --git a/HARK/core.py b/HARK/core.py
index <HASH>..<HASH> 100644
--- a/HARK/core.py
+++ b/HARK/core.py
@@ -592,7 +592,7 @@ class AgentType(HARKobject):
None
'''
for var_name in self.shock_vars:
- setattr(self, var_name, self.shock_history[var_name][self.t_sim, :])
+ self.shocks[var_name] = self.shock_history[var_name][self.t_sim, :]
def getStates(self):
'''
@@ -681,7 +681,10 @@ class AgentType(HARKobject):
for t in range(sim_periods):
self.simOnePeriod()
for var_name in self.track_vars:
- self.history[var_name][self.t_sim,:] = getattr(self,var_name)
+ if var_name in self.shock_vars:
+ self.history[var_name][self.t_sim,:] = self.shocks[var_name]
+ else:
+ self.history[var_name][self.t_sim,:] = getattr(self,var_name)
self.t_sim += 1
def clearHistory(self):
|
read_shocks to the shocks dict; track shocks from the shocks dict
|
diff --git a/includes/modules/export/xhtml/class-pb-xhtml11.php b/includes/modules/export/xhtml/class-pb-xhtml11.php
index <HASH>..<HASH> 100644
--- a/includes/modules/export/xhtml/class-pb-xhtml11.php
+++ b/includes/modules/export/xhtml/class-pb-xhtml11.php
@@ -563,7 +563,7 @@ class Xhtml11 extends Export {
printf( '<h2 class="subtitle">%s</h2>', @$metadata['pb_subtitle'] );
printf( '<div class="logo"></div>' );
printf( '<h3 class="author">%s</h3>', @$metadata['pb_author'] );
- printf( '<h4 class="author">%s</h4>', @$metadata['pb_contributing_authors'] );
+ printf( '<h4 class="contributing-authors">%s</h4>', @$metadata['pb_contributing_authors'] );
printf( '<h4 class="publisher">%s</h4>', @$metadata['pb_publisher'] );
printf( '<h5 class="publisher-city">%s</h5>', @$metadata['pb_publisher_city'] );
}
|
changing contributing authors class, because it was breaking PDF running heads.
|
diff --git a/src/config/ios/findProject.js b/src/config/ios/findProject.js
index <HASH>..<HASH> 100644
--- a/src/config/ios/findProject.js
+++ b/src/config/ios/findProject.js
@@ -8,7 +8,7 @@ const GLOB_PATTERN = '**/*.xcodeproj';
/**
* These folders will be excluded from search to speed it up
*/
-const GLOB_EXCLUDE_PATTERN = ['node_modules/**', 'Examples/**', 'examples/**'];
+const GLOB_EXCLUDE_PATTERN = ['node_modules/**', 'Examples/**', 'examples/**', 'Pods/**'];
/**
* Finds iOS project by looking for all .xcodeproj files
|
Ignore Cocoapods autogenerated project
|
diff --git a/helusers/apps.py b/helusers/apps.py
index <HASH>..<HASH> 100644
--- a/helusers/apps.py
+++ b/helusers/apps.py
@@ -9,4 +9,4 @@ class HelusersConfig(AppConfig):
class HelusersAdminConfig(AdminConfig):
- default_site = 'helusers.admin.AdminSite'
+ default_site = 'helusers.admin_site.AdminSite'
|
Fix wrong path for helusers AdminSite
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,6 @@ setup(name='numina',
author='Sergio Pascual',
author_email='sergiopr@fis.ucm.es',
url='http://guaix.fis.ucm.es/projects/emir',
- download_url='ftp://astrax.fis.ucm.es/pub/software/numina/numina-%s.tar.gz' % __version__,
license='GPLv3',
description='Numina reduction package',
packages=find_packages('.'),
|
Removing download_url, by default from PyPI
|
diff --git a/src/org/opencms/db/CmsImportFolder.java b/src/org/opencms/db/CmsImportFolder.java
index <HASH>..<HASH> 100644
--- a/src/org/opencms/db/CmsImportFolder.java
+++ b/src/org/opencms/db/CmsImportFolder.java
@@ -280,8 +280,7 @@ public class CmsImportFolder {
*/
private void importZipResource(ZipInputStream zipStreamIn, String importPath, boolean noSubFolder) throws Exception {
- int todo = 0;
- // TODO: this method looks very crude, it should be re-written sometime...
+ // HACK: this method looks very crude, it should be re-written sometime...
boolean isFolder = false;
int j, r, stop, size;
|
Replaced not used declaration with a HACK.
|
diff --git a/server/src/main/java/com/orientechnologies/orient/server/security/ODefaultServerSecurity.java b/server/src/main/java/com/orientechnologies/orient/server/security/ODefaultServerSecurity.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/com/orientechnologies/orient/server/security/ODefaultServerSecurity.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/security/ODefaultServerSecurity.java
@@ -594,10 +594,12 @@ public class ODefaultServerSecurity implements OSecurityFactory, OServerLifecycl
for (OClientConnection cc : ccm.getConnections()) {
try {
ODatabaseDocumentTx ccDB = cc.getDatabase();
- ccDB.activateOnCurrentThread();
- if (ccDB != null && !ccDB.isClosed() && ccDB.getURL() != null) {
- if (ccDB.getURL().equals(dbURL)) {
- ccDB.reloadUser();
+ if(ccDB != null) {
+ ccDB.activateOnCurrentThread();
+ if (!ccDB.isClosed() && ccDB.getURL() != null) {
+ if (ccDB.getURL().equals(dbURL)) {
+ ccDB.reloadUser();
+ }
}
}
} catch (Exception ex) {
|
fixed null pointer in case of missing database in default security
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.