diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/riscvmodel/model.py b/riscvmodel/model.py
index <HASH>..<HASH> 100644
--- a/riscvmodel/model.py
+++ b/riscvmodel/model.py
@@ -8,7 +8,8 @@ from .program import Program
class State(object):
def __init__(self, variant: Variant):
self.variant = variant
- self.intreg = RegisterFile(variant.intregs, 32, {0: 0x0})
+ intregs = 32 if variant.baseint == "I" else 16
+ self.intreg = RegisterFile(intregs, 32, {0: 0x0})
self.pc = Register(32)
self.pc_update = Register(32)
self.memory = Memory()
|
Set intregs as defined by baseint
|
diff --git a/js/poloniex.js b/js/poloniex.js
index <HASH>..<HASH> 100644
--- a/js/poloniex.js
+++ b/js/poloniex.js
@@ -814,6 +814,8 @@ module.exports = class poloniex extends Exchange {
const feedback = this.id + ' ' + this.json (response);
if (error === 'Invalid order number, or you are not the person who placed the order.') {
throw new OrderNotFound (feedback);
+ } else if (error === 'Order not found, or you are not the person who placed it.') {
+ throw new OrderNotFound (feedback);
} else if (error === 'Invalid API key/secret pair.') {
throw new AuthenticationError (feedback);
} else if (error.indexOf ('Total must be at least') >= 0) {
|
Throw OrderNotFound if order not found in fetchOrderTrades
|
diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go
index <HASH>..<HASH> 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -1184,6 +1184,17 @@ func (d *qemu) Start(stateful bool) error {
return err
}
+ // Enable extended topology information if needed.
+ cpuType := "host"
+
+ // Only x86_64 requires the use of topoext when SMT is used.
+ if d.architecture == osarch.ARCH_64BIT_INTEL_X86 {
+ _, _, nrThreads, _, _, err := d.cpuTopology(d.expandedConfig["limits.cpu"])
+ if err != nil && nrThreads > 1 {
+ cpuType = "host,topoext"
+ }
+ }
+
// Start QEMU.
qemuCmd := []string{
"--",
@@ -1192,7 +1203,7 @@ func (d *qemu) Start(stateful bool) error {
"-name", d.Name(),
"-uuid", instUUID,
"-daemonize",
- "-cpu", "host",
+ "-cpu", cpuType,
"-nographic",
"-serial", "chardev:console",
"-nodefaults",
|
lxd/instances/qemu: Enable topoext on x<I>_<I> with SMT
|
diff --git a/internal/service/firehose/delivery_stream.go b/internal/service/firehose/delivery_stream.go
index <HASH>..<HASH> 100644
--- a/internal/service/firehose/delivery_stream.go
+++ b/internal/service/firehose/delivery_stream.go
@@ -69,7 +69,6 @@ func dynamicPartitioningConfigurationSchema() *schema.Schema {
Type: schema.TypeBool,
Optional: true,
Default: false,
- ForceNew: true,
},
"retry_options": {
Type: schema.TypeList,
|
Update allowed, ForceNew should not be necessary
|
diff --git a/nptdms/tdms.py b/nptdms/tdms.py
index <HASH>..<HASH> 100644
--- a/nptdms/tdms.py
+++ b/nptdms/tdms.py
@@ -670,6 +670,19 @@ class TdmsObject(object):
else:
self.data.extend(new_data)
+ def as_dataframe(self):
+ """
+ Converts the TDMS object to a DataFrame
+ :return: The TDMS object data.
+ :rtype: Pandas DataFrame
+ """
+
+ import pandas as pd
+
+ return pd.DataFrame(self.data,
+ index=self.time_track(),
+ columns=[self.path])
+
class _TdmsSegmentObject(object):
"""
|
Added the export to dataframe from within a TdmsObject.
Objects like channels (tested on a channel) can now be exported as a
pandas dataframe.
|
diff --git a/lib/cocoapods-chillax-swift.rb b/lib/cocoapods-chillax-swift.rb
index <HASH>..<HASH> 100644
--- a/lib/cocoapods-chillax-swift.rb
+++ b/lib/cocoapods-chillax-swift.rb
@@ -1,3 +1,3 @@
module CocoaPodsChillaxSwift
- VERSION = "0.1.0"
+ VERSION = "0.2.0"
end
diff --git a/lib/installer.rb b/lib/installer.rb
index <HASH>..<HASH> 100644
--- a/lib/installer.rb
+++ b/lib/installer.rb
@@ -22,6 +22,7 @@ module CocoaPodsChillaxSwift
targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Onone'
+ config.build_settings['GCC_OPTIMIZATION_LEVEL'] = '0'
end
end
|
Disables GCC optimizations, too.
|
diff --git a/app/models/unidom/visitor/application_record.rb b/app/models/unidom/visitor/application_record.rb
index <HASH>..<HASH> 100644
--- a/app/models/unidom/visitor/application_record.rb
+++ b/app/models/unidom/visitor/application_record.rb
@@ -1,3 +1,6 @@
+##
+# Application record 是模块内所有模型的抽象基类。
+
class Unidom::Visitor::ApplicationRecord < ActiveRecord::Base
self.abstract_class = true
end
|
1, Improve the Application record for the document.
|
diff --git a/heartbeat/heartbeat.py b/heartbeat/heartbeat.py
index <HASH>..<HASH> 100644
--- a/heartbeat/heartbeat.py
+++ b/heartbeat/heartbeat.py
@@ -95,13 +95,13 @@ class Heartbeat(object):
if challenge.block > (self.file_size - chunk_size):
end_slice = (
- challenge.get_position() - (self.file_size - CHUNK_SIZE)
+ challenge.block - (self.file_size - chunk_size)
)
h.update(self.file_object.read(end_slice))
self.file_object.seek(0)
- h.update(self.file_object.read(CHUNK_SIZE - end_slice))
+ h.update(self.file_object.read(chunk_size - end_slice))
else:
- h.update(self.file_object.read(CHUNK_SIZE))
+ h.update(self.file_object.read(chunk_size))
h.update(seed)
|
fix for refactored vars and challenge class refactors
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -115,7 +115,7 @@ function parseInput (input, opts, cb) {
file.getStream = getStreamStream(item, file)
file.length = 0
} else if (typeof item === 'string') {
- if (typeof fs.readdir !== 'function') {
+ if (typeof fs.stat !== 'function') {
throw new Error('filesystem paths do not work in the browser')
}
var keepRoot = numPaths > 1 || isSingleFileTorrent
|
fix unhelpful message in browser
In the browser, WebTorrent’s `client.seed()` function returns “Uncaught
TypeError: fs.stat is not a function” when passing in a file path,
because fs.readdir is defined by brfs (I think). Let’s check for
fs.stat instead.
For <URL>
|
diff --git a/locale/ko.js b/locale/ko.js
index <HASH>..<HASH> 100644
--- a/locale/ko.js
+++ b/locale/ko.js
@@ -53,22 +53,8 @@ var ko = moment.defineLocale('ko', {
y : '일 년',
yy : '%d년'
},
- dayOfMonthOrdinalParse : /\d{1,2}(일|월|주)/,
- ordinal : function (number, period) {
- switch (period) {
- case 'd':
- case 'D':
- case 'DDD':
- return number + '일';
- case 'M':
- return number + '월';
- case 'w':
- case 'W':
- return number + '주';
- default:
- return number;
- }
- },
+ dayOfMonthOrdinalParse : /\d{1,2}일/,
+ ordinal : '%d일',
meridiemParse : /오전|오후/,
isPM : function (token) {
return token === '오후';
|
ndo the changes to locale/ko.js
its autogenerated
|
diff --git a/empire/server/releases.go b/empire/server/releases.go
index <HASH>..<HASH> 100644
--- a/empire/server/releases.go
+++ b/empire/server/releases.go
@@ -10,9 +10,11 @@ import (
"github.com/remind101/empire/empire"
)
-// newHkRelease converts an empire Release to a heroku Release.
-func newHkRelease(r *empire.Release) *heroku.Release {
- return &heroku.Release{
+type Release heroku.Release
+
+// newRelease decorates an empire.Release as a heroku.Release.
+func newRelease(r *empire.Release) *Release {
+ return &Release{
Id: string(r.ID),
Version: int(r.Ver),
Slug: &struct {
@@ -48,7 +50,7 @@ func (h *GetRelease) ServeHTTP(w http.ResponseWriter, r *http.Request) error {
}
w.WriteHeader(200)
- return Encode(w, newHkRelease(rel))
+ return Encode(w, newRelease(rel))
}
type GetReleases struct {
|
Alias Release as heroku.Release
|
diff --git a/lib/rib/shell.rb b/lib/rib/shell.rb
index <HASH>..<HASH> 100644
--- a/lib/rib/shell.rb
+++ b/lib/rib/shell.rb
@@ -46,7 +46,7 @@ class Rib::Shell
input = get_input
throw(:rib_exit, input) if config[:exit].include?(input)
if input.strip == ''
- history.pop
+ eval_input(input)
else
print_result(eval_input(input))
end
|
still need to eval the input if it's empty (for multiline), and don't
pop history!
|
diff --git a/kubeshell/client.py b/kubeshell/client.py
index <HASH>..<HASH> 100644
--- a/kubeshell/client.py
+++ b/kubeshell/client.py
@@ -8,6 +8,7 @@ import urllib3
# disable warnings on stdout/stderr from urllib3 connection errors
ulogger = logging.getLogger("urllib3")
ulogger.setLevel("ERROR")
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
class KubernetesClient(object):
|
fixes #<I>: disable InsecureRequestWarning from urllib3
(cherry picked from commit 3f3a<I>dc<I>e<I>b<I>e9ccd3eae<I>d<I>ffbb)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ def extras_require():
def main():
setup(
name='straitlets',
- version='0.2.1',
+ version='0.2.2',
description="Serializable IPython Traitlets",
author="Quantopian Team",
author_email="opensource@quantopian.com",
|
MAINT: Bump PyPI.
|
diff --git a/IlluminaUtils/lib/fastqlib.py b/IlluminaUtils/lib/fastqlib.py
index <HASH>..<HASH> 100644
--- a/IlluminaUtils/lib/fastqlib.py
+++ b/IlluminaUtils/lib/fastqlib.py
@@ -163,9 +163,9 @@ class FileOutput(object):
def __init__(self, file_path, compressed = False):
self.file_path = file_path
- self.compressed = compressed
+ self.compressed_output = compressed
- if self.compressed:
+ if self.compressed_output:
self.file_pointer = gzip.open(file_path, 'w')
else:
self.file_pointer = open(file_path, 'w')
@@ -214,8 +214,8 @@ class FastQSource:
self.pos = 0
self.forced_raw = False
- self.compressed = compressed or file_path.endswith('.gz')
- if self.compressed:
+ self.compressed_input = compressed or file_path.endswith('.gz')
+ if self.compressed_input:
# wrap it with TextIOWrapper to prevent gzip.open to return byte\
# objects.
self.file_pointer = io.TextIOWrapper(gzip.open(file_path, 'r'))
|
distinct variables for compressed input/output
|
diff --git a/src-test/core/domhelpertest.js b/src-test/core/domhelpertest.js
index <HASH>..<HASH> 100644
--- a/src-test/core/domhelpertest.js
+++ b/src-test/core/domhelpertest.js
@@ -106,3 +106,13 @@ DomHelperTest.prototype.testHasSupportForStyle = function() {
this.domHelper_.supportForStyle_ = true;
assertTrue(this.domHelper_.hasSupportForStyle_());
};
+
+DomHelperTest.prototype.testInsertNullFontStyle = function() {
+ var counter = webfont.DomHelper.nullFontCounter_,
+ name = this.domHelper_.insertNullFontStyle('');
+
+ assertNotNull(name);
+ assertEquals(name, '__webfontloader_test_' + counter + '__');
+ assertNotEquals(counter, webfont.DomHelper.nullFontCounter_);
+ assertNotNull(webfont.DomHelper.nullFontStyles_[name]);
+};
|
Added test for insertNullFontStyle.
|
diff --git a/apostrophe.js b/apostrophe.js
index <HASH>..<HASH> 100644
--- a/apostrophe.js
+++ b/apostrophe.js
@@ -4513,16 +4513,15 @@ function Apos() {
function(callback) {
uploadfs.copyOut(originalFile, tempFile, callback);
},
- // function(callback) {
- // uploadfs.copyImageIn(tempFile, originalFile, callback);
- // }
+ function(callback) {
+ uploadfs.copyImageIn(tempFile, originalFile, callback);
+ }
], callback);
},
// Don't forget to recrop as well!
function(callback) {
async.forEachSeries(file.crops || [], function(crop, callback) {
var originalFile = '/files/' + file._id + '-' + file.name + '.' + crop.left + '.' + crop.top + '.' + crop.width + '.' + crop.height + '.' + file.extension;
- console.log('recropping ' + originalFile);
uploadfs.copyImageIn(tempFile, originalFile, { crop: crop }, callback);
}, callback);
},
|
Whoops, the actual work of apostrophe:rescale was shut off for a while
|
diff --git a/sample_test.go b/sample_test.go
index <HASH>..<HASH> 100644
--- a/sample_test.go
+++ b/sample_test.go
@@ -17,7 +17,7 @@ func TestSample(t *testing.T) {
for i := 0; i < iters; i++ {
s := stream.Sequence(
stream.Numbers(0, space-1),
- stream.Sample(samples),
+ stream.SampleWithSeed(samples, int64(i)),
)
stream.ForEach(s, func(s string) {
num := -1 // Will cause panic below if Scan fails
|
sample_test uses deterministic seeding for reproducibility
|
diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py
index <HASH>..<HASH> 100644
--- a/salt/pillar/__init__.py
+++ b/salt/pillar/__init__.py
@@ -476,10 +476,15 @@ class Pillar(object):
log.error(msg)
errors.append(msg)
else:
- log.debug('Specified SLS {0!r} in environment {1!r} is not'
- ' found, which might be due to environment {1!r}'
- ' not being present in "pillar_roots" yet!'
- .format(sls, saltenv))
+ log.debug(
+ 'Specified SLS \'%s\' in environment \'%s\' was not '
+ 'found. This could be because SLS \'%s\' is in an '
+ 'environment other than \'%s\', but \'%s\' is included in '
+ 'that environment\'s Pillar top file. It could also be '
+ 'due to environment \'%s\' not being defined in '
+ '"pillar_roots"',
+ sls, saltenv, sls, saltenv, saltenv, saltenv
+ )
# return state, mods, errors
return None, mods, errors
state = None
|
Add additional reason for pillar env being found
|
diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go
index <HASH>..<HASH> 100644
--- a/integration-cli/docker_cli_inspect_test.go
+++ b/integration-cli/docker_cli_inspect_test.go
@@ -328,18 +328,6 @@ func (s *DockerSuite) TestInspectSizeFlagContainer(c *check.C) {
c.Assert(strings.TrimSpace(sz[1]), check.Not(check.Equals), "<nil>")
}
-func (s *DockerSuite) TestInspectSizeFlagImage(c *check.C) {
- runSleepingContainer(c, "-d")
-
- formatStr := "--format='{{.SizeRw}},{{.SizeRootFs}}'"
- out, _, err := dockerCmdWithError("inspect", "-s", "--type=image", formatStr, "busybox")
-
- // Template error rather than <no value>
- // This is a more correct behavior because images don't have sizes associated.
- c.Assert(err, check.Not(check.IsNil))
- c.Assert(out, checker.Contains, "Template parsing error")
-}
-
func (s *DockerSuite) TestInspectTemplateError(c *check.C) {
// Template parsing error for both the container and image.
|
Remove unused "size" query parameter for images
Image inspect doesn't have a "size" query parameter.
The client sent this (when doing `docker inspect --size`),
but was unused in the daemon.
This removes the unused parameter, and a test that
didn't actually test anything.
|
diff --git a/Lib/glyphsLib/filters/eraseOpenCorners.py b/Lib/glyphsLib/filters/eraseOpenCorners.py
index <HASH>..<HASH> 100644
--- a/Lib/glyphsLib/filters/eraseOpenCorners.py
+++ b/Lib/glyphsLib/filters/eraseOpenCorners.py
@@ -25,10 +25,8 @@ class EraseOpenCornersPen(BasePen):
self.outpen = outpen
def _moveTo(self, p1):
- if self.segments or self.is_closed:
- raise ValueError(
- "EraseOpenCornersPen should only be used on single contours"
- )
+ self.segments = []
+ self.is_closed = False
def _operate(self, *points):
self.segments.append((self._getCurrentPoint(), *points))
@@ -106,13 +104,10 @@ class EraseOpenCornersFilter(BaseFilter):
if not len(glyph):
return False
- affected = False
contours = list(glyph)
glyph.clearContours()
outpen = glyph.getPen()
+ p = EraseOpenCornersPen(outpen)
for contour in contours:
- p = EraseOpenCornersPen(outpen)
contour.draw(p)
- if p.affected:
- affected = True
- return affected
+ return p.affected
|
Reset pen after use, only draw once
|
diff --git a/eZ/Publish/Core/Repository/UserService.php b/eZ/Publish/Core/Repository/UserService.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/Repository/UserService.php
+++ b/eZ/Publish/Core/Repository/UserService.php
@@ -717,7 +717,7 @@ class UserService implements UserServiceInterface
$userGroups = array();
foreach ( $searchResult->searchHits as $resultItem )
{
- $userGroups = $this->buildDomainUserGroupObject( $resultItem->valueObject );
+ $userGroups[] = $this->buildDomainUserGroupObject( $resultItem->valueObject );
}
return $userGroups;
|
Fixed: UserService::loadUserGroupsOfUser should return an array
|
diff --git a/modulate.js b/modulate.js
index <HASH>..<HASH> 100644
--- a/modulate.js
+++ b/modulate.js
@@ -37,19 +37,11 @@ Modulator.prototype = {
var bufLen = Math.ceil(data.length * 8 * this.encoder.samplesPerBit());
var modulatedData = new Float32Array(bufLen);
- if (type === undefined)
+ if (type === undefined) {
type = 16;
-
- var timeStart = 0;
- var timeEnd = 0;
- if ((typeof performance) === "object") {
- timeStart = performance.now();
}
+
this.encoder.modulate(data, modulatedData); // writes outputFloatArray in-place
- if ((typeof performance) === "object") {
- timeEnd = performance.now();
- }
- var timeElapsed = timeEnd - timeStart;
if (type === 16) {
var pcmData = new Int16Array(modulatedData.length);
|
modulate: remove unused time measurement code
This was used for the console.log message, which is now gone. Remove
this code, as it's now unused.
|
diff --git a/py2/h2o_sandbox.py b/py2/h2o_sandbox.py
index <HASH>..<HASH> 100755
--- a/py2/h2o_sandbox.py
+++ b/py2/h2o_sandbox.py
@@ -165,6 +165,7 @@ def check_sandbox_for_errors(LOG_DIR=None, python_test_name='',
#[Loaded java.lang.Error from /usr/lib/jvm/java-7-oracle/jre/lib/rt.jar]
foundBadPartial = regex1.search(line)
foundBad = foundBadPartial and not (
+ ('Skipping field that lacks an annotation' in line) or # can have DeepLearningModel$Errors
('python_test_name' in line) or
('Retrying after IO error' in line) or
('Error on' in line) or
diff --git a/py2/testdir_single_jvm/test_GLM_covtype.py b/py2/testdir_single_jvm/test_GLM_covtype.py
index <HASH>..<HASH> 100644
--- a/py2/testdir_single_jvm/test_GLM_covtype.py
+++ b/py2/testdir_single_jvm/test_GLM_covtype.py
@@ -13,7 +13,7 @@ class Basic(unittest.TestCase):
global SEED
SEED = h2o.setup_random_seed()
- h2o.init(3)
+ h2o.init(1)
@classmethod
def tearDownClass(cls):
|
change test_GLM_covtype.py to single_jvm
allow seeing lines with 'Errors" due to schema warnings (in h2o_sandox.py)
|
diff --git a/rx-preferences/src/main/java/com/f2prateek/rx/preferences2/Preference.java b/rx-preferences/src/main/java/com/f2prateek/rx/preferences2/Preference.java
index <HASH>..<HASH> 100644
--- a/rx-preferences/src/main/java/com/f2prateek/rx/preferences2/Preference.java
+++ b/rx-preferences/src/main/java/com/f2prateek/rx/preferences2/Preference.java
@@ -39,8 +39,7 @@ public interface Preference<T> {
@NonNull T get();
/**
- * Change this preference's stored value to {@code value}. A value of {@code null} will delete
- * the preference.
+ * Change this preference's stored value to {@code value}.
*/
void set(@NonNull T value);
@@ -57,8 +56,7 @@ public interface Preference<T> {
@CheckResult @NonNull Observable<T> asObservable();
/**
- * An action which stores a new value for this preference. Passing {@code null} will delete the
- * preference.
+ * An action which stores a new value for this preference.
*/
@CheckResult @NonNull Consumer<? super T> asConsumer();
}
|
Remove outdated null docs.
|
diff --git a/lib/webcat/driver/safariwatir_driver.rb b/lib/webcat/driver/safariwatir_driver.rb
index <HASH>..<HASH> 100644
--- a/lib/webcat/driver/safariwatir_driver.rb
+++ b/lib/webcat/driver/safariwatir_driver.rb
@@ -43,7 +43,9 @@ class Webcat::Driver::SafariWatir
end
def find(selector)
- browser.send(:scripter).by_xpath(selector).map { |node| Node.new(node) }
+ foo = Struct.new(:what).new
+ foo.what = selector
+ browser.send(:scripter).operate_by_xpath(foo){}.map { |node| Node.new(node) }
end
private
@@ -62,4 +64,4 @@ private
@_browser
end
-end
\ No newline at end of file
+end
|
Slight improvement to safariwatir driver
(still doesn't work though)
|
diff --git a/lib/flor/migrations/0001_tables.rb b/lib/flor/migrations/0001_tables.rb
index <HASH>..<HASH> 100644
--- a/lib/flor/migrations/0001_tables.rb
+++ b/lib/flor/migrations/0001_tables.rb
@@ -81,7 +81,6 @@ Sequel.migration do
String :nid, null: true
String :tracer, null: false # 'executor', 'trace'
String :text, null: false # 'blah blah blah'
- File :content # JSON (msg if necessary)
Time :tstamp
index :exid
|
revert "store "content" in flor_traces"
This reverts commit b7bb0d7df8a<I>db<I>c<I>b<I>f.
I forgot that the "trace" concept was not a "trail" at all...
|
diff --git a/src/azure_devtools/scenario_tests/patches.py b/src/azure_devtools/scenario_tests/patches.py
index <HASH>..<HASH> 100644
--- a/src/azure_devtools/scenario_tests/patches.py
+++ b/src/azure_devtools/scenario_tests/patches.py
@@ -14,6 +14,15 @@ def patch_time_sleep_api(unit_test):
_mock_in_unit_test(unit_test, 'time.sleep', _time_sleep_skip)
+def patch_long_run_operation_delay(unit_test):
+ def _shortcut_long_run_operation(*args, **kwargs): # pylint: disable=unused-argument
+ return
+
+ _mock_in_unit_test(unit_test,
+ 'msrestazure.azure_operation.AzureOperationPoller._delay',
+ _shortcut_long_run_operation)
+
+
def _mock_in_unit_test(unit_test, target, replacement):
import mock
import unittest
|
Reinstate patch_long_run_operation_delay
|
diff --git a/lib/super_resources/url_helpers.rb b/lib/super_resources/url_helpers.rb
index <HASH>..<HASH> 100644
--- a/lib/super_resources/url_helpers.rb
+++ b/lib/super_resources/url_helpers.rb
@@ -81,11 +81,6 @@ module SuperResources
def super_url(chain, options={})
polymorphic_url(chain, options)
- rescue NoMethodError => e
- object = chain.pop
-
- chain.empty? ?
- raise(e) : super_path(chain.slice(0...-1) << object, options)
end
end
end
|
simplify super_url to only call polymorphic_url
|
diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/type/user.rb
+++ b/lib/puppet/type/user.rb
@@ -423,7 +423,10 @@ module Puppet
resource at the same time. For instance, Puppet creates a home directory for a managed
user if `ensure => present` and the user does not exist at the time of the Puppet run.
If the home directory is then deleted manually, Puppet will not recreate it on the next
- run."
+ run.
+
+ Note that on Windows, this manages creation/deletion of the user profile instead of the
+ home directory. The user profile is stored in the `C:\Users\<username>` directory."
defaultto false
|
(PUP-<I>) Update the managehome property's docs for Windows
On Windows, the managehome property manages creation/deletion of
the user profile, _not_ the home directory. This commit updates
the docs with this information.
|
diff --git a/cwtools/corewebsite.py b/cwtools/corewebsite.py
index <HASH>..<HASH> 100644
--- a/cwtools/corewebsite.py
+++ b/cwtools/corewebsite.py
@@ -8,7 +8,7 @@ from twisted.python.filepath import FilePath
from cwtools import testing, htmltools, jsimp
from ecmaster import closurecompiler
from lytics.endpoint import Analytics
-from webmagic.untwist import BetterResource, BetterFile
+from webmagic.untwist import BetterResource, BetterFile, ConnectionTrackingSite
class Compiler(BetterResource):
@@ -77,5 +77,5 @@ class Root(BetterResource):
def makeSite(reactor, testPackages):
root = Root(reactor, testPackages)
- site = server.Site(root, clock=reactor)
+ site = ConnectionTrackingSite(root, clock=reactor)
return site
|
cwtools/corewebsite.py: use ConnectionTrackingSite, just like minervasite does.
|
diff --git a/tasks/responsive_images.js b/tasks/responsive_images.js
index <HASH>..<HASH> 100644
--- a/tasks/responsive_images.js
+++ b/tasks/responsive_images.js
@@ -502,7 +502,8 @@ module.exports = function(grunt) {
return processImage(srcPath, dstPath, sizeOptions, tally, callback);
} else {
grunt.verbose.ok('File already exists: ' + dstPath);
- return callback();
+ // defer the callback
+ setImmediate(callback);
}
} else {
return processImage(srcPath, dstPath, sizeOptions, tally, callback);
|
Fix recursive function
When you have a few thousands files and you run the option task `newFilesOnly`, an error occurs `Maximum call stack size exceeded`. Fix this issue by scheduling the "immediate" execution of callback after I/O events callbacks and before `setTimeout `and `setInterval ` —More info on `setImmediate` function here: <URL>
|
diff --git a/gcloud/datastore/entity.py b/gcloud/datastore/entity.py
index <HASH>..<HASH> 100644
--- a/gcloud/datastore/entity.py
+++ b/gcloud/datastore/entity.py
@@ -213,7 +213,8 @@ class Entity(dict):
exist only locally.
"""
key = self._must_key
- entity = key.get()
+ connection = self._must_dataset.connection()
+ entity = key.get(connection=connection)
if entity:
self.update(entity)
diff --git a/gcloud/datastore/test_entity.py b/gcloud/datastore/test_entity.py
index <HASH>..<HASH> 100644
--- a/gcloud/datastore/test_entity.py
+++ b/gcloud/datastore/test_entity.py
@@ -264,7 +264,8 @@ class _Key(object):
def path(self):
return self._path
- def get(self):
+ def get(self, connection=None):
+ self._connection_used = connection
return self._stored
|
Adding back dataset's connection in Entity.reload.
|
diff --git a/docs/source/conf.py b/docs/source/conf.py
index <HASH>..<HASH> 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,16 +48,16 @@ master_doc = 'index'
# General information about the project.
project = u'mist'
-copyright = u'2015, Mist.io Inc'
+copyright = u'2016, Mist.io Inc'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '1.2.4'
+version = '1.7'
# The full version, including alpha/beta/rc tags.
-release = '1.2.4'
+release = '1.7.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ requires = [
'argcomplete',
'pyyaml',
'prettytable',
- 'ansible'
+ 'ansible==1.9.3'
]
@@ -20,7 +20,7 @@ def readme():
setup(
name='mist',
- version='1.5',
+ version='1.7',
description='Python client for mist.io',
long_description=readme(),
classifiers=[
|
update version and remove ansible dependency
|
diff --git a/pyxmpp/roster.py b/pyxmpp/roster.py
index <HASH>..<HASH> 100644
--- a/pyxmpp/roster.py
+++ b/pyxmpp/roster.py
@@ -77,7 +77,7 @@ class RosterItem(StanzaPayloadObject):
ns=get_node_ns_uri(node)
if ns and ns!=ROSTER_NS or node.name!="item":
raise ValueError,"XML node is not a roster item"
- jid=JID(node.prop("jid"))
+ jid=JID(node.prop("jid").decode("utf-8"))
subscription=node.prop("subscription")
if subscription not in ("none","from","to","both","remove"):
subscription="none"
|
- fixed handling of non-ascii JIDs in roster (thanks to Andrew Diederich)
|
diff --git a/components/users.js b/components/users.js
index <HASH>..<HASH> 100644
--- a/components/users.js
+++ b/components/users.js
@@ -368,7 +368,7 @@ SteamCommunity.prototype.getUserInventoryContents = function(userID, appID, cont
if (err) {
if (err.message == "HTTP error 403" && body === null) {
// 403 with a body of "null" means the inventory/profile is private.
- if(userID.getSteamID64() == self.steamID.getSteamID64()) {
+ if (self.steamID && userID.getSteamID64() == self.steamID.getSteamID64()) {
// We can never get private profile error for our own inventory!
self._notifySessionExpired(err);
}
|
Check if instance is logged in before comparing steamids (fixes #<I>)
|
diff --git a/libraries/mako/mako/request.php b/libraries/mako/mako/request.php
index <HASH>..<HASH> 100644
--- a/libraries/mako/mako/request.php
+++ b/libraries/mako/mako/request.php
@@ -66,6 +66,12 @@ namespace mako
protected static $method = 'GET';
/**
+ * Was the request made using HTTPS?
+ */
+
+ protected static $secure = false;
+
+ /**
* Array holding all the URL segments.
*/
@@ -156,6 +162,10 @@ namespace mako
// Which request method was used?
static::$method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'UNKNOWN';
+
+ // Was the request made using HTTPS?
+
+ static::$secure = (!empty($_SERVER['HTTPS']) && filter_var($_SERVER['HTTPS'], FILTER_VALIDATE_BOOLEAN)) ? true : false;
}
}
else
@@ -536,6 +546,18 @@ namespace mako
}
/**
+ * Was the reqeust made using HTTPS?
+ *
+ * @access public
+ * @return boolean
+ */
+
+ public static function isSecure()
+ {
+ return static::$secure;
+ }
+
+ /**
* Returns the buffered output of the requested controller.
*
* @access public
|
Added Request::isSecure method
|
diff --git a/src/Functional/Functional.php b/src/Functional/Functional.php
index <HASH>..<HASH> 100644
--- a/src/Functional/Functional.php
+++ b/src/Functional/Functional.php
@@ -654,7 +654,7 @@ function concat(string $separator = ''): Closure
*
* @template T
* @param callable(...mixed): T $callable
- * @param array<int, mixed> ...$args
+ * @param array $args
* @return Closure(): T
*/
function lazy(callable $callable, ...$args): Closure
@@ -665,6 +665,7 @@ function lazy(callable $callable, ...$args): Closure
* @psalm-return T
*/
static function () use ($callable, $args) {
+ /** @psalm-suppress MixedArgument */
return call($callable, ...$args);
};
}
@@ -674,7 +675,7 @@ function lazy(callable $callable, ...$args): Closure
*
* @template T
* @param callable(...mixed): T $callable
- * @param array<int, mixed> ...$args
+ * @param array ...$args
* @return mixed
* @psalm-return T
*/
|
Less-specific about lazy and call arguments type
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -114,7 +114,7 @@ const configureGrunt = function (grunt) {
options: {
ui: 'bdd',
reporter: grunt.option('reporter') || 'spec',
- timeout: '30000',
+ timeout: '60000',
save: grunt.option('reporter-output'),
require: ['core/server/overrides'],
retries: '3',
|
Increased Mocha timeout to <I>s
no issue
- allow for random platform delays in tests
|
diff --git a/hugolib/menu_test.go b/hugolib/menu_test.go
index <HASH>..<HASH> 100644
--- a/hugolib/menu_test.go
+++ b/hugolib/menu_test.go
@@ -91,7 +91,10 @@ type testMenuState struct {
oldBaseUrl interface{}
}
-func TestPageMenu(t *testing.T) {
+// temporarily disabled
+// will be enabled once the cast related build issues is fixed
+// todo bep
+func _TestPageMenu(t *testing.T) {
ts := setupMenuTests(t)
defer resetMenuTestState(ts)
|
Temporarily disable failing menu test
|
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
@@ -106,10 +106,21 @@ EOF
$builder = new ProcessBuilder(array(PHP_BINARY, '-S', $input->getArgument('address'), $router));
$builder->setWorkingDirectory($documentRoot);
$builder->setTimeout(null);
- $builder->getProcess()->run(function ($type, $buffer) use ($output) {
+ $process = $builder->getProcess();
+ $process->run(function ($type, $buffer) use ($output) {
if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
$output->write($buffer);
}
});
+
+ if (!$process->isSuccessful()) {
+ $output->writeln('<error>Built-in server terminated unexpectedly</error>');
+
+ if (OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
+ $output->writeln('<error>Run the command again with -v option for more details</error>');
+ }
+ }
+
+ return $process->getExitCode();
}
}
|
backport more error information from <I> to <I>
The commit on master was:
server:run command: provide more error information
The server:run command didn't provide many information when the executed
command exited unexpectedly. Now, the process' exit code is passed through
and an error message is displayed.
|
diff --git a/guice/common/src/main/java/com/peterphi/std/guice/restclient/resteasy/impl/ResteasyClientFactoryImpl.java b/guice/common/src/main/java/com/peterphi/std/guice/restclient/resteasy/impl/ResteasyClientFactoryImpl.java
index <HASH>..<HASH> 100644
--- a/guice/common/src/main/java/com/peterphi/std/guice/restclient/resteasy/impl/ResteasyClientFactoryImpl.java
+++ b/guice/common/src/main/java/com/peterphi/std/guice/restclient/resteasy/impl/ResteasyClientFactoryImpl.java
@@ -89,6 +89,10 @@ public class ResteasyClientFactoryImpl implements StoppableService
final RemoteExceptionClientResponseFilter remoteExceptionClientResponseFilter,
final JAXBContextResolver jaxbContextResolver)
{
+ // Make sure that if we're called multiple times (e.g. because of a guice CreationException failing startup after us) we start fresh
+ if (ResteasyProviderFactory.peekInstance() != null)
+ ResteasyProviderFactory.clearInstanceIfEqual(ResteasyProviderFactory.peekInstance());
+
this.resteasyProviderFactory = ResteasyProviderFactory.getInstance();
resteasyProviderFactory.registerProviderInstance(jaxbContextResolver);
|
Bugfix: in the event of a CreationException happening after resteasy client initialisation, we could duplicate provider registrations. This change makes sure that we start fresh every time
|
diff --git a/calendar/tests/privacy_test.php b/calendar/tests/privacy_test.php
index <HASH>..<HASH> 100644
--- a/calendar/tests/privacy_test.php
+++ b/calendar/tests/privacy_test.php
@@ -104,7 +104,7 @@ class core_calendar_privacy_testcase extends provider_testcase {
// Add a Calendar Subscription and Group Calendar Event to Course 3.
$this->create_test_calendar_subscription('course', 'https://calendar.google.com/', $user->id, 0, $course3->id);
- $this->create_test_standard_calendar_event('group', $user->id, time(), '', 0, $course1->id, $course3group->id);
+ $this->create_test_standard_calendar_event('group', $user->id, time(), '', 0, $course3->id, $course3group->id);
// The user will be in these contexts.
$usercontextids = [
|
MDL-<I> core_calendar: Fix test_get_contexts_for_userid() test
This issue is part of the MDL-<I> Epic.
|
diff --git a/packages/pob/lib/generators/monorepo/index.js b/packages/pob/lib/generators/monorepo/index.js
index <HASH>..<HASH> 100644
--- a/packages/pob/lib/generators/monorepo/index.js
+++ b/packages/pob/lib/generators/monorepo/index.js
@@ -18,6 +18,12 @@ const getAppTypes = (configs) => {
return [...appTypes];
};
+const hasDist = (configs) => {
+ return configs.some(
+ (config) => config && config.project && config.project.type === 'lib',
+ );
+};
+
module.exports = class PobMonorepoGenerator extends Generator {
constructor(args, opts) {
super(args, opts);
@@ -162,7 +168,10 @@ module.exports = class PobMonorepoGenerator extends Generator {
testing: this.pobLernaConfig.testing,
useYarn2: this.options.useYarn2,
appTypes: JSON.stringify(getAppTypes(this.packageConfigs)),
- ignorePaths: '',
+ ignorePaths:
+ this.pobLernaConfig.typescript && hasDist(this.packageConfigs)
+ ? '/dist'
+ : '',
});
this.composeWith(require.resolve('../lib/doc'), {
|
fix: missing dist prettierignore monorepo with lib
|
diff --git a/lib/writeexcel/workbook.rb b/lib/writeexcel/workbook.rb
index <HASH>..<HASH> 100644
--- a/lib/writeexcel/workbook.rb
+++ b/lib/writeexcel/workbook.rb
@@ -2972,8 +2972,8 @@ class Workbook < BIFFWriter
end
# Change length field of the first MSODRAWINGGROUP block. Case 2 and 3.
- tmp = data.dup
- tmp[0, limit + 4] = ""
+ tmp = data[0, limit + 4]
+ data[0, limit + 4] = ""
tmp[2, 2] = [limit].pack('v')
append(tmp)
|
* bug fix: endless loop when image size > <I>
in add_mso_drawing_group_continue(data)
this bug was found by Kyle's mail. thanks Kyle.
|
diff --git a/face/geomajas-face-gwt/client/src/test/java/org/geomajas/gwt/client/map/MapViewTest.java b/face/geomajas-face-gwt/client/src/test/java/org/geomajas/gwt/client/map/MapViewTest.java
index <HASH>..<HASH> 100644
--- a/face/geomajas-face-gwt/client/src/test/java/org/geomajas/gwt/client/map/MapViewTest.java
+++ b/face/geomajas-face-gwt/client/src/test/java/org/geomajas/gwt/client/map/MapViewTest.java
@@ -86,7 +86,7 @@ public class MapViewTest {
// zoom out beyond maximum bounds
mapView.setCurrentScale(0.2, MapView.ZoomOption.LEVEL_CLOSEST);
// should zoom out as far as possible
- handler.expect(new Bbox(0, -50, 1000, 500), 0.2, false);
+ handler.expect(new Bbox(100, 0, 800, 400), 0.25, false);
// zoom in beyond maximum scale
mapView.setCurrentScale(3, MapView.ZoomOption.LEVEL_CLOSEST);
// should zoom in as far as possible
|
GWT-<I>: unit test was wrong
|
diff --git a/lib/protocol/Connection.js b/lib/protocol/Connection.js
index <HASH>..<HASH> 100644
--- a/lib/protocol/Connection.js
+++ b/lib/protocol/Connection.js
@@ -451,7 +451,7 @@ Connection.prototype.disconnect = function disconnect(cb) {
self.enqueue(request.disconnect(), done);
}
- if (this._queue.empty && !this._queue.busy) {
+ if (this.isIdle()) {
return enqueueDisconnect();
}
this._queue.once('drain', enqueueDisconnect);
@@ -558,7 +558,7 @@ Connection.prototype.close = function close() {
if (this.readyState === 'closed') {
return;
}
- if (this._queue.empty && !this._queue.busy) {
+ if (this.isIdle()) {
return closeConnection();
}
this._queue.once('drain', closeConnection);
@@ -570,6 +570,10 @@ Connection.prototype.destroy = function destroy(err) {
}
};
+Connection.prototype.isIdle = function isIdle() {
+ return this._queue.empty && !this._queue.busy;
+};
+
Connection.prototype.setAutoCommit = function setAutoCommit(autoCommit) {
this._transaction.autoCommit = autoCommit;
};
|
Expose connection.IsIdle (#<I>)
|
diff --git a/app/models/neighborly/balanced/payment.rb b/app/models/neighborly/balanced/payment.rb
index <HASH>..<HASH> 100644
--- a/app/models/neighborly/balanced/payment.rb
+++ b/app/models/neighborly/balanced/payment.rb
@@ -12,6 +12,10 @@ module Neighborly::Balanced
payment_choice: :creditcard)
end
+ def debit
+ @debit.try(:sanitize)
+ end
+
def successful?
%w(pending succeeded).include? @debit.try(:status)
end
|
Expose debit information through a hash on Payment class
|
diff --git a/cli/django.py b/cli/django.py
index <HASH>..<HASH> 100644
--- a/cli/django.py
+++ b/cli/django.py
@@ -11,18 +11,18 @@ app = typer.Typer()
@app.command()
def autoconfigure(
- repo_url: str,
+ repo_url: str = typer.Argument(..., help="url of remote git repository of your django project"),
domain_name: str = typer.Option(
"your-username.pythonanywhere.com",
"-d",
"--domain",
- help="Domain name, eg www.mydomain.com [default: your-username.pythonanywhere.com]",
+ help="Domain name, eg www.mydomain.com",
),
python_version: str = typer.Option(
"3.6",
"-p",
"--python-version",
- help="Python version, eg '3.8' [default: 3.6]",
+ help="Python version, eg '3.8'",
),
nuke: bool = typer.Option(
False,
|
#5 fixes autoconfigure django help strings as defaults are autogenerated
|
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
index <HASH>..<HASH> 100644
--- a/tests/test_decorators.py
+++ b/tests/test_decorators.py
@@ -401,3 +401,13 @@ def test_cli_with_conflicting_short_options():
assert hug.test.cli(test) == ('Value', 'Value2')
assert hug.test.cli(test, abe1='hi', abe2='there') == ('hi', 'there')
+
+def test_cli_with_directives():
+ '''Test to ensure it's possible to use directives with hug CLIs'''
+ @hug.cli()
+ def test(hug_timer):
+ return float(hug_timer)
+
+ assert isinstance(test(), float)
+ assert test(hug_timer=4) == 4
+ assert isinstance(hug.test.cli(test), float)
|
Add test for directives in use with hug clis
|
diff --git a/apiserver/facades/agent/instancemutater/interface.go b/apiserver/facades/agent/instancemutater/interface.go
index <HASH>..<HASH> 100644
--- a/apiserver/facades/agent/instancemutater/interface.go
+++ b/apiserver/facades/agent/instancemutater/interface.go
@@ -8,7 +8,6 @@ import (
"github.com/juju/charm/v8"
- "github.com/juju/juju/core/cache"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/lxdprofile"
"github.com/juju/juju/core/status"
@@ -66,11 +65,3 @@ type Charm interface {
type Application interface {
CharmURL() *charm.URL
}
-
-// ModelCacheMachine represents a point of use Machine from the cache package.
-type ModelCacheMachine interface {
- ContainerType() instance.ContainerType
- IsManual() bool
- WatchLXDProfileVerificationNeeded() (cache.NotifyWatcher, error)
- WatchContainers() (cache.StringsWatcher, error)
-}
|
Remove unused interface ModelCacheMachine
|
diff --git a/src/Lib/Parser/SearchParse.php b/src/Lib/Parser/SearchParse.php
index <HASH>..<HASH> 100755
--- a/src/Lib/Parser/SearchParse.php
+++ b/src/Lib/Parser/SearchParse.php
@@ -58,7 +58,7 @@ class SearchParse extends TemplateParse
}
if (preg_match('~<meta property="og:description" content="(.*?)">~', $line, $this->matches)) {
- $result['description'] = $this->matches[1];
+ $result['description'] = utf8_encode(trim($this->matches[1]));
}
if (preg_match('~<span class="dark_text">Type:</span>~', $line)) {
|
fix odd utf8 issue with search item descriptions
|
diff --git a/packages/idyll-document/src/utils/index.js b/packages/idyll-document/src/utils/index.js
index <HASH>..<HASH> 100644
--- a/packages/idyll-document/src/utils/index.js
+++ b/packages/idyll-document/src/utils/index.js
@@ -3,7 +3,7 @@ const entries = require('object.entries');
export const evalExpression = (acc, expr, key, context) => {
let e;
- if (key && (key.match(/on[A-Z].*/) || key.match(/handle[A-Z].*/))) {
+ if (key && (key.match(/^on[A-Z].*/) || key.match(/^handle[A-Z].*/))) {
let setState = setState;
e = `
(() => {
|
fix regexs for detecting keys that look like callbacks
|
diff --git a/uw_sws/section.py b/uw_sws/section.py
index <HASH>..<HASH> 100644
--- a/uw_sws/section.py
+++ b/uw_sws/section.py
@@ -282,7 +282,12 @@ def _json_to_section(section_data,
section.is_independent_study = False
section.class_website_url = section_data["ClassWebsiteUrl"]
- section.sln = section_data["SLN"]
+
+ if is_valid_sln(section_data["SLN"]):
+ section.sln = section_data["SLN"]
+ else:
+ section.sln = 0
+
if "SummerTerm" in section_data:
section.summer_term = section_data["SummerTerm"]
else:
|
set section.sln to 0 if the value is not valid
|
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -301,10 +301,15 @@ class Filesystem
*/
public function symlink($originDir, $targetDir, $copyOnWindows = false)
{
- if ($copyOnWindows && !function_exists('symlink')) {
- $this->mirror($originDir, $targetDir);
+ if ('\\' === DIRECTORY_SEPARATOR) {
+ $originDir = strtr($originDir, '/', '\\');
+ $targetDir = strtr($targetDir, '/', '\\');
+
+ if ($copyOnWindows) {
+ $this->mirror($originDir, $targetDir);
- return;
+ return;
+ }
}
$this->mkdir(dirname($targetDir));
|
Ensure backend slashes for symlinks on Windows systems
Resolves: #<I>
|
diff --git a/zappa/core.py b/zappa/core.py
index <HASH>..<HASH> 100644
--- a/zappa/core.py
+++ b/zappa/core.py
@@ -397,7 +397,9 @@ class Zappa(object):
# Need to manually add setuptools
pkg_list.append('setuptools')
- pip.main(["install", "--quiet", "--target", venv_site_packages_dir] + pkg_list)
+ pip_return_code = pip.main(["install", "--quiet", "--target", venv_site_packages_dir] + pkg_list)
+ if pip_return_code:
+ raise EnvironmentError("Pypi lookup failed")
return ve_path
|
check pip return code
So we can stop deployment in case pip fails to lookup libraries.
|
diff --git a/ipyrad/core/assembly.py b/ipyrad/core/assembly.py
index <HASH>..<HASH> 100644
--- a/ipyrad/core/assembly.py
+++ b/ipyrad/core/assembly.py
@@ -138,7 +138,7 @@ class Assembly(object):
nameordered = self.samples.keys()
nameordered.sort()
return pd.DataFrame([self.samples[i].stats for i in nameordered],
- index=nameordered)
+ index=nameordered).dropna( axis=1, how='all')
#dtype=[int, int, int, int, int, float, float, int])
|
added a smidge of code to assemble.stats to dropna(axis=1, how='all') to
drop all columns (axis=1) where all results are NaN
|
diff --git a/ipyvolume/_version.py b/ipyvolume/_version.py
index <HASH>..<HASH> 100644
--- a/ipyvolume/_version.py
+++ b/ipyvolume/_version.py
@@ -1,6 +1,6 @@
-__version_tuple__ = (0, 6, 0, 'alpha.7')
-__version__ = '0.6.0-alpha.7'
+__version_tuple__ = (0, 6, 0, 'alpha.8')
+__version__ = '0.6.0-alpha.8'
__version_tuple_js__ = (0, 6, 0, 'alpha.7')
__version_js__ = '0.6.0-alpha.7'
# kept for embedding in offline mode, we don't care about the patch version since it should be compatible
|
🔖 py <I>-alpha<I> released
|
diff --git a/src/Iterator/Model.php b/src/Iterator/Model.php
index <HASH>..<HASH> 100755
--- a/src/Iterator/Model.php
+++ b/src/Iterator/Model.php
@@ -24,7 +24,7 @@ class Model extends \Mwyatt\Core\AbstractIterator implements \Mwyatt\Core\Iterat
*/
public function getIds()
{
- return $this->pluckUnique('id');
+ return $this->pluckUnique('id')->getArrayCopy();
}
@@ -48,7 +48,7 @@ class Model extends \Mwyatt\Core\AbstractIterator implements \Mwyatt\Core\Iterat
*/
public function extractProperty($property)
{
- return $this->pluck($property);
+ return $this->pluck($property)->getArrayCopy();
}
@@ -59,7 +59,13 @@ class Model extends \Mwyatt\Core\AbstractIterator implements \Mwyatt\Core\Iterat
*/
public function extractPropertyUnique($property)
{
- return $this->pluckUnique($property);
+ return $this->pluckUnique($property)->getArrayCopy();
+ }
+
+
+ public function getKeyedByProperty($property)
+ {
+ return parent::getKeyedByProperty($property)->getArrayCopy();
}
|
fix model iterator plugin to collection
|
diff --git a/lib/will_paginate/view_helpers.rb b/lib/will_paginate/view_helpers.rb
index <HASH>..<HASH> 100644
--- a/lib/will_paginate/view_helpers.rb
+++ b/lib/will_paginate/view_helpers.rb
@@ -114,7 +114,8 @@ module WillPaginate
end
model_count = collection.total_pages > 1 ? 5 : collection.size
- model_name = will_paginate_translate "models.#{model_key}", :count => model_count do |_, opts|
+ defaults = ["models.#{model_key}"]
+ defaults << Proc.new { |_, opts|
if model.respond_to? :model_name
model.model_name.human(:count => opts[:count])
else
@@ -122,7 +123,8 @@ module WillPaginate
raise "can't pluralize model name: #{model.inspect}" unless name.respond_to? :pluralize
opts[:count] == 1 ? name : name.pluralize
end
- end
+ }
+ model_name = will_paginate_translate defaults, :count => model_count
if collection.total_pages < 2
i18n_key = :"page_entries_info.single_page#{html_key}"
|
i<I>n: fix model_name fallback for Rails
|
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/DefaultTempFolder.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/DefaultTempFolder.java
index <HASH>..<HASH> 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/DefaultTempFolder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/DefaultTempFolder.java
@@ -95,7 +95,7 @@ public class DefaultTempFolder implements TempFolder {
try {
Files.walkFileTree(tempDir.toPath(), DeleteRecursivelyFileVisitor.INSTANCE);
} catch (IOException e) {
- LOG.trace("Failed to delete temp folder", e);
+ LOG.error("Failed to delete temp folder", e);
}
}
|
SONAR-<I> fix log level when fail to delete temp directory
|
diff --git a/src/lib/Item.php b/src/lib/Item.php
index <HASH>..<HASH> 100644
--- a/src/lib/Item.php
+++ b/src/lib/Item.php
@@ -70,6 +70,16 @@ class Item extends NonSequentialIdModel
}
/**
+ * Return the time difference between 0 and the end of the duration.
+ *
+ * @return \DateInterval
+ */
+ public function getDuration()
+ {
+ return DateTime::createFromFormat('U', 0)->diff(DateTime::createFromFormat('U', $this->duration));
+ }
+
+ /**
* Return the highest bid amount placed.
*
* @return float
|
Added getDuration() method to Item model
|
diff --git a/lib/cave/form/builder.rb b/lib/cave/form/builder.rb
index <HASH>..<HASH> 100644
--- a/lib/cave/form/builder.rb
+++ b/lib/cave/form/builder.rb
@@ -27,12 +27,3 @@ class Cave::Form::Builder < ActionView::Helpers::FormBuilder
@template.content_tag 'div', raw, class: "control-group #{name} #{error_class}"
end
end
-
-module ActionView::Helpers::FormHelper
- def form_for record, options={}, &proc
- if record.is_a? Cave::Form
- options[:builder] ||= Cave::Form::Builder
- end
- super record, options, &proc
- end
-end
\ No newline at end of file
|
Don't monkey-patch form_for
|
diff --git a/lib/parser.js b/lib/parser.js
index <HASH>..<HASH> 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -199,11 +199,11 @@ exports.parse_calendar = function(data, timezone) {
var state = expect("BEGIN", "VCALENDAR", parse_component(calendar));
for(var i=0; i<data.length-1; ++i) {
- if(state === undefined)
- throw new ParseError("Mismatched BEGIN/END tags");
-
if(!data[i].length)
continue;
+
+ if(state === undefined)
+ throw new ParseError("Mismatched BEGIN/END tags");
// Peek ahead to find line continuations...
var j = i;
|
Be more tolerant of new lines when parsing.
No longer throws errors when empty blank lines are added to the end of a
vcalendar string to parse.
|
diff --git a/services/visual_recognition/v3.js b/services/visual_recognition/v3.js
index <HASH>..<HASH> 100644
--- a/services/visual_recognition/v3.js
+++ b/services/visual_recognition/v3.js
@@ -110,7 +110,8 @@ module.exports = function (RED) {
});
});
});
- } // else
+
+
async.parallel(asyncTasks, function(error, deletedList){
if (deletedList.length===nbTodelete) {
msg.payload='see msg.result.error';
@@ -123,7 +124,10 @@ module.exports = function (RED) {
node.send(msg);
node.status({});
});
- });
+
+ } // else
+
+ }); // list classifiers
} // delete all func
|
refactor code for codacy...
|
diff --git a/src/system/modules/metamodels/MetaModelDatabase.php b/src/system/modules/metamodels/MetaModelDatabase.php
index <HASH>..<HASH> 100644
--- a/src/system/modules/metamodels/MetaModelDatabase.php
+++ b/src/system/modules/metamodels/MetaModelDatabase.php
@@ -481,6 +481,7 @@ class MetaModelDatabase extends Controller
if($field['sortable'])
{
$arrSorting[] = $field['field_attribute'];
+ $arrDCA['fields'][$field['field_attribute']]['sorting'] = true;
}
}
@@ -488,7 +489,7 @@ class MetaModelDatabase extends Controller
$arrDCA['list']['sorting']['fields'] = $arrSorting;
// Set Sorting panelLayout from current renderSettings
- $arrDCA['list']['sorting']['panelLayout'] .= $objMetaModelRenderSettings->get('panelLayout');
+ $arrDCA['list']['sorting']['panelLayout'] = $objMetaModelRenderSettings->get('panelLayout');
}
if (in_array($objMetaModel->get('mode'), array(3, 4, 6)))
|
Update panles and sorting for fields.
|
diff --git a/Templates/default.blade.php b/Templates/default.blade.php
index <HASH>..<HASH> 100644
--- a/Templates/default.blade.php
+++ b/Templates/default.blade.php
@@ -79,18 +79,16 @@
</tbody>
</table>
<div style="clear:both; position:relative;">
- <div style="position:absolute; left:0pt; width:250pt;">
- <h4>Notes:</h4>
- <div class="panel panel-default">
- <div class="panel-body">
- @if($invoice->notes)
+ @if($invoice->notes)
+ <div style="position:absolute; left:0pt; width:250pt;">
+ <h4>Notes:</h4>
+ <div class="panel panel-default">
+ <div class="panel-body">
{{ $invoice->notes }}
- @else
-
- @endif
+ </div>
</div>
</div>
- </div>
+ @endif
<div style="margin-left: 300pt;">
<h4>Total:</h4>
<table class="table table-bordered">
|
Hide notes if no notes
Rather than displaying an empty notes box, this hides the notes box completely if there are no notes.
|
diff --git a/categories/settings.py b/categories/settings.py
index <HASH>..<HASH> 100644
--- a/categories/settings.py
+++ b/categories/settings.py
@@ -5,7 +5,7 @@ from django.db.models import Q
DEFAULT_SETTINGS = {
'ALLOW_SLUG_CHANGE': False,
- 'CACHE_VIEW_LENGTH': 0,
+ 'CACHE_VIEW_LENGTH': 600,
'RELATION_MODELS': [],
'M2M_REGISTRY': {},
'FK_REGISTRY': {},
|
Updated the default view caching to <I>, which is the django default instead of forcing the views to NEVER cache at all.
|
diff --git a/apps/staging_log_test.go b/apps/staging_log_test.go
index <HASH>..<HASH> 100644
--- a/apps/staging_log_test.go
+++ b/apps/staging_log_test.go
@@ -20,7 +20,7 @@ var _ = Describe("An application being staged", func() {
It("has its staging log streamed during a push", func() {
push := Cf("push", AppName, "-p", doraPath)
- Expect(push).To(Say("Installing dependencies"))
+ // Expect(push).To(Say("Installing dependencies"))
Expect(push).To(Say("Uploading droplet"))
Expect(push).To(Say("App started"))
})
|
Disable check that fails due to known race condition
This should be enabled as part of [#<I>]
|
diff --git a/achilles-cql/src/main/java/info/archinnov/achilles/embedded/CQLEmbeddedServer.java b/achilles-cql/src/main/java/info/archinnov/achilles/embedded/CQLEmbeddedServer.java
index <HASH>..<HASH> 100644
--- a/achilles-cql/src/main/java/info/archinnov/achilles/embedded/CQLEmbeddedServer.java
+++ b/achilles-cql/src/main/java/info/archinnov/achilles/embedded/CQLEmbeddedServer.java
@@ -80,7 +80,7 @@ public class CQLEmbeddedServer extends AchillesEmbeddedServer {
&& cassandraHost.contains(":")) {
String[] split = cassandraHost.split(":");
configMap.put(CONNECTION_CONTACT_POINTS_PARAM, split[0]);
- configMap.put(CONNECTION_PORT_PARAM, split[1]);
+ configMap.put(CONNECTION_PORT_PARAM, Integer.parseInt(split[1]));
} else {
createAchillesKeyspace(keyspaceName);
configMap.put(CONNECTION_CONTACT_POINTS_PARAM, CASSANDRA_TEST_HOST);
|
Fixes Class cast exception when parsing String as integer
|
diff --git a/src/utils/Slide/index.js b/src/utils/Slide/index.js
index <HASH>..<HASH> 100644
--- a/src/utils/Slide/index.js
+++ b/src/utils/Slide/index.js
@@ -143,6 +143,9 @@ class Slide extends React.Component<Props, State> {
id={id}
aria-labelledby={ariaLabelledBy}
visible={visible}
+ onClick={ev => {
+ ev.stopPropagation();
+ }}
>
{children}
</StyledSlide>
|
FIX: Slide onClick propagation (#<I>)
|
diff --git a/src/PhantomInstaller/Installer.php b/src/PhantomInstaller/Installer.php
index <HASH>..<HASH> 100644
--- a/src/PhantomInstaller/Installer.php
+++ b/src/PhantomInstaller/Installer.php
@@ -275,7 +275,7 @@ class Installer
if ($os !== 'unknown') {
copy($targetDir . $sourceName, $targetName);
- chmod($targetName, self::PHANTOMJS_CHMODE);
+ chmod($targetName, static::PHANTOMJS_CHMODE);
}
self::dropClassWithPathToInstalledBinary($targetName);
|
use static to access chmod constant
to allow override via extending class
|
diff --git a/packages/tree-view/src/TreeItem.js b/packages/tree-view/src/TreeItem.js
index <HASH>..<HASH> 100644
--- a/packages/tree-view/src/TreeItem.js
+++ b/packages/tree-view/src/TreeItem.js
@@ -10,11 +10,9 @@ const TreeItem = props => {
collapsed,
defaultCollapsed,
expandByDoubleClick,
- getKeyboardOpenId,
icon,
id,
label,
- setKeyboardOpenId,
stylesheet,
...otherProps
} = props;
@@ -22,9 +20,11 @@ const TreeItem = props => {
defaultSelected,
getActiveTreeItemId,
getCurrentItemClicked,
+ getKeyboardOpenId,
isControlled,
onFocus,
- selected
+ selected,
+ setKeyboardOpenId
} = otherProps;
const getActiveId = () => {
if (isControlled()) {
|
refactor: switch internal props to ...otherProps
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -23,6 +23,7 @@ module.exports = function (grunt) {
compress: {
drop_console: true
},
+ mangle: false,
preserveComments: false
},
build: {
@@ -39,7 +40,7 @@ module.exports = function (grunt) {
description: '<%= pkg.description %>',
url: '<%= pkg.url %>',
options: {
- outdir: './docs',
+ outdir: './docs/latest',
linkNatives: true,
paths: ['./src/']
}
|
The packaging process no longer mangles function names.
|
diff --git a/input/tangy-photo-capture.js b/input/tangy-photo-capture.js
index <HASH>..<HASH> 100644
--- a/input/tangy-photo-capture.js
+++ b/input/tangy-photo-capture.js
@@ -171,7 +171,7 @@ export class TangyPhotoCapture extends PolymerElement {
clear: t('clear')
}
// Start streaming video
- navigator.mediaDevices.getUserMedia({video: true})
+ navigator.mediaDevices.getUserMedia({video: { facingMode: { exact: "environment" } }})
.then(mediaStream => {
this.shadowRoot.querySelector('video').srcObject = mediaStream;
const track = mediaStream.getVideoTracks()[0];
|
preset rear camera for tangy-photo-capture
|
diff --git a/tabular_predDB/binary_creation/setup.py b/tabular_predDB/binary_creation/setup.py
index <HASH>..<HASH> 100644
--- a/tabular_predDB/binary_creation/setup.py
+++ b/tabular_predDB/binary_creation/setup.py
@@ -17,9 +17,9 @@ includes = [
'tabular_predDB.LocalEngine',
'tabular_predDB.cython_code.State',
'numpy',
- # 'tabular_predDB.python_utils.plot_utils',
- # 'pylab',
- # 'matplotlib.backends.backend_qt4agg',
+ 'tabular_predDB.python_utils.plot_utils',
+ 'pylab',
+ 'matplotlib.backends.backend_qt4agg',
]
buildOptions = dict(
|
BUGFIX: uncomment includes, else running fails on import error
|
diff --git a/rut/src/test/java/io/norberg/rut/RadixTrieTest.java b/rut/src/test/java/io/norberg/rut/RadixTrieTest.java
index <HASH>..<HASH> 100644
--- a/rut/src/test/java/io/norberg/rut/RadixTrieTest.java
+++ b/rut/src/test/java/io/norberg/rut/RadixTrieTest.java
@@ -186,6 +186,17 @@ public class RadixTrieTest {
assertThat(captor.isMatch(), is(false));
}
+ @Test
+ public void testEndAtSplitDoesNotMatch() {
+ RadixTrie<String> rdx = RadixTrie.builder(String.class)
+ .insert("a1", "a1")
+ .insert("a2", "a2")
+ .build();
+ final RadixTrie.Captor captor = rdx.captor();
+ assertThat(rdx.lookup("a", captor), is(nullValue()));
+ assertThat(captor.isMatch(), is(false));
+ }
+
@Test(expected = IllegalArgumentException.class)
public void verifyUnclosedCaptureFails() {
RadixTrie.builder(String.class)
|
failing test for rdx early path end bug
|
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol3.java b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol3.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol3.java
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol3.java
@@ -137,7 +137,6 @@ public class JnlpSlaveAgentProtocol3 extends AgentProtocol {
/**
* Flag to control the activation of JNLP3 protocol.
- * This feature is being A/B tested right now.
*
* <p>
* Once this will be on by default, the flag and this field will disappear. The system property is
@@ -151,11 +150,8 @@ public class JnlpSlaveAgentProtocol3 extends AgentProtocol {
static {
forceEnabled = SystemProperties.optBoolean(JnlpSlaveAgentProtocol3.class.getName() + ".enabled");
- if (forceEnabled != null)
+ if (forceEnabled != null) {
ENABLED = forceEnabled;
- else {
- byte hash = Util.fromHexString(Jenkins.getActiveInstance().getLegacyInstanceId())[0];
- ENABLED = (hash%10)==0;
}
}
}
|
[JENKINS-<I>] Stop A/B testing JNLP3
|
diff --git a/views/js/qtiCreator/helper/xincludeRenderer.js b/views/js/qtiCreator/helper/xincludeRenderer.js
index <HASH>..<HASH> 100644
--- a/views/js/qtiCreator/helper/xincludeRenderer.js
+++ b/views/js/qtiCreator/helper/xincludeRenderer.js
@@ -74,7 +74,7 @@ define([
//reload the wiget to rfresh the rendering with the new href
xincludeWidget.refresh();
}, loadedClasses);
- _.each(xincludeHandlers, handler => handler(xinclude.attr('href'), className));
+ _.each(xincludeHandlers, handler => handler(xinclude.attr('href'), className, xi.serial));
} else {
//loading failure :
xinclude.removeAttr('href');
|
fix: fix passage css format on Items
|
diff --git a/lib/cinch/version.rb b/lib/cinch/version.rb
index <HASH>..<HASH> 100644
--- a/lib/cinch/version.rb
+++ b/lib/cinch/version.rb
@@ -1,3 +1,4 @@
module Cinch
+ # Version of the library
VERSION = '2.0.0'
end
|
document Cinch::Version constant
|
diff --git a/satpy/tests/writer_tests/test_ninjogeotiff.py b/satpy/tests/writer_tests/test_ninjogeotiff.py
index <HASH>..<HASH> 100644
--- a/satpy/tests/writer_tests/test_ninjogeotiff.py
+++ b/satpy/tests/writer_tests/test_ninjogeotiff.py
@@ -904,3 +904,17 @@ def test_create_unknown_tags(test_image_small_arctic_P):
PhysicValue="N/A",
SatelliteNameID=6500014,
Locatie="Hozomeen")
+
+
+def test_str_ids(test_image_small_arctic_P):
+ """Test that channel and satellit IDs can be str."""
+ from satpy.writers.ninjogeotiff import NinJoTagGenerator
+ NinJoTagGenerator(
+ test_image_small_arctic_P,
+ 42,
+ "quorn.tif",
+ ChannelID="la manche",
+ DataType="GPRN",
+ PhysicUnit="N/A",
+ PhysicValue="N/A",
+ SatelliteNameID="trollsat")
|
Added test to confirm string IDs are accepted.
On the side of NinJo there exists an interest to move from numerical IDs
to string IDs for the satellite and channel IDs in the ninjogeotiff
headers. The ninjogeotiff writer has no objection to this. Confirm
this no-objection with a unit test.
|
diff --git a/test/performance/benchmark_server.js b/test/performance/benchmark_server.js
index <HASH>..<HASH> 100644
--- a/test/performance/benchmark_server.js
+++ b/test/performance/benchmark_server.js
@@ -44,10 +44,10 @@ var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
/**
* Create a buffer filled with size zeroes
* @param {number} size The length of the buffer
- * @return {Buffer} The Buffer.from
+ * @return {Buffer} The New Buffer
*/
function zeroBuffer(size) {
- var zeros = Buffer.from(size);
+ var zeros = Buffer.alloc(size);
zeros.fill(0);
return zeros;
}
|
replace usage of Buffer.from with Buffer.alloc
|
diff --git a/lib/components/form/settings-selector-panel.js b/lib/components/form/settings-selector-panel.js
index <HASH>..<HASH> 100644
--- a/lib/components/form/settings-selector-panel.js
+++ b/lib/components/form/settings-selector-panel.js
@@ -208,13 +208,13 @@ class SettingsSelectorPanel extends Component {
{/* The transit mode selected */}
{hasTransit(mode) && (<div style={{ marginBottom: 16 }}>
<div className='setting-label'>Use</div>
- <div style={{ textAlign: 'right' }}>
+ <div style={{ textAlign: 'left' }}>
{transitModes.map((mode, k) => {
let classNames = ['select-button']
if (this._modeIsActive(mode)) classNames.push('active')
return <Button key={mode.mode}
className={classNames.join(' ')}
- style={{ marginTop: 3, marginBottom: 3 }}
+ style={{ marginTop: 3, marginBottom: 3, marginLeft: 0, marginRight: 5 }}
onClick={() => this._toggleTransitMode(mode)}
>
<div
|
feat(form): Change styling/alignment of mode selection buttons
|
diff --git a/lib/monitor.js b/lib/monitor.js
index <HASH>..<HASH> 100644
--- a/lib/monitor.js
+++ b/lib/monitor.js
@@ -47,7 +47,7 @@ ReqCounter.prototype.registerEvents = function (server) {
server.emit = function () {
var args = arguments;
if (args[0] !== 'connection' && args[0] !== 'request') {
- origEmit.apply(server, arguments);
+ origEmit.apply(this, arguments);
return;
}
@@ -65,7 +65,7 @@ ReqCounter.prototype.registerEvents = function (server) {
if (data && data.length) {
that._transfered += data.length;
}
- origWrite.apply(stream, arguments);
+ origWrite.apply(this, arguments);
};
stream.on('close', function () {
@@ -103,7 +103,7 @@ ReqCounter.prototype.registerEvents = function (server) {
};
/*jslint plusplus:true*/
}
- origEmit.apply(server, arguments);
+ origEmit.apply(this, arguments);
};
};
|
Fix stream.write() and server.emit() overrides to call the original
methods with the correct this context.
Contributed on behalf of Box Inc.
|
diff --git a/scripts/update-to-master.php b/scripts/update-to-master.php
index <HASH>..<HASH> 100644
--- a/scripts/update-to-master.php
+++ b/scripts/update-to-master.php
@@ -82,8 +82,8 @@ deleteCacheFolder('cache/trl');
$c = file(".gitignore", FILE_IGNORE_NEW_LINES);
$c[] = '/build';
$c[] = '/vendor';
-$c[] = 'bower.json';
-$c[] = '.bowerrc';
+$c[] = '/bower.json';
+$c[] = '/.bowerrc';
$c = array_filter($c); //remove empty lines
$c = array_unique($c);
file_put_contents('.gitignore', implode("\n", $c)."\n");
|
specify gitignore path with / so our sync doesn't use this isgnore in subfolders
|
diff --git a/lib/active_record/transitions.rb b/lib/active_record/transitions.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record/transitions.rb
+++ b/lib/active_record/transitions.rb
@@ -26,7 +26,7 @@ module ActiveRecord
included do
include ::Transitions
- before_validation :set_initial_state
+ after_initialize :set_initial_state
validates_presence_of :state
validate :state_inclusion
end
diff --git a/test/test_active_record.rb b/test/test_active_record.rb
index <HASH>..<HASH> 100644
--- a/test/test_active_record.rb
+++ b/test/test_active_record.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/module/aliasing'
class CreateTrafficLights < ActiveRecord::Migration
def self.up
- create_table(:traffic_lights) do |t|
+ create_table(:traffic_lights) do |t|
t.string :state
t.string :name
end
@@ -59,6 +59,11 @@ class TestActiveRecord < Test::Unit::TestCase
@light = TrafficLight.create!
end
+ test "new record has the initial state set" do
+ @light = TrafficLight.new
+ assert_equal "off", @light.state
+ end
+
test "states initial state" do
assert @light.off?
assert_equal :off, @light.current_state
|
New records have their state set after initialization
Initial state was set using before_validation, which resulted in a nil state
for new records. Instead of using the before_validate hook, use the
after_initialize hook to make sure the state is properly set.
|
diff --git a/django_mako_plus/__init__.py b/django_mako_plus/__init__.py
index <HASH>..<HASH> 100644
--- a/django_mako_plus/__init__.py
+++ b/django_mako_plus/__init__.py
@@ -5,5 +5,5 @@
# The version of DMP - used by sdist to publish to PyPI
-__version__ = '2.4.7'
+__version__ = '2.4.8'
|
fixed a versioning error again. last one had issues.
|
diff --git a/ecs-init/docker/docker.go b/ecs-init/docker/docker.go
index <HASH>..<HASH> 100644
--- a/ecs-init/docker/docker.go
+++ b/ecs-init/docker/docker.go
@@ -53,6 +53,10 @@ const (
// maxRetries specifies the maximum number of retries for ping to return
// a successful response from the docker socket
maxRetries = 5
+ // CAP_NET_ADMIN to start agent
+ // For more information on capabilities, please read this manpage:
+ // http://man7.org/linux/man-pages/man7/capabilities.7.html
+ CAP_NET_ADMIN = "NET_ADMIN"
)
// Client enables business logic for running the Agent inside Docker
@@ -228,6 +232,7 @@ func (c *Client) getHostConfig() *godocker.HostConfig {
Binds: binds,
NetworkMode: networkMode,
UsernsMode: usernsMode,
+ CapAdd: []string{CAP_NET_ADMIN},
}
}
|
Adding CAP_NET_ADMIN for starting agent
|
diff --git a/losser/losser.py b/losser/losser.py
index <HASH>..<HASH> 100644
--- a/losser/losser.py
+++ b/losser/losser.py
@@ -51,8 +51,16 @@ def _write_csv(f, table_):
``f`` could be an opened file, sys.stdout, or a StringIO.
"""
- # We assume that each dict in the list has the same keys.
fieldnames = table_[0].keys()
+ set_fieldname = set(table_[0].keys())
+ # go through all the fields and find all the field names
+ for row in table_:
+ set_fieldname.update(set(row.keys()))
+
+ # append the additonal fields sorted onto the end
+ additional_fields = sorted(set_fieldname - set(table_[0].keys()))
+ fieldnames += additional_fields
+
writer = unicodecsv.DictWriter(f, fieldnames, encoding='utf-8')
writer.writeheader()
|
when writing to csv, go through all rows keys first to determine headers
|
diff --git a/pagoda/cooper.py b/pagoda/cooper.py
index <HASH>..<HASH> 100644
--- a/pagoda/cooper.py
+++ b/pagoda/cooper.py
@@ -131,11 +131,8 @@ class Markers:
with open(filename, 'rb') as handle:
reader = c3d.Reader(handle)
- # make sure the c3d file's frame rate matches our world.
- assert self.world.dt == 1. / reader.frame_rate()
-
# set up a map from marker label to index in the data stream.
- labels = [s.strip() for s in reader.point_labels()]
+ labels = [s.strip() for s in reader.point_labels]
logging.info('%s: loaded marker labels %s', filename, labels)
self.channels = self._interpret_channels(labels)
|
Move to newer version of c3d module.
|
diff --git a/tests/parsers/test_gherkinlint.py b/tests/parsers/test_gherkinlint.py
index <HASH>..<HASH> 100644
--- a/tests/parsers/test_gherkinlint.py
+++ b/tests/parsers/test_gherkinlint.py
@@ -5,18 +5,18 @@ from __future__ import unicode_literals
import codecs
import os.path
-import inlineplz.parsers.gherkinlint as gherkin_lint
+import inlineplz.parsers.gherkinlint as gherkinlint
-gherkin_lint_path = os.path.join(
+gherkinlint_path = os.path.join(
'tests',
'testdata',
'parsers',
'gherkin-lint.txt'
)
-def test_eslint():
- with codecs.open(gherkin_lint_path, encoding='utf-8', errors='replace') as inputfile:
- messages = sorted(list(gherkin_lint.GherkinLintParser().parse(inputfile.read())))
+def test_gherkinlint():
+ with codecs.open(gherkinlint_path, encoding='utf-8', errors='replace') as inputfile:
+ messages = sorted(list(gherkinlint.GherkinLintParser().parse(inputfile.read())))
print (messages)
assert messages[0][2] == 'Feature name is already used in: features/fake.feature'
assert messages[0][1] == 1
|
fixing typo and making the gherkin-lint python-acceptable alias more consistent (#<I>)
|
diff --git a/service/http/service.go b/service/http/service.go
index <HASH>..<HASH> 100644
--- a/service/http/service.go
+++ b/service/http/service.go
@@ -9,6 +9,7 @@ import (
"github.com/spiral/roadrunner/service/rpc"
"github.com/spiral/roadrunner/util"
"golang.org/x/net/http2"
+ "golang.org/x/net/http2/h2c"
"net/http"
"net/http/fcgi"
"net/url"
@@ -99,7 +100,13 @@ func (s *Service) Serve() error {
s.handler.Listen(s.throw)
if s.cfg.EnableHTTP() {
- s.http = &http.Server{Addr: s.cfg.Address, Handler: s}
+ var h2s *http2.Server
+ if s.cfg.EnableHTTP2() && !s.cfg.EnableTLS() {
+ h2s = &http2.Server{}
+ s.http = &http.Server{Addr: s.cfg.Address, Handler: h2c.NewHandler(s, h2s)}
+ } else {
+ s.http = &http.Server{Addr: s.cfg.Address, Handler: s}
+ }
}
if s.cfg.EnableTLS() {
|
Attempt to add h2c handling (http2 w/o ssl)
|
diff --git a/lib/rbbt/rest/common/users.rb b/lib/rbbt/rest/common/users.rb
index <HASH>..<HASH> 100644
--- a/lib/rbbt/rest/common/users.rb
+++ b/lib/rbbt/rest/common/users.rb
@@ -15,7 +15,7 @@ module Sinatra
target_url = request.env["REQUEST_URI"]
Log.warn{ "Unauthorized access to #{target_url}" }
session[:target_url] = target_url
- redirect '/login'
+ redirect to('/login')
end
def logout!
@@ -59,20 +59,20 @@ module Sinatra
session[:user] = user
if session[:target_url]
url = session.delete :target_url
- redirect url
+ redirect to(url)
else
- redirect '/'
+ redirect to('/')
end
else
Log.warn{ "Failed login attempt #{[user, pass] * ": "}" }
session[:user] = nil
- redirect '/login'
+ redirect to('/login')
end
end
app.get '/logout' do
session[:user] = nil
- redirect '/'
+ redirect to('/')
end
end
end
|
Fix: redirect -> redirect to(...)
|
diff --git a/node.js b/node.js
index <HASH>..<HASH> 100644
--- a/node.js
+++ b/node.js
@@ -109,7 +109,7 @@ var server = connect.createServer(
);
// bind the server to a port, choose your port:
-server.listen(8080); // 80 is the default web port and 443 for TLS
+server.listen(80); // 80 is the default web port and 443 for TLS
// Your server is running :-)
console.log('Node server is running!');
|
changed default port back to <I>;
|
diff --git a/src/ox_modules/module-web.js b/src/ox_modules/module-web.js
index <HASH>..<HASH> 100644
--- a/src/ox_modules/module-web.js
+++ b/src/ox_modules/module-web.js
@@ -249,10 +249,11 @@ export default class WebModule extends WebDriverModule {
}
// maximize browser window
try {
- if (this.driver.capabilities.browserName === 'MicrosoftEdge') {
+ if (['MicrosoftEdge', 'msedge'].includes(this.driver.capabilities.browserName)) {
// FIXME: this should be refactored
// ignore
// fails on lambdatest
+ // fails on browserstack sometimes
} else {
await this.driver.maximizeWindow();
await this.driver.setTimeout({ 'implicit': this.waitForTimeout });
|
CBS-<I> UNKNOWN_ERROR at web.init() using EDGE on browserstack (#<I>)
|
diff --git a/pylatex/utils.py b/pylatex/utils.py
index <HASH>..<HASH> 100644
--- a/pylatex/utils.py
+++ b/pylatex/utils.py
@@ -186,7 +186,8 @@ def dumps_list(l, *, escape=True, token='%\n', mapper=None, as_content=True):
mapper = [mapper]
for m in mapper:
- strings = map(lambda x: _latex_item_to_string(m(x)), strings)
+ strings = [m(s) for s in strings]
+ strings = [_latex_item_to_string(s) for s in strings]
return NoEscape(token.join(strings))
|
Change fix for #<I> a bit to work for lists of mappers
|
diff --git a/public/js/date-range-picker.js b/public/js/date-range-picker.js
index <HASH>..<HASH> 100644
--- a/public/js/date-range-picker.js
+++ b/public/js/date-range-picker.js
@@ -2,7 +2,7 @@ define([
'comps/moment/min/moment.min',
'plugins/admin/libs/bootstrap-daterangepicker/daterangepicker',
'css!plugins/admin/libs/bootstrap-daterangepicker/daterangepicker-bs3'
-], function (moment) {
+], function () {
var now = moment();
var defaults = {
startDate: moment().subtract(29, 'days'),
|
refactoring: 解决moment = undefined 通过全局获取
|
diff --git a/catalog/app/components/JsonEditor/Input.js b/catalog/app/components/JsonEditor/Input.js
index <HASH>..<HASH> 100644
--- a/catalog/app/components/JsonEditor/Input.js
+++ b/catalog/app/components/JsonEditor/Input.js
@@ -73,6 +73,8 @@ function hasBrackets(valueStr) {
)
}
+const willBeNullInJson = (value) => typeof value === 'number' && !Number.isFinite(value)
+
export default function Input({
columnId,
data,
@@ -113,12 +115,11 @@ export default function Input({
)
const onBlur = React.useCallback(() => {
- if (columnId !== COLUMN_IDS.KEY || R.is(String, value)) {
- onChange(value)
- } else {
- onChange(JSON.stringify(value))
- }
- }, [onChange, columnId, value])
+ if (R.is(String, value)) return onChange(value)
+ if (columnId === COLUMN_IDS.KEY) return onChange(valueStr)
+ if (willBeNullInJson(value)) return onChange(null)
+ return onChange(value)
+ }, [onChange, columnId, value, valueStr])
const onKeyDown = React.useCallback(
(event) => {
|
handle Infinity (#<I>)
|
diff --git a/lib/engineyard-serverside/configuration.rb b/lib/engineyard-serverside/configuration.rb
index <HASH>..<HASH> 100644
--- a/lib/engineyard-serverside/configuration.rb
+++ b/lib/engineyard-serverside/configuration.rb
@@ -227,11 +227,11 @@ module EY
end
def precompile_assets?
- precompile_assets == true
+ precompile_assets == true || precompile_assets == "true"
end
def skip_precompile_assets?
- precompile_assets == false
+ precompile_assets == false || precompile_assets == "false"
end
# Assume downtime required if stack is not specified (nil) just in case.
|
Account for String command line option precompile_assets.
This would normally be made a def_boolean_option, but we rely
on having a 'not set' setting, nil, which tells us to smartly
detect if assets need compilation. Checking for string 'true'
solves the issue.
|
diff --git a/pyinstrument/renderers/speedscope.py b/pyinstrument/renderers/speedscope.py
index <HASH>..<HASH> 100644
--- a/pyinstrument/renderers/speedscope.py
+++ b/pyinstrument/renderers/speedscope.py
@@ -196,7 +196,9 @@ class SpeedscopeRenderer(Renderer):
def render(self, session: Session):
frame = self.preprocess(session.root_frame())
- sprofile = SpeedscopeProfile(session.program,
+ id_: str = time.strftime("%Y-%m-%dT%H-%M-%S", time.localtime(session.start_time))
+ name: str = "CPU profile for {} at {}".format(session.program, id_)
+ sprofile = SpeedscopeProfile(name,
self.render_frame(frame),
session.duration)
@@ -206,8 +208,6 @@ class SpeedscopeRenderer(Renderer):
sframe_list: list[SpeedscopeFrame] = [
sframe for sframe in iter(self._frame_to_index)]
- id_: str = time.strftime("%Y-%m-%dT%H-%M-%S", time.localtime(session.start_time))
- name: str = "CPU profile for {} at {}".format(session.program, id_)
shared_dict = {"frames": sframe_list}
speedscope_file = SpeedscopeFile(name, [sprofile], shared_dict)
|
SpeedscopeRenderer: make profile title informative
This commit modifies the display title of a speedscope profile
exported from pyinstrument to include the timestamp of when the
profile was generated (which also happens to be argument to
`--load-prev` needed to render output in other formats).
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.