diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/nunaliit2-js/src/main/js/nunaliit2/n2.mapAndControls.js b/nunaliit2-js/src/main/js/nunaliit2/n2.mapAndControls.js
index <HASH>..<HASH> 100644
--- a/nunaliit2-js/src/main/js/nunaliit2/n2.mapAndControls.js
+++ b/nunaliit2-js/src/main/js/nunaliit2/n2.mapAndControls.js
@@ -5606,7 +5606,6 @@ var MapAndControls = $n2.Class({
};
// Prepare features to be added to layer
- var featuresToAdd = [];
state.added.forEach(function(f){
if( mustReproject ){
var geom = f.geometry;
|
nunaliit2-js: Fix issue where map layer from model is not redrawn
correctly when filter is changed.
|
diff --git a/hardware/opentrons_hardware/hardware_control/constants.py b/hardware/opentrons_hardware/hardware_control/constants.py
index <HASH>..<HASH> 100644
--- a/hardware/opentrons_hardware/hardware_control/constants.py
+++ b/hardware/opentrons_hardware/hardware_control/constants.py
@@ -2,5 +2,5 @@
from typing_extensions import Final
-interrupts_per_sec: Final = 170000
+interrupts_per_sec: Final = 100000
"""The number of motor interrupts per second."""
|
refactor(CAN): <I>khz is the frequency of the interrupt. And the frequency of the interrupt is <I>khz. (#<I>)
|
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb
index <HASH>..<HASH> 100644
--- a/spec/dummy/config/routes.rb
+++ b/spec/dummy/config/routes.rb
@@ -1,4 +1,6 @@
Rails.application.routes.draw do
mount CrowdblogCore::Engine => '/admin'
+
+ root to: 'crowdblog_core/posts#index'
end
|
Add default route for dummy app
|
diff --git a/zipline/utils/events.py b/zipline/utils/events.py
index <HASH>..<HASH> 100644
--- a/zipline/utils/events.py
+++ b/zipline/utils/events.py
@@ -412,7 +412,7 @@ class TradingDayOfWeekRule(six.with_metaclass(ABCMeta, StatelessRule)):
# calculate the list of periods that match the given criteria
return self.cal.schedule.groupby(
pd.Grouper(freq="W")
- ).nth(self.td_delta).index
+ ).nth(int(self.td_delta)).index
def should_trigger(self, dt):
# is this market minute's period in the list of execution periods?
@@ -456,7 +456,7 @@ class TradingDayOfMonthRule(six.with_metaclass(ABCMeta, StatelessRule)):
# calculate the list of periods that match the given criteria
return self.cal.schedule.groupby(
pd.Grouper(freq="M")
- ).nth(self.td_delta).index
+ ).nth(int(self.td_delta)).index
class NthTradingDayOfMonth(TradingDayOfMonthRule):
|
Make sure we are passing ints to nth.
|
diff --git a/spec/rdkafka/producer/client_spec.rb b/spec/rdkafka/producer/client_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/rdkafka/producer/client_spec.rb
+++ b/spec/rdkafka/producer/client_spec.rb
@@ -42,13 +42,13 @@ describe Rdkafka::Producer::Client do
it "polls the native with default 250ms timeout" do
polling_loop_expects do
- expect(Rdkafka::Bindings).to receive(:rd_kafka_poll).with(instance_of(FFI::Pointer), 250)
+ expect(Rdkafka::Bindings).to receive(:rd_kafka_poll).with(instance_of(FFI::Pointer), 250).at_least(:once)
end
end
it "check the out queue of native client" do
polling_loop_expects do
- expect(Rdkafka::Bindings).to receive(:rd_kafka_outq_len).with(native)
+ expect(Rdkafka::Bindings).to receive(:rd_kafka_outq_len).with(native).at_least(:once)
end
end
end
|
Loosen stub in a spec
|
diff --git a/src/Webiny/Component/StdLib/StdObject/ArrayObject/ValidatorTrait.php b/src/Webiny/Component/StdLib/StdObject/ArrayObject/ValidatorTrait.php
index <HASH>..<HASH> 100755
--- a/src/Webiny/Component/StdLib/StdObject/ArrayObject/ValidatorTrait.php
+++ b/src/Webiny/Component/StdLib/StdObject/ArrayObject/ValidatorTrait.php
@@ -55,6 +55,22 @@ trait ValidatorTrait
}
/**
+ * Check if all given keys exist in the array
+ *
+ * @param array $keys
+ *
+ * @return bool
+ */
+ public function keysExist($keys = []){
+ foreach($keys as $key){
+ if(!$this->keyExists($key)){
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
* Checks if $key exists in current array as index. If it exists, true is returned.
* If the $key doesn't exist, $default is returned.
* This method supports nested keys access: 'level1.level2.level3'
|
keysExist() method to check array for presence of multiple keys at once.
|
diff --git a/src/Http/Routes/Squads/Routes.php b/src/Http/Routes/Squads/Routes.php
index <HASH>..<HASH> 100644
--- a/src/Http/Routes/Squads/Routes.php
+++ b/src/Http/Routes/Squads/Routes.php
@@ -56,7 +56,7 @@ Route::prefix('/{squad}')
// update a squad
Route::put('/')
->name('squads.update')
- ->uses('SquadsController@udpate')
+ ->uses('SquadsController@update')
->middleware('can:squads.edit,squad');
// remove a squad
|
fix(squads): address a typo in update route
|
diff --git a/plumbing/transport/ssh/common.go b/plumbing/transport/ssh/common.go
index <HASH>..<HASH> 100644
--- a/plumbing/transport/ssh/common.go
+++ b/plumbing/transport/ssh/common.go
@@ -4,11 +4,13 @@ package ssh
import (
"fmt"
"reflect"
+ "strconv"
"gopkg.in/src-d/go-git.v4/plumbing/transport"
"gopkg.in/src-d/go-git.v4/plumbing/transport/internal/common"
"golang.org/x/crypto/ssh"
+ "github.com/kevinburke/ssh_config"
)
// DefaultClient is the default SSH client.
@@ -122,7 +124,20 @@ func (c *command) connect() error {
func (c *command) getHostWithPort() string {
host := c.endpoint.Host
+
+ configHost := ssh_config.Get(host, "Hostname")
+ if (configHost != "") {
+ host = configHost
+ }
+
port := c.endpoint.Port
+ configPort := ssh_config.Get(host, "Port")
+ if (configPort != "") {
+ i, err := strconv.Atoi(configPort)
+ if err != nil {
+ port = i
+ }
+ }
if port <= 0 {
port = DefaultPort
}
|
check .ssh/config for host and port overrides; fixes #<I>
|
diff --git a/public/javascript/pump/model.js b/public/javascript/pump/model.js
index <HASH>..<HASH> 100644
--- a/public/javascript/pump/model.js
+++ b/public/javascript/pump/model.js
@@ -551,13 +551,18 @@
if (nl || pl) {
var ndone = false,
- pdone = false;
+ nerror = false,
+ pdone = false,
+ perror = false;
stream.getAllNext(function(err) {
+ ndone = true;
if (err) {
- callback(err);
+ nerror = true;
+ if (!perror) {
+ callback(err);
+ }
} else {
- ndone = true;
if (pdone) {
callback(null);
}
@@ -565,10 +570,13 @@
});
stream.getAllPrev(function(err) {
+ pdone = true;
if (err) {
- callback(err);
+ perror = true;
+ if (!nerror) {
+ callback(err);
+ }
} else {
- pdone = true;
if (ndone) {
callback(null);
}
|
check for errors in getallnext/prev
|
diff --git a/src/Rocketeer/RocketeerServiceProvider.php b/src/Rocketeer/RocketeerServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/Rocketeer/RocketeerServiceProvider.php
+++ b/src/Rocketeer/RocketeerServiceProvider.php
@@ -359,7 +359,7 @@ class RocketeerServiceProvider extends ServiceProvider
}
// Else include its contents
- else {
+ elseif (is_dir($file)) {
$folder = glob($file.'/*.php');
foreach ($folder as $file) {
include $file;
|
Check if dir exists before glob()
I get an Invalid argument supplied for foreach() exception otherwise (on 1 system, other system works fine) (on develop this time)
|
diff --git a/test/support/glfw_window_stub.rb b/test/support/glfw_window_stub.rb
index <HASH>..<HASH> 100644
--- a/test/support/glfw_window_stub.rb
+++ b/test/support/glfw_window_stub.rb
@@ -6,7 +6,7 @@ module Mittsu
attr_accessor :key_press_handler, :key_release_handler, :key_repeat_handler, :char_input_handler, :cursor_pos_handler, :mouse_button_press_handler, :mouse_button_release_handler, :scroll_handler, :framebuffer_size_handler
def initialize(width, height, title, antialias)
- @width, @height, @title @antialias = width, height, title, antialias
+ @width, @height, @title, @antialias = width, height, title, antialias
end
def run
|
Missed a test file update
|
diff --git a/lib/babble.js b/lib/babble.js
index <HASH>..<HASH> 100644
--- a/lib/babble.js
+++ b/lib/babble.js
@@ -232,7 +232,7 @@ exports.babblify = function (actor, params) {
// attach receive function to the babbler
var receiveName = params && params.receive || 'receive';
- var receiveOriginal = actor[receiveName] || null;
+ var receiveOriginal = actor.hasOwnProperty(receiveName) ? actor[receiveName] : null;
if (receiveOriginal) {
actor[receiveName] = function (from, message) {
babbler._receive(message);
@@ -283,7 +283,7 @@ exports.unbabblify = function (actor) {
delete actor.listenOnce;
delete actor[__babbler__.receiveName];
- // restore any original receive method
+ // restore any original receiveOriginal method
if (__babbler__.receiveOriginal) {
actor[__babbler__.receiveName] = __babbler__.receiveOriginal;
}
|
Fixed restoring `receive` method
|
diff --git a/hug/_version.py b/hug/_version.py
index <HASH>..<HASH> 100644
--- a/hug/_version.py
+++ b/hug/_version.py
@@ -27,4 +27,4 @@ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFT
OTHER DEALINGS IN THE SOFTWARE.
"""
-current = "0.0.6"
+current = "0.0.8"
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ except (IOError, ImportError, OSError, RuntimeError):
readme = ''
setup(name='hug',
- version='0.0.7',
+ version='0.0.8',
description='A Python framework that makes developing APIs as simple as possible, but no simpler.',
long_description=readme,
author='Timothy Crosley',
|
Bump release to <I>
|
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
@@ -8438,16 +8438,6 @@
return FS_Logger::get_logger( ( $prefix_slug ? $this->_slug : '' ) . ( ( ! $prefix_slug || empty( $id ) ) ? '' : '_' ) . $id );
}
- /**
- * @param $id
- * @param bool $load_options
- * @param bool $prefix_slug
- *
- * @return FS_Option_Manager
- */
- function get_options_manager( $id, $load_options = false, $prefix_slug = true ) {
- return FS_Option_Manager::get_manager( ( $prefix_slug ? $this->_slug : '' ) . ( ( ! $prefix_slug || empty( $id ) ) ? '' : '_' ) . $id, $load_options );
- }
/* Security
------------------------------------------------------------------------------------------------------------------*/
|
[cleanup] Removed an unused method.
|
diff --git a/lib/readingtime/version.rb b/lib/readingtime/version.rb
index <HASH>..<HASH> 100644
--- a/lib/readingtime/version.rb
+++ b/lib/readingtime/version.rb
@@ -1,3 +1,3 @@
module Readingtime
- VERSION = "0.0.5"
+ VERSION = "0.1.0"
end
|
VERSION <I>
reading_time can now accept options
|
diff --git a/testsuite.py b/testsuite.py
index <HASH>..<HASH> 100644
--- a/testsuite.py
+++ b/testsuite.py
@@ -233,8 +233,6 @@ def run_selftests():
verify_string_bad(r""" "foo """)
verify_string_bad(r""" 'foo """)
- # TODO: Kmodifiable gone, test assignable
-
print("Testing expression evaluation")
|
Remove outdated TODO comment
Tests for .assignable have been added.
|
diff --git a/thinc/about.py b/thinc/about.py
index <HASH>..<HASH> 100644
--- a/thinc/about.py
+++ b/thinc/about.py
@@ -1,2 +1,2 @@
-__version__ = "8.0.0.dev0"
+__version__ = "8.0.0.dev1"
__release__ = True
|
Set version to <I>.dev1
|
diff --git a/bcbio/pipeline/config_loader.py b/bcbio/pipeline/config_loader.py
index <HASH>..<HASH> 100644
--- a/bcbio/pipeline/config_loader.py
+++ b/bcbio/pipeline/config_loader.py
@@ -36,26 +36,17 @@ def load_config(config_file):
"""
with open(config_file) as in_handle:
config = yaml.load(in_handle)
-
- for field, setting in config.items():
- try:
- config[field] = expand_path(setting)
- except AttributeError:
- pass
-
- try:
- for sub_field, sub_setting in config[field].items():
- config[field][sub_field] = expand_path(sub_setting)
- except AttributeError:
- pass
+ for field, setting in config.items():
+ config[field] = expand_path(setting)
+ for sub_field, sub_setting in config[field].items():
+ config[field][sub_field] = expand_path(sub_setting)
return config
def expand_path(path):
""" Combines os.path.expandvars with replacing ~ with $HOME.
"""
try:
- new_path = os.path.expandvars(path.replace("~", "$HOME"))
- return new_path
+ return os.path.expandvars(path.replace("~", "$HOME"))
except AttributeError:
- raise AttributeError("Not a path string")
\ No newline at end of file
+ return path
|
Catch and deal with non-string attribute error in a single location
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ setup(name='crc32c',
author='The ICRAR DIA Team',
url='https://github.com/ICRAR/crc32c',
author_email='rtobar@icrar.org',
- version='1.5',
+ version='1.6',
license="LGPLv2.1+",
description='A python package exposing the Intel SSE4.2 CRC32C instruction',
long_description=long_description,
|
crc<I>c <I>
This new version brings build fixes for non-intel platforms (patch by
Jeremy Lainé), new supported values for the CRC<I>C_SW_MODE environment
variable, and build support for the Intel compiler.
|
diff --git a/aaf2/cfb.py b/aaf2/cfb.py
index <HASH>..<HASH> 100644
--- a/aaf2/cfb.py
+++ b/aaf2/cfb.py
@@ -1135,8 +1135,12 @@ class CompoundFileBinary(object):
sector_type = fat_sector_types.get(sid, sid)
if not isinstance(sector_type, int):
+ continue
+ # some files write zero difat instead of FREESECT
+ if sid <= 0:
continue
+
fat_sectors.append(sid)
# len(fat_sectors),self.fat_sector_count
|
fix files were difat is zero instead of FREESECT
|
diff --git a/leveldb/table/reader.go b/leveldb/table/reader.go
index <HASH>..<HASH> 100644
--- a/leveldb/table/reader.go
+++ b/leveldb/table/reader.go
@@ -581,6 +581,7 @@ func (r *Reader) readRawBlock(bh blockHandle, verifyChecksum bool) ([]byte, erro
case blockTypeSnappyCompression:
decLen, err := snappy.DecodedLen(data[:bh.length])
if err != nil {
+ r.bpool.Put(data)
return nil, r.newErrCorruptedBH(bh, err.Error())
}
decData := r.bpool.Get(decLen)
|
Fix readRawBlock: a forgotten BufferPool Put (#<I>)
|
diff --git a/src/storage/get-id-from-url.js b/src/storage/get-id-from-url.js
index <HASH>..<HASH> 100644
--- a/src/storage/get-id-from-url.js
+++ b/src/storage/get-id-from-url.js
@@ -2,22 +2,23 @@ import configs from '../core/configs.js'
// constants
var URL_TO_ID_CACHE = {}
-var IS_URL = new RegExp(
- '^(http(s?))\\:\\/\\/(' +
- configs.storageDomain +
- '|' +
- configs.storageDomainNoCdn +
- ')'
-)
// main
export default function getStorageIdFromUrl(url) {
// check cache
if (URL_TO_ID_CACHE[url]) return URL_TO_ID_CACHE[url]
+ var isStorageRegexp = new RegExp(
+ '^(http(s?))\\:\\/\\/(' +
+ configs.storageDomain +
+ '|' +
+ configs.storageDomainNoCdn +
+ ')'
+ )
+
// check if url is valid url
- if (IS_URL.test(url)) {
- var storageId = url.replace(IS_URL, '')
+ if (isStorageRegexp.test(url)) {
+ var storageId = url.replace(isStorageRegexp, '')
// add to cache
URL_TO_ID_CACHE[url] = storageId
return storageId
|
create regexp on runtine (as config might change on runtime)
|
diff --git a/code/editor/FieldEditor.php b/code/editor/FieldEditor.php
index <HASH>..<HASH> 100755
--- a/code/editor/FieldEditor.php
+++ b/code/editor/FieldEditor.php
@@ -26,8 +26,8 @@ class FieldEditor extends FormField {
}
function Fields() {
- Requirements::css(SAPPHIRE_DIR . "/css/FieldEditor.css");
- Requirements::javascript(SAPPHIRE_DIR . "/javascript/FieldEditor.js");
+ Requirements::css("userform/css/FieldEditor.css");
+ Requirements::javascript("userform/javascript/FieldEditor.js");
$relationName = $this->name;
|
BUGFIX: wrong path to javascript and stylesheet
|
diff --git a/client/daemon.go b/client/daemon.go
index <HASH>..<HASH> 100644
--- a/client/daemon.go
+++ b/client/daemon.go
@@ -18,7 +18,7 @@ var (
},
cli.StringFlag{
Name: "log",
- Usage: "specific output log file, otherwise output to stderr by default",
+ Usage: "specific output log file, otherwise output to stdout by default",
},
cli.StringFlag{
Name: "root",
diff --git a/daemon/daemon.go b/daemon/daemon.go
index <HASH>..<HASH> 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -202,7 +202,7 @@ func daemonEnvironmentSetup(c *cli.Context) error {
logrus.SetFormatter(&logrus.JSONFormatter{})
logrus.SetOutput(logFile)
} else {
- logrus.SetOutput(os.Stderr)
+ logrus.SetOutput(os.Stdout)
}
return nil
|
daemon: Update default log output to stdout rather than stderr
client log still remain at stderr, since we won't want it to interfere with
return result.
|
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
@@ -101,11 +101,21 @@ module Minitest
end
end
end
+
+ class JSISpecReporter < Minitest::Reporters::SpecReporter
+ def record_print_status(test)
+ test_name = test.name.gsub(/^test_: /, 'test:')
+ print pad_test(test_name)
+ print_colored_status(test)
+ print(" (#{format_duration(test.time, sigfig: 2)})") unless test.time.nil?
+ puts
+ end
+ end
end
mkreporters = {
'spec' => -> {
- Minitest::Reporters::SpecReporter.new
+ Minitest::JSISpecReporter.new
},
'default' => -> {
Minitest::Reporters::DefaultReporter.new(
|
test helper Spec Reporter prints record status with format_duration, 2 sigfigs
|
diff --git a/src/get.js b/src/get.js
index <HASH>..<HASH> 100644
--- a/src/get.js
+++ b/src/get.js
@@ -40,7 +40,7 @@ class Get {
}
const obj = {};
- obj.rowkey = hbaseRowData.row.toString();
+ obj.rowkey = hbaseRowData.row ? hbaseRowData.row.toString() : null;
_.each(hbaseRowData.columnValues, colVal => {
const family = colVal.family.toString();
const qualName = colVal.qualifier.toString();
|
in case row was not found didn't handle null row key
|
diff --git a/lib/coverage-instrumenter.js b/lib/coverage-instrumenter.js
index <HASH>..<HASH> 100644
--- a/lib/coverage-instrumenter.js
+++ b/lib/coverage-instrumenter.js
@@ -97,7 +97,11 @@ CoverageInstrumenter.prototype.processString = function(content, relativePath) {
relativePath = fixPath(relativePath, this._appName, this._appRoot, this._templateExtensions);
- return instrumenter.instrumentSync(content, relativePath);
+ try {
+ return instrumenter.instrumentSync(content, relativePath);
+ } catch (e) {
+ console.error('Unable to cover:', relativePath, '. Try setting useBabelInstrumenter to true. \n', e.stack);
+ }
};
module.exports = CoverageInstrumenter;
|
Try catch around instrumenter. So it spits out a clearer error
|
diff --git a/tests/Sulu/Component/Content/Mapper/ContentMapperTest.php b/tests/Sulu/Component/Content/Mapper/ContentMapperTest.php
index <HASH>..<HASH> 100644
--- a/tests/Sulu/Component/Content/Mapper/ContentMapperTest.php
+++ b/tests/Sulu/Component/Content/Mapper/ContentMapperTest.php
@@ -56,8 +56,13 @@ class ContentMapperTest extends \PHPUnit_Framework_TestCase
$this->session->save();
$cmf = $this->session->getRootNode()->addNode('cmf');
- $cmf->addNode('routes');
- $cmf->addNode('contents');
+ $cmf->addMixin('mix:referenceable');
+
+ $routes = $cmf->addNode('routes');
+ $routes->addMixin('mix:referenceable');
+
+ $contents = $cmf->addNode('contents');
+ $contents->addMixin('mix:referenceable');
$this->session->save();
}
|
changed added referenceable to base nodes
|
diff --git a/src/js/remote.js b/src/js/remote.js
index <HASH>..<HASH> 100644
--- a/src/js/remote.js
+++ b/src/js/remote.js
@@ -385,15 +385,14 @@ Remote.prototype._connect_start = function () {
self._connect_retry();
};
-
- // Node's ws module doesn't pass arguments to onmessage.
- ws.on('message', function (json, flags) {
- self._connect_message(ws, json, flags);
- });
+
+ ws.onmessage = function (json) {
+ self._connect_message(ws, json.data);
+ };
};
// It is possible for messages to be dispatched after the connection is closed.
-Remote.prototype._connect_message = function (ws, json, flags) {
+Remote.prototype._connect_message = function (ws, json) {
var message = JSON.parse(json);
var unexpected = false;
var request;
|
Change from ws.on('message') to ws.onmessage for browser compat.
|
diff --git a/jquery.nette-ajax.js b/jquery.nette-ajax.js
index <HASH>..<HASH> 100644
--- a/jquery.nette-ajax.js
+++ b/jquery.nette-ajax.js
@@ -70,10 +70,12 @@ var nette = function () {
this.init = function (load, loadContext) {
if (typeof load == 'function') {
+ this.ext('n:init', null);
this.ext('n:init', {
load: load,
}, loadContext);
} else if (typeof load == 'object') {
+ this.ext('n:init', null);
this.ext('n:init', load, loadContext);
} else if (load !== undefined) {
throw 'Argument of init() can be function or function-hash only.';
|
Calling init() with callbacks overrides automatic behavior (exception)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,14 +9,13 @@ if not on_rtd:
"numpy",
"pyicu",
"fuzzywuzzy",
- "sphinxcontrib-napoleon",
"python-Levenshtein",
# Remove this if colormath bug #51 is resolved
"networkx",
+ "sphinx>=1.3b2",
]
else:
install_requires = [
- "sphinxcontrib-napoleon",
"mock",
]
|
packaging: Remove 'napoleon' dependency
As of <I>, 'napoleon' is included in Sphinx itself.
|
diff --git a/bika/lims/browser/batch.py b/bika/lims/browser/batch.py
index <HASH>..<HASH> 100644
--- a/bika/lims/browser/batch.py
+++ b/bika/lims/browser/batch.py
@@ -45,4 +45,19 @@ class BatchAnalysisRequestsView(AnalysisRequestsView):
class BatchSamplesView(SamplesView):
def __init__(self, context, request):
super(BatchSamplesView, self).__init__(context, request)
- self.contentFilter['getBatchUID'] = self.context.UID()
+ self.view_url = self.context.absolute_url() + "/samples"
+ if 'path' in self.contentFilter:
+ del(self.contentFilter['path'])
+
+ def contentsMethod(self, contentFilter):
+ tool = getToolByName(self.context, self.catalog)
+ state = [x for x in self.review_states if x['id'] == self.review_state][0]
+ for k,v in state['contentFilter'].items():
+ self.contentFilter[k] = v
+ tool_samples = tool(contentFilter)
+ samples = {}
+ for sample in (p.getObject() for p in tool_samples):
+ for ar in sample.getAnalysisRequests():
+ if ar.getBatchUID() == self.context.UID():
+ samples[sample.getId()] = sample
+ return samples.values()
|
Batch: Show correct list of samples in batch samples view
|
diff --git a/lib/nodejs/sclang.js b/lib/nodejs/sclang.js
index <HASH>..<HASH> 100644
--- a/lib/nodejs/sclang.js
+++ b/lib/nodejs/sclang.js
@@ -273,8 +273,8 @@ SCLang.prototype.initInterpreter = function() {
this.once('interpreterLoaded', function() {
deferred.resolve(self);
});
- this.write('thisProcess.interpreter.executeFile("' + path + '")',
null, true);
+ this.write('thisProcess.interpreter.executeFile("' + path + '");\n',
};
/**
@@ -308,7 +308,7 @@ SCLang.prototype.interpret = function(code, nowExecutingPath, asString) {
scode;
scode = 'Library.at(\\supercolliderjs, \\interpret).value(' + args +
- ');"SUPERCOLLIDERJS.interpreted".postln;';
+ ');"SUPERCOLLIDERJS.interpreted".postln;\n';
// register listener
this.calls[guid] = deferred;
|
fix interpret for <I>.x which always requires a \n
|
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/service/ClientSession.java b/aeron-cluster/src/main/java/io/aeron/cluster/service/ClientSession.java
index <HASH>..<HASH> 100644
--- a/aeron-cluster/src/main/java/io/aeron/cluster/service/ClientSession.java
+++ b/aeron-cluster/src/main/java/io/aeron/cluster/service/ClientSession.java
@@ -169,6 +169,11 @@ public class ClientSession
this.isClosing = true;
}
+ void resetClosing()
+ {
+ isClosing = false;
+ }
+
void disconnect()
{
CloseHelper.close(responsePublication);
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusteredServiceAgent.java b/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusteredServiceAgent.java
index <HASH>..<HASH> 100644
--- a/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusteredServiceAgent.java
+++ b/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusteredServiceAgent.java
@@ -419,6 +419,7 @@ class ClusteredServiceAgent implements Agent, Cluster
if (Role.LEADER == role)
{
session.connect(aeron);
+ session.resetClosing();
}
else
{
|
[Java] Reset closing status on client session in service on role change to leader so they can be closed in new term if the attempt happened just before leadership change.
|
diff --git a/src/Node/Directory.php b/src/Node/Directory.php
index <HASH>..<HASH> 100644
--- a/src/Node/Directory.php
+++ b/src/Node/Directory.php
@@ -11,7 +11,7 @@ use React\Filesystem\ObjectStreamSink;
use React\Promise\Deferred;
use React\Promise\FulfilledPromise;
-class Directory implements DirectoryInterface, GenericOperationInterface
+class Directory implements DirectoryInterface
{
use GenericOperationTrait;
diff --git a/src/Node/File.php b/src/Node/File.php
index <HASH>..<HASH> 100644
--- a/src/Node/File.php
+++ b/src/Node/File.php
@@ -14,7 +14,7 @@ use React\Promise\FulfilledPromise;
use React\Promise\RejectedPromise;
use React\Stream\BufferedSink;
-class File implements FileInterface, GenericOperationInterface
+class File implements FileInterface
{
use GenericOperationTrait;
diff --git a/src/Node/NodeInterface.php b/src/Node/NodeInterface.php
index <HASH>..<HASH> 100644
--- a/src/Node/NodeInterface.php
+++ b/src/Node/NodeInterface.php
@@ -2,7 +2,7 @@
namespace React\Filesystem\Node;
-interface NodeInterface
+interface NodeInterface extends GenericOperationInterface
{
const DS = DIRECTORY_SEPARATOR;
|
Moved GenericOperationInterface implements to NodeInterface
|
diff --git a/libs/Gustav/Cache/Filesystem/Cache.php b/libs/Gustav/Cache/Filesystem/Cache.php
index <HASH>..<HASH> 100755
--- a/libs/Gustav/Cache/Filesystem/Cache.php
+++ b/libs/Gustav/Cache/Filesystem/Cache.php
@@ -237,7 +237,7 @@ class Cache implements ICache {
if($this->_deleted === true) {
throw CacheException::fileDeleted($this->_fileName);
}
- if($force !== true && $this->_deleted === false) { //not changed...
+ if($force !== true && $this->_updated === false) { //not changed...
return;
}
|
Fixed bug with ignoring saving process of changed cache files
|
diff --git a/openquake/db/models.py b/openquake/db/models.py
index <HASH>..<HASH> 100644
--- a/openquake/db/models.py
+++ b/openquake/db/models.py
@@ -642,6 +642,9 @@ class ModelContent(djm.Model):
content_type = djm.TextField()
last_update = djm.DateTimeField(editable=False, default=datetime.utcnow)
+ class Meta: # pylint: disable=C0111,W0232
+ db_table = 'uiapi\".\"model_content'
+
class Input2job(djm.Model):
'''
|
Added missing site_model schema declaration
|
diff --git a/insights/client/data_collector.py b/insights/client/data_collector.py
index <HASH>..<HASH> 100644
--- a/insights/client/data_collector.py
+++ b/insights/client/data_collector.py
@@ -204,7 +204,7 @@ class DataCollector(object):
raise LookupError
logger.warn("WARNING: Skipping patterns defined in blacklist configuration")
except LookupError:
- logger.debug('Patterns section of remove.conf is empty.')
+ logger.debug('Patterns section of blacklist configuration is empty.')
for c in conf['commands']:
# remember hostname archive path
@@ -272,13 +272,14 @@ class DataCollector(object):
and archive files.
"""
if self.config.obfuscate:
+ if rm_conf and rm_conf.get('keywords'):
+ logger.warn("WARNING: Skipping keywords defined in blacklist configuration")
cleaner = SOSCleaner(quiet=True)
clean_opts = CleanOptions(
self.config, self.archive.tmp_dir, rm_conf, self.hostname_path)
cleaner.clean_report(clean_opts, self.archive.archive_dir)
if clean_opts.keyword_file is not None:
os.remove(clean_opts.keyword_file.name)
- logger.warn("WARNING: Skipping keywords found in remove.conf")
if self.config.output_dir:
# return the entire soscleaner dir
# see additions to soscleaner.SOSCleaner.clean_report
|
messaging fixes for blacklist (#<I>)
* messaging fixes for blacklist
|
diff --git a/lib/chamber/version.rb b/lib/chamber/version.rb
index <HASH>..<HASH> 100644
--- a/lib/chamber/version.rb
+++ b/lib/chamber/version.rb
@@ -1,3 +1,3 @@
class Chamber
- VERSION = '1.0.0'
+ VERSION = '1.0.1'
end
|
Version Bump to <I>
|
diff --git a/yandextank/aggregator/tank_aggregator.py b/yandextank/aggregator/tank_aggregator.py
index <HASH>..<HASH> 100644
--- a/yandextank/aggregator/tank_aggregator.py
+++ b/yandextank/aggregator/tank_aggregator.py
@@ -79,9 +79,7 @@ class TankAggregator(object):
self.stats)
self.stats_drain.start()
else:
- raise PluginImplementationError(
- "Generator must pass a Reader and a StatsReader"
- " to Aggregator before starting test")
+ logger.warning("Generator not found. Generator must provide a reader and a stats_reader interface")
def _collect_data(self):
"""
diff --git a/yandextank/core/tankcore.py b/yandextank/core/tankcore.py
index <HASH>..<HASH> 100644
--- a/yandextank/core/tankcore.py
+++ b/yandextank/core/tankcore.py
@@ -244,7 +244,7 @@ class TankCore(object):
gen = self.get_plugin_of_type(GeneratorPlugin)
# aggregator
except KeyError:
- logger.warning("Load generator not found:", exc_info=True)
+ logger.warning("Load generator not found")
gen = GeneratorPlugin()
aggregator = TankAggregator(gen)
self._job = Job(monitoring_plugin=mon,
|
fix autoclean: no exception when generator not found
|
diff --git a/__init__.py b/__init__.py
index <HASH>..<HASH> 100755
--- a/__init__.py
+++ b/__init__.py
@@ -20,7 +20,7 @@ class SculptDebugMiddleware(object):
if settings.SCULPT_DUMP_SQL or settings.SCULPT_DUMP_SESSION or settings.SCULPT_DUMP_REQUESTS:
if self.date_request_started != None:
elapsed_time = (datetime.datetime.utcnow() - self.date_request_started).total_seconds()
- print '==== REQUEST TIME: %s %.3fs %s' % (request.method, elapsed_time, request.META['RAW_URI'])
+ print '==== REQUEST TIME: %s %.3fs %s' % (request.method, elapsed_time, request.META['RAW_URI'] if 'RAW_URI' in request.META else request.META['PATH_INFO'])
if settings.SCULPT_DUMP_SQL:
print '==== SQL QUERIES ===='
|
Fix for Django's dumb test server which doesn't set all ENV variables.
|
diff --git a/app/models/manager_refresh/inventory_collection.rb b/app/models/manager_refresh/inventory_collection.rb
index <HASH>..<HASH> 100644
--- a/app/models/manager_refresh/inventory_collection.rb
+++ b/app/models/manager_refresh/inventory_collection.rb
@@ -308,7 +308,7 @@ module ManagerRefresh
@builder_params = builder_params
@name = name || association
- raise "You have to pass either :name or :association argument to InventoryCollection.new" if @name.blank?
+ raise "You have to pass either :name or :association argument to .new of #{self}" if @name.blank?
@inventory_object_attributes = inventory_object_attributes
|
Reformulate the exception to contain a pointer to the IC object
Reformulate the exception to contain a pointer to the IC object
(transferred from ManageIQ/manageiq@<I>ffe<I>ba<I>ccb7cc5ded3a<I>a1eca<I>fa)
|
diff --git a/app/SymfonyStandard/RootPackageInstallSubscriber.php b/app/SymfonyStandard/RootPackageInstallSubscriber.php
index <HASH>..<HASH> 100644
--- a/app/SymfonyStandard/RootPackageInstallSubscriber.php
+++ b/app/SymfonyStandard/RootPackageInstallSubscriber.php
@@ -18,11 +18,6 @@ use Sensio\Bundle\DistributionBundle\Composer\ScriptHandler;
class RootPackageInstallSubscriber implements EventSubscriberInterface
{
- public static function installAcmeDemoBundle(CommandEvent $event)
- {
- ScriptHandler::installAcmeDemoBundle($event);
- }
-
public static function setupNewDirectoryStructure(CommandEvent $event)
{
ScriptHandler::defineDirectoryStructure($event);
@@ -33,7 +28,6 @@ class RootPackageInstallSubscriber implements EventSubscriberInterface
return array(
ScriptEvents::POST_INSTALL_CMD => array(
array('setupNewDirectoryStructure', 512),
- array('installAcmeDemoBundle', 0)
),
);
}
|
Removed AcmeDemoBundle
|
diff --git a/lib/rjr/messages/response.rb b/lib/rjr/messages/response.rb
index <HASH>..<HASH> 100644
--- a/lib/rjr/messages/response.rb
+++ b/lib/rjr/messages/response.rb
@@ -78,7 +78,7 @@ class Response
def parse_headers(request)
request.keys.select { |k|
- !['jsonrpc', 'id', 'method', 'params'].include?(k)
+ !['jsonrpc', 'id', 'method', 'result', 'error'].include?(k)
}.each { |k| @headers[k] = request[k] }
end
|
Fix json fields ignored in response header analysis
Recent refactoring exposed a bug where response headers
were not being set properly
|
diff --git a/src/components/widgets/DateTimePicker.js b/src/components/widgets/DateTimePicker.js
index <HASH>..<HASH> 100644
--- a/src/components/widgets/DateTimePicker.js
+++ b/src/components/widgets/DateTimePicker.js
@@ -140,11 +140,11 @@ export default class DateTimePicker extends Component {
});
}
- onTimeUpdate() {
+ onTimeUpdate(value) {
const {time: currentTime, date: currentDate} = this.parseDateTime(this.props.value);
- const isValidTime = isDateTime(testDate + ' ' + this.state.timeValue);
+ const isValidTime = isDateTime(testDate + ' ' + value);
- if (this.state.timeValue === '') {
+ if (value === '') {
this.setState({
timeInputClassName: 'datetimepicker-container-time-input',
timeValue: currentTime,
@@ -153,7 +153,7 @@ export default class DateTimePicker extends Component {
}
if (isValidTime) {
- this.props.onChange(currentDate + ' ' + this.state.timeValue);
+ this.props.onChange(currentDate + ' ' + value);
}
}
|
make onTimeUpdate code follow what onDateUpdate does
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -441,10 +441,14 @@ module.exports.NULL = binding.types.Null.NULL;
* TODO: remove for 4.0
*/
+function processSassDeprecationMessage() {
+ console.log('Deprecation warning: `process.sass` is an undocumented internal that will be removed in future versions of Node Sass.');
+}
+
process.sass = process.sass || {
- versionInfo: module.exports.info,
- binaryName: sass.getBinaryName(),
- binaryUrl: sass.getBinaryUrl(),
- binaryPath: sass.getBinaryPath(),
- getBinaryPath: sass.getBinaryPath,
+ get versionInfo() { processSassDeprecationMessage(); return module.exports.info; },
+ get binaryName() { processSassDeprecationMessage(); return sass.getBinaryName(); },
+ get binaryUrl() { processSassDeprecationMessage(); return sass.getBinaryUrl(); },
+ get binaryPath() { processSassDeprecationMessage(); return sass.getBinaryPath(); },
+ get getBinaryPath() { processSassDeprecationMessage(); return sass.getBinaryPath; },
};
|
Ouptut a deprecation warning to stdout when using process.sass
This is an undocumented internal API that will be removed. Access
`process.sass` will produce the following warning.
>Deprecation warning: `process.sass` is an undocumented internal
that will be removed in future versions of Node Sass.
|
diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/test/HoneycombAuditEventTestListener.java b/server/src/test/java/org/cloudfoundry/identity/uaa/test/HoneycombAuditEventTestListener.java
index <HASH>..<HASH> 100644
--- a/server/src/test/java/org/cloudfoundry/identity/uaa/test/HoneycombAuditEventTestListener.java
+++ b/server/src/test/java/org/cloudfoundry/identity/uaa/test/HoneycombAuditEventTestListener.java
@@ -29,11 +29,13 @@ public class HoneycombAuditEventTestListener<T extends ApplicationEvent> extends
super.handleEvent(applicationEvent);
this.events.removeIf(event -> {
- honeycombEventFactory.createEvent()
- .addField("auditEvent", event.getClass().getSimpleName())
- .addField("eventSource", event.toString())
- .addField("testName", testRunning)
- .send();
+ try {
+ honeycombEventFactory.createEvent()
+ .addField("auditEvent", event.getClass().getSimpleName())
+ .addField("eventSource", event.toString())
+ .addField("testName", testRunning)
+ .send();
+ } catch(Exception _) {}
return true;
});
}
|
Allow tests to run without having to provide honeycomb environment params
|
diff --git a/pandas/core/series.py b/pandas/core/series.py
index <HASH>..<HASH> 100644
--- a/pandas/core/series.py
+++ b/pandas/core/series.py
@@ -2310,7 +2310,9 @@ copy : boolean, default False
df = DataFrame.from_csv(path, header=header, index_col=index_col,
sep=sep, parse_dates=parse_dates,
encoding=encoding)
- return df.ix[:, 0]
+ result = df.ix[:, 0]
+ result.index.name = result.name = None
+ return result
def to_csv(self, path, index=True, sep=",", na_rep='', header=False,
index_label=None, mode='w', nanRep=None, encoding=None):
diff --git a/pandas/tests/test_series.py b/pandas/tests/test_series.py
index <HASH>..<HASH> 100644
--- a/pandas/tests/test_series.py
+++ b/pandas/tests/test_series.py
@@ -1879,6 +1879,8 @@ class TestSeries(unittest.TestCase, CheckNameIntegration):
self.series.to_csv('_foo')
series = Series.from_csv('_foo')
+ self.assert_(series.name is None)
+ self.assert_(series.index.name is None)
assert_series_equal(self.series, series)
outfile = open('_foo', 'w')
|
BUG: return nameless Series and index from from_csv
|
diff --git a/temperusb/cli.py b/temperusb/cli.py
index <HASH>..<HASH> 100644
--- a/temperusb/cli.py
+++ b/temperusb/cli.py
@@ -24,8 +24,11 @@ def parse_args():
default='1')
args = parser.parse_args()
- args.sensor_ids = list(range(args.sensor_count)) if args.sensor_ids == 'all' \
- else [int(args.sensor_ids)]
+ if args.sensor_ids == 'all':
+ args.sensor_ids = range(args.sensor_count)
+ else:
+ args.sensor_ids = [int(args.sensor_ids)]
+
return args
|
Break-out inline conditional to multiple lines (more obvious)
|
diff --git a/lib/levels/nested.js b/lib/levels/nested.js
index <HASH>..<HASH> 100644
--- a/lib/levels/nested.js
+++ b/lib/levels/nested.js
@@ -1,3 +1,5 @@
+'use strict';
+
var INHERIT = require('inherit'),
PATH = require('../path'),
Level = require('../level').Level,
diff --git a/lib/levels/project.js b/lib/levels/project.js
index <HASH>..<HASH> 100644
--- a/lib/levels/project.js
+++ b/lib/levels/project.js
@@ -1,3 +1,5 @@
+'use strict';
+
exports.baseLevelPath = require.resolve('./simple');
exports.getTypes = function() {
diff --git a/lib/levels/simple.js b/lib/levels/simple.js
index <HASH>..<HASH> 100644
--- a/lib/levels/simple.js
+++ b/lib/levels/simple.js
@@ -1,3 +1,5 @@
+'use strict';
+
var INHERIT = require('inherit'),
Level = require('../level').Level,
U = require('../util');
@@ -114,7 +116,7 @@ exports.Level = INHERIT(Level, {
block: block,
suffix: suffix,
tech: this.suffixToTech[suffix]
- }
+ };
file = file.substring(0, dot);
|
Fix jshint errors in lib/levels/
|
diff --git a/holoviews/streams.py b/holoviews/streams.py
index <HASH>..<HASH> 100644
--- a/holoviews/streams.py
+++ b/holoviews/streams.py
@@ -314,7 +314,7 @@ class Selection1D(Stream):
A stream representing a 1D selection of objects by their index.
"""
- index = param.List(default=[], doc="""
+ index = param.List(default=[], constant=True, doc="""
Indices into a 1D datastructure.""")
|
Declared index parameter of Selection1D stream as constant
|
diff --git a/grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/ControllersApi.java b/grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/ControllersApi.java
index <HASH>..<HASH> 100644
--- a/grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/ControllersApi.java
+++ b/grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/ControllersApi.java
@@ -20,6 +20,7 @@ import grails.util.Environment;
import grails.util.GrailsNameUtils;
import groovy.lang.Closure;
+import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -52,7 +53,7 @@ import org.springframework.web.servlet.ModelAndView;
* @since 2.0
*/
@SuppressWarnings("rawtypes")
-public class ControllersApi extends CommonWebApi {
+public class ControllersApi extends CommonWebApi implements Serializable {
private static final String RENDER_METHOD_NAME = "render";
private static final String BIND_DATA_METHOD = "bindData";
|
fix for GPWEBFLOW-<I> "putting a command object in flow scope causes NotSerializableException, even when command object is Serializable"
|
diff --git a/lib/fog/vcloud/compute.rb b/lib/fog/vcloud/compute.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/vcloud/compute.rb
+++ b/lib/fog/vcloud/compute.rb
@@ -300,7 +300,7 @@ module Fog
# Use this to set the Authorization header for login
def authorization_header
- "Basic #{Base64.encode64("#{@username}:#{@password}").chomp!}"
+ "Basic #{Base64.strict_encode64("#{@username}:#{@password}")}"
end
# Actually do the request
|
Use strict base encoding otherwise breaks for very large org names.
|
diff --git a/lib/bson/ordered_hash.rb b/lib/bson/ordered_hash.rb
index <HASH>..<HASH> 100644
--- a/lib/bson/ordered_hash.rb
+++ b/lib/bson/ordered_hash.rb
@@ -30,7 +30,7 @@ module BSON
when BSON::OrderedHash
keys == other.keys && values == other.values
else
- !other.nil? && keys.size == other.keys.size && keys.all? {|x| self[x] == other[x] }
+ super
end
rescue
false
|
Call super in BSON::OrderedHash#== instead of doing the comparison in Ruby.
This has a notable performance impact for large hashes.
|
diff --git a/Swat/SwatTextareaEditor.php b/Swat/SwatTextareaEditor.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatTextareaEditor.php
+++ b/Swat/SwatTextareaEditor.php
@@ -18,9 +18,12 @@ require_once 'Swat/SwatYUI.php';
*/
class SwatTextareaEditor extends SwatTextarea
{
+ // {{{ class constants
+
const MODE_VISUAL = 1;
const MODE_SOURCE = 2;
+ // }}}
// {{{ public properties
/**
@@ -103,7 +106,7 @@ class SwatTextareaEditor extends SwatTextarea
$value = htmlspecialchars($value);
$div_tag = new SwatHtmlTag('div');
- $div_tag->class = 'swat-textarea-container';
+ $div_tag->class = 'swat-textarea-editor-container';
$div_tag->open();
$textarea_tag = new SwatHtmlTag('textarea');
|
Add folding and use a separate container class name for visual editor container.
svn commit r<I>
|
diff --git a/app/models/fae/option.rb b/app/models/fae/option.rb
index <HASH>..<HASH> 100644
--- a/app/models/fae/option.rb
+++ b/app/models/fae/option.rb
@@ -18,7 +18,7 @@ module Fae
def self.instance
# there will be only one row, and its ID must be '1'
begin
- find(1)
+ first
rescue ActiveRecord::RecordNotFound
# slight race condition here, but it will only happen once
row = Option.new({title: 'My FINE Admin'})
|
fixed Singleton instance check to accomidate the case where Option with the id
of 1 is deleted.
|
diff --git a/lib/deliver/app_metadata_screenshots.rb b/lib/deliver/app_metadata_screenshots.rb
index <HASH>..<HASH> 100644
--- a/lib/deliver/app_metadata_screenshots.rb
+++ b/lib/deliver/app_metadata_screenshots.rb
@@ -119,8 +119,12 @@ module Deliver
self.clear_all_screenshots(language)
Dir.glob(resulting_path, File::FNM_CASEFOLD).sort.each do |path|
+ # When frameit is enabled, we only want to upload the framed screenshots
if use_framed
- next unless path.include?"_framed."
+ # Except for Watch screenshots, they are okay without _framed
+ if AppScreenshot.new(path).screen_size != AppScreenshot::ScreenSize::IOS_APPLE_WATCH
+ next unless path.include?"_framed."
+ end
else
next if path.include?"_framed."
end
|
Fixed not detecting Watch screenshots when frameit <I> is activated
|
diff --git a/troposphere/ec2.py b/troposphere/ec2.py
index <HASH>..<HASH> 100644
--- a/troposphere/ec2.py
+++ b/troposphere/ec2.py
@@ -1308,10 +1308,12 @@ class ClientVpnEndpoint(AWSObject):
'ConnectionLogOptions': (ConnectionLogOptions, True),
'Description': (basestring, False),
'DnsServers': ([basestring], False),
+ 'SecurityGroupIds': ([basestring], False),
'ServerCertificateArn': (basestring, True),
'SplitTunnel': (boolean, False),
'TagSpecifications': ([TagSpecifications], False),
'TransportProtocol': (basestring, False),
+ 'VpcId': (basestring, False),
'VpnPort': (validate_clientvpnendpoint_vpnport, False),
}
|
adding AWS::EC2::ClientVpnEndpoint properties, per March <I>, <I> update
|
diff --git a/moment.js b/moment.js
index <HASH>..<HASH> 100644
--- a/moment.js
+++ b/moment.js
@@ -1059,7 +1059,7 @@
},
toJSON : function () {
- return this.utc().format('YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+ return moment(this).utc().format('YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
},
toArray : function () {
|
Fixed missing cloning of moment in toJSON method
|
diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py
index <HASH>..<HASH> 100644
--- a/sos/policies/redhat.py
+++ b/sos/policies/redhat.py
@@ -297,6 +297,8 @@ support representative.
return 6
elif pkgname[0] == "7":
return 7
+ elif pkgname[0] == "8":
+ return 8
except Exception:
pass
return False
|
[redhat] Update policy to identify RHEL 8
Now that RHEL 8 Beta is out, update the redhat policy dist_version to be
able to properly set the version.
Resolves: #<I>
|
diff --git a/tests/pychimeratest.py b/tests/pychimeratest.py
index <HASH>..<HASH> 100644
--- a/tests/pychimeratest.py
+++ b/tests/pychimeratest.py
@@ -3,10 +3,11 @@
import os
import sys
+from glob import glob
import pytest
from pychimera import patch_environ, enable_chimera
if __name__ == '__main__':
patch_environ()
enable_chimera()
- pytest.main(sys.argv[1:])
\ No newline at end of file
+ pytest.main([a for arg in sys.argv[1:] for a in glob(arg)])
|
tests: windows cmd does not process wildcards so glob it in Python always
|
diff --git a/ui/src/components/img/QImg.js b/ui/src/components/img/QImg.js
index <HASH>..<HASH> 100644
--- a/ui/src/components/img/QImg.js
+++ b/ui/src/components/img/QImg.js
@@ -64,6 +64,14 @@ export default Vue.extend({
url () {
return this.currentSrc || this.placeholderSrc || void 0
+ },
+
+ attrs () {
+ const att = { role: 'img' }
+ if (this.alt !== void 0) {
+ att['aria-label'] = this.alt
+ }
+ return att
}
},
@@ -221,10 +229,7 @@ export default Vue.extend({
render (h) {
return h('div', {
staticClass: 'q-img overflow-hidden',
- attrs: this.alt !== void 0 ? {
- role: 'img',
- 'aria-label': this.alt
- } : null,
+ attrs: this.attrs,
on: this.$listeners
}, [
h('div', {
|
fix(QImg): always render "role" attribute
|
diff --git a/test/label.js b/test/label.js
index <HASH>..<HASH> 100644
--- a/test/label.js
+++ b/test/label.js
@@ -147,4 +147,23 @@ describe('seraph#label', function() {
done();
});
});
+
+ it('should delete a label from a node', function(done) {
+ var label = uniqn();
+ db.save({ name: 'Jon' }, function(err, node) {
+ assert(!err);
+ assert(node.id);
+ db.label(node, label, function(err) {
+ assert(!err, err);
+ db.removeLabel(node, label, function(err) {
+ assert(!err);
+ db.nodesWithLabel(label, function(err, results) {
+ assert(!err);
+ assert(results.length == 0);
+ done();
+ });
+ });
+ });
+ });
+ });
});
|
labels: added test for removing a label from a node
|
diff --git a/empire/pkg/awsutil/awsutil.go b/empire/pkg/awsutil/awsutil.go
index <HASH>..<HASH> 100644
--- a/empire/pkg/awsutil/awsutil.go
+++ b/empire/pkg/awsutil/awsutil.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"io"
+ "io/ioutil"
"net/http"
"strings"
)
@@ -17,7 +18,7 @@ type Request struct {
func (r *Request) String() string {
body, err := formatJSON(strings.NewReader(r.Body))
if err != nil {
- panic(err)
+ body = r.Body
}
return fmt.Sprintf("Operation: %s\nBody: %s", r.Operation, body)
}
@@ -47,11 +48,16 @@ func NewHandler(m map[Request]Response) *Handler {
}
func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- body, err := formatJSON(r.Body)
+ raw, err := ioutil.ReadAll(r.Body)
if err != nil {
panic(err)
}
+ body, err := formatJSON(r.Body)
+ if err != nil {
+ body = string(raw)
+ }
+
match := Request{
Operation: r.Header.Get("X-Amz-Target"),
Body: body,
|
Allow awsutil.Handler to fallback to raw io unable to json parse
|
diff --git a/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php b/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php
index <HASH>..<HASH> 100644
--- a/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php
+++ b/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php
@@ -48,7 +48,7 @@ echo 'SUCCESS: ' . %s;
PHP;
/**
- * Verifies that lazy loading ghost will work with all given classes
+ * Verifies that lazy loading ghost creation will work with all given classes
*
* @param string $className a valid (existing/autoloadable) class name
*
|
Minor docblock fixes/clarifications
|
diff --git a/lib/Seafile/Resource/Directory.class.php b/lib/Seafile/Resource/Directory.class.php
index <HASH>..<HASH> 100644
--- a/lib/Seafile/Resource/Directory.class.php
+++ b/lib/Seafile/Resource/Directory.class.php
@@ -131,4 +131,30 @@ class Directory extends AbstractResource
return $response->getStatusCode() === 201;
}
+
+ /**
+ * Remove a directory
+ *
+ * @param LibraryType $library Library instance
+ * @param String $directoryPath Directory path
+ * @return bool
+ */
+ public function rmdir(LibraryType $library, $directoryPath) {
+ $uri = sprintf(
+ '%s/repos/%s/dir/?p=%s',
+ $this->clipUri($this->client->getConfig('base_uri')),
+ $library->id,
+ rtrim($directoryPath, '/')
+ );
+
+ $response = $this->client->request(
+ 'DELETE',
+ $uri,
+ [
+ 'headers' => ['Accept' => 'application/json'],
+ ]
+ );
+
+ return $response->getStatusCode() === 200;
+ }
}
|
Added rmdir function to remove directories.
|
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index <HASH>..<HASH> 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -17,6 +17,7 @@ module ActionMailer #:nodoc:
# class Notifier < ActionMailer::Base
# def signup_notification(recipient)
# recipients recipient.email_address_with_name
+ # bcc ["bcc@example.com", "Order Watcher <watcher@example.com>"]
# from "system@example.com"
# subject "New account information"
# body :account => recipient
|
ActionMailer::Base - add example of multiple recipients and make the format of addresses obvious
|
diff --git a/cert/lib/cert/version.rb b/cert/lib/cert/version.rb
index <HASH>..<HASH> 100644
--- a/cert/lib/cert/version.rb
+++ b/cert/lib/cert/version.rb
@@ -1,3 +1,3 @@
module Cert
- VERSION = "1.4.4"
+ VERSION = "1.4.5"
end
|
[cert] Version bump to <I> (#<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -159,7 +159,8 @@ setup(
'Sphinx<=1.6.7',
'nbsphinx',
'numpydoc',
- 'recommonmark'
+ 'recommonmark',
+ 'seaborn'
]},
python_requires='>=2.7',
|
adding seaborn as extra 'dev' dependency (since examples are used in docs). Fixes #<I>
|
diff --git a/machina/apps/feeds/feeds.py b/machina/apps/feeds/feeds.py
index <HASH>..<HASH> 100644
--- a/machina/apps/feeds/feeds.py
+++ b/machina/apps/feeds/feeds.py
@@ -43,7 +43,7 @@ class LastTopicsFeed(Feed):
Forum.objects.all(), request.user)
def items(self):
- return Topic.objects.filter(forum__in=self.forums).order_by('-updated')
+ return Topic.objects.filter(forum__in=self.forums, approved=True).order_by('-updated')
def item_pubdate(self, item):
return item.created
|
Topics feed updated to not embed non-approved topics
|
diff --git a/pypsa/io.py b/pypsa/io.py
index <HASH>..<HASH> 100644
--- a/pypsa/io.py
+++ b/pypsa/io.py
@@ -597,10 +597,11 @@ def _import_from_importer(network, importer, basename, skip_time=False):
##https://docs.python.org/3/tutorial/datastructures.html#comparing-sequences-and-other-types
if pypsa_version is None or pypsa_version < current_pypsa_version:
logger.warning(dedent("""
- Importing PyPSA from older version of PyPSA than current version {}.
+ Importing PyPSA from older version of PyPSA than current version.
Please read the release notes at https://pypsa.org/doc/release_notes.html
- carefully to prepare your network for import.
- """).format(network.pypsa_version))
+ carefully to prepare your network for import.
+ Currently used PyPSA version {}, imported network file PyPSA version {}.
+ """).format(current_pypsa_version, pypsa_version))
importer.pypsa_version = pypsa_version
importer.current_pypsa_version = current_pypsa_version
|
Include both current and imported network file PyPSA version for convenience. (#<I>)
|
diff --git a/classes/Routing/RoutingProvider.php b/classes/Routing/RoutingProvider.php
index <HASH>..<HASH> 100644
--- a/classes/Routing/RoutingProvider.php
+++ b/classes/Routing/RoutingProvider.php
@@ -33,7 +33,8 @@ class RoutingProvider extends AbstractProvider
? $container->resolve($eventDispatcher) : null;
$config = $this->app->getConfig();
- $cachePath = $config ? $config->get('path.route_cache') : null;
+ $cachePath = ($config && !$config->get('app.debug')) ?
+ $config->get('path.route_cache') : null;
return new Router(
$container->resolve('Autarky\Routing\Invoker'),
|
don't cache routes if app.debug is true
|
diff --git a/lib/qipowl/core/bowler.rb b/lib/qipowl/core/bowler.rb
index <HASH>..<HASH> 100644
--- a/lib/qipowl/core/bowler.rb
+++ b/lib/qipowl/core/bowler.rb
@@ -119,6 +119,7 @@ module Qipowl::Bowlers
curr_sect.delete key
self.class.const_get("ENCLOSURES_TAGS").delete key
+ self.class.const_get("ENTITIES")[section.to_sym].delete key
self.class.class_eval %Q{
remove_method :#{key.bowl}
|
Weird bug in previous commit(s): entity removal now works.
|
diff --git a/lib/heroku/command/buildpacks.rb b/lib/heroku/command/buildpacks.rb
index <HASH>..<HASH> 100644
--- a/lib/heroku/command/buildpacks.rb
+++ b/lib/heroku/command/buildpacks.rb
@@ -25,7 +25,7 @@ module Heroku::Command
display("#{app} has no Buildpack URL set.")
else
styled_header("#{app} Buildpack URL#{app_buildpacks.size > 1 ? 's' : ''}")
- display_buildpacks(app_buildpacks.map{|bp| bp["buildpack"]["url"]})
+ display_buildpacks(app_buildpacks.map{|bp| bp["buildpack"]["url"]}, "")
end
end
@@ -193,12 +193,12 @@ module Heroku::Command
display_buildpack_change(buildpack_urls, action)
end
- def display_buildpacks(buildpacks)
+ def display_buildpacks(buildpacks, indent=" ")
if (buildpacks.size == 1)
display(buildpacks.first)
else
buildpacks.each_with_index do |bp, i|
- display(" #{i+1}. #{bp}")
+ display("#{indent}#{i+1}. #{bp}")
end
end
end
|
Improved indentation of buildpacks output
|
diff --git a/mod/jodd-wot/src/jodd/lagarto/adapter/htmlstapler/HtmlStaplerBundlesManager.java b/mod/jodd-wot/src/jodd/lagarto/adapter/htmlstapler/HtmlStaplerBundlesManager.java
index <HASH>..<HASH> 100644
--- a/mod/jodd-wot/src/jodd/lagarto/adapter/htmlstapler/HtmlStaplerBundlesManager.java
+++ b/mod/jodd-wot/src/jodd/lagarto/adapter/htmlstapler/HtmlStaplerBundlesManager.java
@@ -373,6 +373,13 @@ public class HtmlStaplerBundlesManager {
} else {
localFile += FileNameUtil.getPath(actionPath) + '/' + src;
}
+
+ // trim link parameters, if any
+ int qmndx = localFile.indexOf('?');
+ if (qmndx != -1) {
+ localFile = localFile.substring(0, qmndx);
+ }
+
content = FileUtil.readString(localFile);
} else {
// download local resource
|
fixing bug when local resource file has parameters
|
diff --git a/lib/Importer.js b/lib/Importer.js
index <HASH>..<HASH> 100644
--- a/lib/Importer.js
+++ b/lib/Importer.js
@@ -349,19 +349,21 @@ class Importer {
].join(' ');
const command = `${findCommand} | ${egrepCommand}`;
- // TODO switch from spawnSync to spawn so we can start processing the
- // stream as it comes in.
- const child = childProcess.spawnSync(command);
-
- if (child.error) {
- throw child.error;
+ // TODO switch to spawn so we can start processing the stream as it comes
+ // in.
+ let out = '';
+ let err = '';
+ try {
+ out = String(childProcess.execSync(command));
+ } catch (error) {
+ err = String(error.stderr);
}
- if (child.stderr) {
- throw new Error(child.stderr);
+ if (err !== '') {
+ throw new Error(err);
}
- child.output.forEach((f) => {
+ out.split('\n').forEach((f) => {
// TODO: it looks like we process empty strings here too (f === '')
if (this.config.get('excludes').some(
(globPattern) => minimatch(f, globPattern))) {
|
Temporarily switch to execSync when finding files
spawnSync was failing with a ENOENT error every time. I didn't have time
to dig in to this, so I'm just switching to execSync that I know works
in the meantime.
|
diff --git a/src/js/pannellum.js b/src/js/pannellum.js
index <HASH>..<HASH> 100644
--- a/src/js/pannellum.js
+++ b/src/js/pannellum.js
@@ -2051,7 +2051,7 @@ function loadScene(sceneId, targetPitch, targetYaw, targetHfov, fadeDone) {
if (workingHfov !== undefined) {
config.hfov = workingHfov;
}
- fireEvent('scenechange');
+ fireEvent('scenechange', sceneId);
load();
}
|
Send the sceneId to 'scenechange' event
|
diff --git a/interfaces/Stringable.php b/interfaces/Stringable.php
index <HASH>..<HASH> 100644
--- a/interfaces/Stringable.php
+++ b/interfaces/Stringable.php
@@ -10,7 +10,8 @@
* but not necessarily the format of the string.
*
* The preferred method to use is the explicit {@see self::toString()}. Implementations should alias the implicit,
- * magic method to its explicit counterpart, so that overriding only requires the modification of one method.
+ * magic method to its explicit counterpart, so that overriding only requires the modification of one method, but
+ * should wrap the call in a try/catch block to ensure conformity with PHP's standard handling of __toString().
*
* @package Nyx\Core
* @version 0.1.0
@@ -23,12 +24,16 @@ interface Stringable
/**
* Returns the string representation of the object.
*
+ * Note: This method MAY throw exceptions.
+ *
* @return string
*/
public function toString() : string;
/**
* {@see self::toString()}
+ *
+ * Note: This method MUST NOT throw exceptions, opposite to the explicit self::toString() method.
*/
public function __toString() : string;
}
|
[Core] Stringable: Implicit __toString() must not throw exceptions, while the explicit toString() may throw them.
|
diff --git a/lib/smart_paginate/version.rb b/lib/smart_paginate/version.rb
index <HASH>..<HASH> 100644
--- a/lib/smart_paginate/version.rb
+++ b/lib/smart_paginate/version.rb
@@ -1,3 +1,3 @@
module SmartPaginate
- VERSION = "0.2.1".freeze
+ VERSION = "0.2.2".freeze
end
|
Update version to <I>.
|
diff --git a/tests/test_ls.py b/tests/test_ls.py
index <HASH>..<HASH> 100644
--- a/tests/test_ls.py
+++ b/tests/test_ls.py
@@ -1,4 +1,5 @@
from pathlib import Path
+import re
from pew._utils import invoke_pew as invoke
@@ -17,7 +18,7 @@ def test_get_site_packages_dir(workon_home):
def test_lssitepackages(workon_home):
invoke('new', 'env', '-d')
pkgs = invoke('in', 'env', 'pew', 'lssitepackages').out
- assert 'easy_install' in pkgs
+ assert re.search(r'setuptools-((\d+\.)+)dist-info', pkgs)
invoke('rm', 'env')
|
Replace easy_install with setuptools in test_lssitepackages
The easy_install top-level model and the easy_install console script
have been removed in setuptools <I>+:
<URL>
|
diff --git a/plugins/database/cassandra/cassandra_test.go b/plugins/database/cassandra/cassandra_test.go
index <HASH>..<HASH> 100644
--- a/plugins/database/cassandra/cassandra_test.go
+++ b/plugins/database/cassandra/cassandra_test.go
@@ -253,6 +253,9 @@ func TestCassandra_RevokeUser(t *testing.T) {
}
func TestCassandra_RotateRootCredentials(t *testing.T) {
+ if os.Getenv("TRAVIS") != "true" {
+ t.SkipNow()
+ }
cleanup, address, port := prepareCassandraTestContainer(t)
defer cleanup()
|
only run cassandra RotateRootCred test when in Travis (#<I>)
|
diff --git a/icekit_events/migrations/0012_auto_20160706_1606.py b/icekit_events/migrations/0012_auto_20160706_1606.py
index <HASH>..<HASH> 100644
--- a/icekit_events/migrations/0012_auto_20160706_1606.py
+++ b/icekit_events/migrations/0012_auto_20160706_1606.py
@@ -24,6 +24,6 @@ class Migration(migrations.Migration):
# No-op: I haven't yet found a way to make this reversible in the
# way you would expect without unique constraint DB errors, whereas
# it works (according to unit tests at least) with a no-op.
- "",
+ "UPDATE django_content_type SET app_label=app_label WHERE app_label='NONE!'",
),
]
|
Make migration reverse no-op a valid SQL query
When using a PostgreSQL database with Django <I> empty reverse query
statements in DB migrations cause an error, so we replace the empty
no-op statement with a valid query that still does nothing so the
reverse migration will work in this case.
This problem doesn't seem to affect Django <I>, which must be smarter
about accepted but not actually running empty statements in DB
migrations.
|
diff --git a/src/store.js b/src/store.js
index <HASH>..<HASH> 100644
--- a/src/store.js
+++ b/src/store.js
@@ -53,6 +53,8 @@ export class Store {
this._highlightPreTag = '<em>';
this._highlightPostTag = '</em>';
+ this._cacheEnabled = true;
+
this.algoliaHelper = helper;
}
@@ -355,11 +357,25 @@ export class Store {
};
}
- // Todo: find a better name for this function.
refresh() {
+ if (this._cacheEnabled === false) {
+ this.clearCache();
+ }
this._helper.search();
}
+ enableCache() {
+ this._cacheEnabled = true;
+ }
+
+ disableCache() {
+ this._cacheEnabled = false;
+ }
+
+ clearCache() {
+ this.algoliaClient.clearCache();
+ }
+
waitUntilInSync() {
return new Promise((resolve, reject) => {
if (this._helper.hasPendingRequests() === false) {
|
feat(store): add methods to interact with cache
Closes: #<I>
|
diff --git a/output/recorder.go b/output/recorder.go
index <HASH>..<HASH> 100644
--- a/output/recorder.go
+++ b/output/recorder.go
@@ -172,7 +172,7 @@ func (r *Recorder) doSave(msg *models.Message) {
}
}
-func (r *Recorder) close(msg *models.Message) error {
+func (r *Recorder) close() {
r.session.Close()
r.session = nil
r.collection = nil
|
trying harder to get more stability in recorder
|
diff --git a/bin/release.py b/bin/release.py
index <HASH>..<HASH> 100755
--- a/bin/release.py
+++ b/bin/release.py
@@ -374,6 +374,7 @@ def release():
# Step 2: Update version in tagged files
prettyprint("Step 2: Updating version number in source files", Levels.INFO)
+ maven_clean()
update_versions(version)
prettyprint("Step 2: Complete", Levels.INFO)
diff --git a/bin/utils.py b/bin/utils.py
index <HASH>..<HASH> 100755
--- a/bin/utils.py
+++ b/bin/utils.py
@@ -392,6 +392,11 @@ class DryRunUploader(DryRun):
def upload(self, fr, to, type):
self.copy(fr, "%s/%s/%s" % (self.location_root, type, to))
+def maven_clean():
+ """Cleans the distribution in the current working dir"""
+ mvn_command = ["mvn","-Passembly","clean"]
+ subprocess.check_call(mvn_command)
+
def maven_build_distribution(version):
"""Builds the distribution in the current working dir"""
mvn_commands = [["clean", "install", "-Passembly"],["deploy","-Passembly","-DskipTests"]]
|
Updated build to clean before changing the POMs
|
diff --git a/admin/index.php b/admin/index.php
index <HASH>..<HASH> 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -52,6 +52,13 @@
error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
}
+ if (empty($CFG->prefix) && $CFG->dbtype != 'mysql') { //Enforce prefixes for everybody but mysql
+ error('$CFG->prefix can\'t be empty for your target DB (' . $CFG->dbtype . ')');
+ }
+
+ if ($CFG->dbtype == 'oci8po' && strlen($CFG->prefix) > 2) { //Max prefix length for Oracle is 2cc
+ error('$CFG->prefix maximum allowed length for Oracle DBs is 2cc.');
+ }
/// Check that config.php has been edited
|
Now admin/index.php checks for proper prefixes (MDL-<I>)
Merged from MOODLE_<I>_STABLE
|
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -75,10 +75,11 @@ module ActionDispatch
def build_host_url(options)
protocol = options[:protocol]
host = options[:host]
+ port = options[:port]
if match = host.match(HOST_REGEXP)
protocol ||= match[1] unless protocol == false
host = match[2]
- options[:port] = match[3] unless options.key?(:port)
+ port = match[3] unless options.key? :port
end
protocol = normalize_protocol protocol
@@ -91,7 +92,7 @@ module ActionDispatch
end
result << host
- normalize_port(options[:port], protocol) { |port|
+ normalize_port(port, protocol) { |port|
result << ":#{port}"
}
|
pull the port out of the options hash once
|
diff --git a/src/Expose/Filter.php b/src/Expose/Filter.php
index <HASH>..<HASH> 100644
--- a/src/Expose/Filter.php
+++ b/src/Expose/Filter.php
@@ -26,7 +26,7 @@ class Filter
* Filter tag set
* @var array
*/
- private $tags = null;
+ private $tags = array();
/**
* Filter impact rating
@@ -58,8 +58,9 @@ class Filter
}
foreach ($data as $index => $value) {
if ($index == 'tags' && !is_array($value)) {
- // normalize to an array
- $value->tag = (!is_array($value->tag)) ? array($value->tag) : $value->tag;
+ if (isset($value->tag)) {
+ $value = (!is_array($value->tag)) ? array($value->tag) : $value->tag;
+ }
}
$this->$index = $value;
}
@@ -94,7 +95,7 @@ class Filter
*/
public function getTags()
{
- return (isset($this->tags->tag)) ? $this->tags->tag : array();
+ return (isset($this->tags)) ? $this->tags : array();
}
/**
@@ -105,10 +106,7 @@ class Filter
*/
public function setTags($tags)
{
- if (!isset($this->tags)) {
- $this->tags = new \stdClass();
- }
- $this->tags->tag = $tags;
+ $this->tags = $tags;
return $this;
}
|
fixing the "tags" value to no longer use the weird object stuff
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,20 @@ from setuptools import setup # type: ignore
__version__ = "1.1.3"
+
+def get_long_description():
+ """
+ Return the README.
+ """
+ with open("README.md", encoding="utf8") as f:
+ return f.read()
+
+
setup(
name="cowpy",
description="A cowsay clone for python in one file.",
+ long_description=get_long_description(),
+ long_description_content_type="text/markdown",
author="Jeff Buttars",
author_email="jeffbuttars@gmail.com",
url="https://github.com/jeffbuttars/cowpy",
|
Add long description to setup.py
|
diff --git a/src/bezier/_geometric_intersection.py b/src/bezier/_geometric_intersection.py
index <HASH>..<HASH> 100644
--- a/src/bezier/_geometric_intersection.py
+++ b/src/bezier/_geometric_intersection.py
@@ -27,6 +27,7 @@ or the speedup.
"""
+import atexit
import itertools
import numpy as np
@@ -1199,4 +1200,6 @@ else:
_curve_intersection_speedup.from_linearized_low_level)
bbox_line_intersect = _curve_intersection_speedup.bbox_line_intersect
all_intersections = _all_intersections_cython
+ atexit.register(
+ _curve_intersection_speedup.free_all_intersections_workspace)
# pylint: enable=invalid-name
|
Adding `atexit` hook for `free_all_intersections_workspace()`.
|
diff --git a/Tests/Functional/Entity/User.php b/Tests/Functional/Entity/User.php
index <HASH>..<HASH> 100644
--- a/Tests/Functional/Entity/User.php
+++ b/Tests/Functional/Entity/User.php
@@ -72,11 +72,16 @@ class User implements UserInterface
$this->email = $email;
}
+ public function getUserIdentifier(): string
+ {
+ return $this->getUsername();
+ }
+
public function eraseCredentials()
{
}
- public function getRoles()
+ public function getRoles(): array
{
return [];
}
|
Update User class to support UserInterface
|
diff --git a/lib/cloudstack-cli/commands/volume.rb b/lib/cloudstack-cli/commands/volume.rb
index <HASH>..<HASH> 100644
--- a/lib/cloudstack-cli/commands/volume.rb
+++ b/lib/cloudstack-cli/commands/volume.rb
@@ -82,15 +82,25 @@ class Volume < CloudstackCli::Base
end
say "Creating volume #{name} "
- client.create_volume(options)
+ job = client.create_volume(options).merge(sync: true)
say " OK.", :green
- sleep 2
- invoke "volume:show", [name], options
+
+ # attach the new volume if a vm is profided and not a sapshot
+ if options[:virtual_machine] && options[:snapshot] == nil
+ sleep 2
+ say "Attach volume #{name} to VM #{options[:virtual_machine]} "
+ client.attach_volume(
+ id: job['volume']['id'],
+ virtualmachineid: options[:virtual_machine_id],
+ sync: true
+ )
+ say " OK.", :green
+ end
end
desc "attach NAME", "attach volume to VM"
option :project, desc: 'project of volume'
- option :virtual_machine, desc: 'project of volume'
+ option :virtual_machine, desc: 'virtual machine of volume'
def attach(name)
resolve_project
resolve_virtual_machine
|
attach volume after creation if vm instance is provided
|
diff --git a/pyemma/_base/progress/reporter.py b/pyemma/_base/progress/reporter.py
index <HASH>..<HASH> 100644
--- a/pyemma/_base/progress/reporter.py
+++ b/pyemma/_base/progress/reporter.py
@@ -205,3 +205,7 @@ class ProgressReporter(object):
pg._eta.eta_epoch = 0
_show_progressbar(pg, description=self._prog_rep_descriptions[stage])
_hide_progressbar(pg)
+
+ # unpickleable
+ def __getstate__(self):
+ return {}
|
[progress repoter] do not save state
|
diff --git a/actionpack/test/controller/spec_type_test.rb b/actionpack/test/controller/spec_type_test.rb
index <HASH>..<HASH> 100644
--- a/actionpack/test/controller/spec_type_test.rb
+++ b/actionpack/test/controller/spec_type_test.rb
@@ -3,7 +3,7 @@ require "abstract_unit"
class ApplicationController < ActionController::Base; end
class ModelsController < ApplicationController; end
-class SpecTypeTest < ActiveSupport::TestCase
+class ActionControllerSpecTypeTest < ActiveSupport::TestCase
def assert_controller actual
assert_equal ActionController::TestCase, actual
end
diff --git a/actionpack/test/template/spec_type_test.rb b/actionpack/test/template/spec_type_test.rb
index <HASH>..<HASH> 100644
--- a/actionpack/test/template/spec_type_test.rb
+++ b/actionpack/test/template/spec_type_test.rb
@@ -1,6 +1,6 @@
require 'abstract_unit'
-class SpecTypeTest < ActiveSupport::TestCase
+class ActionViewSpecTypeTest < ActiveSupport::TestCase
def assert_view actual
assert_equal ActionView::TestCase, actual
end
|
remove method redefinition warnings
actionpack/test/template/spec_type_test.rb:<I>: warning: method redefined; discarding old test_spec_type_wont_match_non_space_characters
actionpack/test/controller/spec_type_test.rb:<I>: warning: previous definition of test_spec_type_wont_match_non_space_characters was here
|
diff --git a/packages/zefir/lib/router/define-match.js b/packages/zefir/lib/router/define-match.js
index <HASH>..<HASH> 100644
--- a/packages/zefir/lib/router/define-match.js
+++ b/packages/zefir/lib/router/define-match.js
@@ -2,18 +2,21 @@ import React from 'react'
import {Redirect, Route} from 'react-router-dom'
import connect from '../utils/connect'
-const defineMatch = (shouldRender, redirectTo) => {
+const defineMatch = (shouldRender) => {
const DefinedMatch = ({
component,
+ exact,
+ path,
...rest
}) => (
<Route
- {...rest}
+ path={path}
+ exact={exact}
render={props => (
shouldRender(rest)
? renderComponent(component, props)
: rest.redirect
- ? renderRedirect(redirectTo, props.location)
+ ? renderRedirect(rest.redirect, props.location)
: null
)}
/>
@@ -28,7 +31,7 @@ function renderRedirect (pathname, from) {
)
}
-function renderComponent (component, props) {
+function renderComponent (component, {history, location, match, ...props}) {
const Component = connect(component)
return (
|
refactor(router): clean up props
|
diff --git a/ipmitool_test.go b/ipmitool_test.go
index <HASH>..<HASH> 100644
--- a/ipmitool_test.go
+++ b/ipmitool_test.go
@@ -58,7 +58,7 @@ func newToolMock(output string, rc int) *toolMock {
panic(err)
}
// just enough to test exec related code paths
- file.WriteString("#!/bin/bash\n")
+ file.WriteString("#!/usr/bin/env bash\n")
file.WriteString(fmt.Sprintf("echo -n '%s'\n", output))
if rc != 0 {
file.WriteString("echo 'Mock Failure' 1>&2\n")
|
Make ipmitool_test.go work on NixOS
|
diff --git a/lib/Sabre/DAV/Property/ResponseList.php b/lib/Sabre/DAV/Property/ResponseList.php
index <HASH>..<HASH> 100644
--- a/lib/Sabre/DAV/Property/ResponseList.php
+++ b/lib/Sabre/DAV/Property/ResponseList.php
@@ -115,8 +115,10 @@ class ResponseList extends DAV\Property {
list(,$statusCode,) = explode(' ', $status, 3);
+ $usedPropertyMap = $statusCode == '200' ? $propertyMap : [];
+
// Parsing 'prop'
- $properties[$statusCode] = DAV\XMLUtil::parseProperties($xPropstat->item($ii), $propertyMap);
+ $properties[$statusCode] = DAV\XMLUtil::parseProperties($xPropstat->item($ii), $usedPropertyMap);
}
|
Applied change for Issue #<I> on master branch.
|
diff --git a/src/main/java/org/dasein/cloud/aws/platform/RDS.java b/src/main/java/org/dasein/cloud/aws/platform/RDS.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/dasein/cloud/aws/platform/RDS.java
+++ b/src/main/java/org/dasein/cloud/aws/platform/RDS.java
@@ -1674,6 +1674,8 @@ public class RDS extends AbstractRelationalDatabaseSupport<AWSCloud> {
try {
for( String securityGroupId : securityGroups ) {
if( securityGroupId.equals(providerDatabaseId) ) {
+ try { Thread.sleep(15000L); }
+ catch( InterruptedException ignore ) { }
try {
removeSecurityGroup(securityGroupId);
}
|
FB#<I> – Removing database firewalls
|
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index <HASH>..<HASH> 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -453,8 +453,18 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
}
// Default to looking at the new driver parameter
- if viper.GetString("driver") != "" {
- ds := driver.Status(viper.GetString("driver"))
+ if d := viper.GetString("driver"); d != "" {
+ if vmd := viper.GetString("vm-driver"); vmd != "" {
+ // Output a warning
+ warning := `Both driver={{.driver}} and vm-driver={{.vmd}} have been set.
+
+ Since vm-driver is deprecated, minikube will default to driver={{.driver}}.
+
+ If vm-driver is set in the global config, please run "minikube config unset vm-driver" to resolve this warning.
+ `
+ out.T(out.Warning, warning, out.V{"driver": d, "vmd": vmd})
+ }
+ ds := driver.Status(d)
out.T(out.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
return ds
}
|
Add warning if both vm-driver and driver are specified
|
diff --git a/TYPO3.Flow/Classes/TYPO3/Flow/Cache/Backend/RedisBackend.php b/TYPO3.Flow/Classes/TYPO3/Flow/Cache/Backend/RedisBackend.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Flow/Classes/TYPO3/Flow/Cache/Backend/RedisBackend.php
+++ b/TYPO3.Flow/Classes/TYPO3/Flow/Cache/Backend/RedisBackend.php
@@ -147,7 +147,9 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface,
*/
public function has($entryIdentifier)
{
- return $this->redis->exists($this->buildKey('entry:' . $entryIdentifier));
+ // exists returned TRUE or FALSE in phpredis versions < 4.0.0, now it returns the number of keys
+ $existsResult = $this->redis->exists($this->buildKey('entry:' . $entryIdentifier));
+ return $existsResult === true || $existsResult > 0;
}
/**
|
BUGFIX: Adjust has() to phpredis >= <I>
The `exists()` method returned TRUE or FALSE in phpredis versions < <I>, now it
returns the number of keys tested that do exist.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.