diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/el_finder_s3/connector.rb b/lib/el_finder_s3/connector.rb
index <HASH>..<HASH> 100755
--- a/lib/el_finder_s3/connector.rb
+++ b/lib/el_finder_s3/connector.rb
@@ -78,7 +78,6 @@ module ElFinderS3
def run(params)
@adapter = ElFinderS3::Adapter.new(@options[:server], @options[:cache_connector])
- # @adapter = ElFinderS3::FtpAdapter.new(@options[:server])
@root = ElFinderS3::Pathname.new(adapter)
begin
diff --git a/lib/el_finder_s3/dummy_cache_client.rb b/lib/el_finder_s3/dummy_cache_client.rb
index <HASH>..<HASH> 100644
--- a/lib/el_finder_s3/dummy_cache_client.rb
+++ b/lib/el_finder_s3/dummy_cache_client.rb
@@ -12,5 +12,9 @@ module ElFinderS3
def delete(key)
nil
end
+
+ def exist?(key)
+ false
+ end
end
end
|
Added exists method to dummy_cache_client.rb
|
diff --git a/bitex/interfaces/rocktrading.py b/bitex/interfaces/rocktrading.py
index <HASH>..<HASH> 100644
--- a/bitex/interfaces/rocktrading.py
+++ b/bitex/interfaces/rocktrading.py
@@ -48,7 +48,7 @@ class RockTradingLtd(RockTradingREST):
return self.public_query('funds/%s/trades' % pair, params=kwargs)
def _place_order(self, side, pair, price, size, **kwargs):
- q = {'fund_id': pair, 'side': side, 'size': size, 'price': price}
+ q = {'fund_id': pair, 'side': side, 'amount': size, 'price': price}
q.update(kwargs)
return self.private_query('funds/%s/orders' % pair, method='POST',
params=q)
@@ -82,7 +82,7 @@ class RockTradingLtd(RockTradingREST):
@return_api_response(fmt.withdraw)
def withdraw(self, size, tar_addr, **kwargs):
- q = {'destination_address': tar_addr, 'size': size}
+ q = {'destination_address': tar_addr, 'amount': size}
q.update(kwargs)
return self.private_query('atms/withdraw', params=q)
|
change the dictionary key names back to their original names
|
diff --git a/test/specs/controller.scatter.test.js b/test/specs/controller.scatter.test.js
index <HASH>..<HASH> 100644
--- a/test/specs/controller.scatter.test.js
+++ b/test/specs/controller.scatter.test.js
@@ -3,6 +3,28 @@ describe('Chart.controllers.scatter', function() {
expect(typeof Chart.controllers.scatter).toBe('function');
});
+ it('should test default tooltip callbacks', function() {
+ var chart = window.acquireChart({
+ type: 'scatter',
+ data: {
+ datasets: [{
+ data: [{
+ x: 10,
+ y: 15
+ }],
+ label: 'dataset1'
+ }],
+ },
+ options: {}
+ });
+ var point = chart.getDatasetMeta(0).data[0];
+ jasmine.triggerMouseEvent(chart, 'mousemove', point);
+
+ // Title should be empty
+ expect(chart.tooltip._view.title.length).toBe(0);
+ expect(chart.tooltip._view.body[0].lines).toEqual(['(10, 15)']);
+ });
+
describe('showLines option', function() {
it('should not draw a line if undefined', function() {
var chart = window.acquireChart({
|
Test default tooltip callbacks for scatter charts (#<I>)
This moves the mouse over the drawn point and verifies that there is no title in the tooltip and that the body contains expected content.
|
diff --git a/src/Middleware/InitStateMiddleware.php b/src/Middleware/InitStateMiddleware.php
index <HASH>..<HASH> 100644
--- a/src/Middleware/InitStateMiddleware.php
+++ b/src/Middleware/InitStateMiddleware.php
@@ -44,8 +44,10 @@ class InitStateMiddleware implements HTTPMiddleware
return $delegate($request);
} catch (DatabaseException $ex) {
$message = $ex->getMessage();
- if (strpos($message, 'No database selected') !== false) {
- // Database is not ready, ignore and continue
+ if (strpos($message, 'No database selected') !== false
+ || preg_match('/\s*(table|relation) .* does(n\'t| not) exist/i', $message)
+ ) {
+ // Database is not ready, ignore and continue. Either it doesn't exist or it has no tables
return $delegate($request);
}
throw $ex;
|
FIX Catching situation where database has no tables but it exists
|
diff --git a/chef/lib/chef/provider/package/rubygems.rb b/chef/lib/chef/provider/package/rubygems.rb
index <HASH>..<HASH> 100644
--- a/chef/lib/chef/provider/package/rubygems.rb
+++ b/chef/lib/chef/provider/package/rubygems.rb
@@ -453,7 +453,11 @@ class Chef
def install_via_gem_command(name, version)
src = @new_resource.source && " --source=#{@new_resource.source} --source=http://rubygems.org"
- shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}", :env=>nil)
+ if version
+ shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}", :env=>nil)
+ else
+ shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri #{src}#{opts}", :env=>nil)
+ end
end
def upgrade_package(name, version)
|
CHEF-<I> - gem version numbers are messy
Now we only provide a version string to our alternative gem binary if
we're actually provided with one. This allows gem_package#action_upgrade
to work in the case where no version is specified.
|
diff --git a/lib/winston-azuretable.js b/lib/winston-azuretable.js
index <HASH>..<HASH> 100644
--- a/lib/winston-azuretable.js
+++ b/lib/winston-azuretable.js
@@ -97,10 +97,11 @@ AzureLogger.prototype.log = function (level, msg, meta, callback) {
if (meta) {
for (var prop in meta) {
+ var propertyName = prop + '_';
if (typeof meta[prop] === 'object') {
- data[prop] = { '_': JSON.stringify(meta[prop]) };
+ data[propertyName] = { '_': JSON.stringify(meta[prop]) };
} else {
- data[prop] = { '_': meta[prop] };
+ data[propertyName] = { '_': meta[prop] };
}
}
}
|
Update winston-azuretable.js
Handle duplicate property names in the entity to be logged.
|
diff --git a/onnxmltools/convert/sparkml/ops_names.py b/onnxmltools/convert/sparkml/ops_names.py
index <HASH>..<HASH> 100644
--- a/onnxmltools/convert/sparkml/ops_names.py
+++ b/onnxmltools/convert/sparkml/ops_names.py
@@ -4,6 +4,7 @@
Mapping and utility functions for Name to Spark ML operators
'''
+from pyspark.ml import Transformer, Estimator
from pyspark.ml.feature import Binarizer
from pyspark.ml.feature import BucketedRandomProjectionLSHModel
from pyspark.ml.feature import Bucketizer
@@ -86,6 +87,12 @@ def get_sparkml_operator_name(model_type):
:param model_type: A spark-ml object (LinearRegression, StringIndexer, ...)
:return: A string which stands for the type of the input model in our conversion framework
'''
+ if not issubclass(model_type, Transformer):
+ if issubclass(model_type, Estimator):
+ raise ValueError("Estimator must be fitted before being converted to ONNX")
+ else:
+ raise ValueError("Unknown model type: {}".format(model_type))
+
if model_type not in sparkml_operator_name_map:
raise ValueError("No proper operator name found for '%s'" % model_type)
return sparkml_operator_name_map[model_type]
|
fix: showing better error message when a model of wrong type is being passed. (#<I>)
|
diff --git a/code/VersionedDataObject.php b/code/VersionedDataObject.php
index <HASH>..<HASH> 100644
--- a/code/VersionedDataObject.php
+++ b/code/VersionedDataObject.php
@@ -143,5 +143,13 @@ class VersionedDataObject extends Versioned
parent::publish($fromStage, $toStage, $createNewVersion);
$this->owner->extend('onAfterVersionedPublish', $fromStage, $toStage, $createNewVersion);
}
+
+ /**
+ * Improves interoperability with other components
+ * @return void
+ */
+ public function doPublish() {
+ $this->publish('Stage','Live');
+ }
}
|
Makes this module work with scheduled publishing
|
diff --git a/server/sonar-web/src/main/js/components/charts/ColorGradientLegend.js b/server/sonar-web/src/main/js/components/charts/ColorGradientLegend.js
index <HASH>..<HASH> 100644
--- a/server/sonar-web/src/main/js/components/charts/ColorGradientLegend.js
+++ b/server/sonar-web/src/main/js/components/charts/ColorGradientLegend.js
@@ -43,13 +43,12 @@ export default function ColorGradientLegend(
width
} /*: Props */
) {
- let colorDomain = colorScale.domain();
- let colorRange = colorScale.range();
- if (direction !== 1) {
- colorDomain = colorDomain.reverse();
- colorRange = colorRange.reverse();
+ const colorRange = colorScale.range();
+ if (direction === 1) {
+ colorRange.reverse();
}
+ const colorDomain = colorScale.domain();
const lastColorIdx = colorRange.length - 1;
const lastDomainIdx = colorDomain.length - 1;
const widthNoPadding = width - padding[1];
|
Fix wrong treemap legend for coverage measure
|
diff --git a/js/huobi.js b/js/huobi.js
index <HASH>..<HASH> 100644
--- a/js/huobi.js
+++ b/js/huobi.js
@@ -1939,7 +1939,7 @@ module.exports = class huobi extends Exchange {
if (limit !== undefined) {
request['size'] = limit; // max 100
}
- const response = await this.privateGetQueryDepositWithdraw (this.extend (request, params));
+ const response = await this.spotPrivateGetV1QueryDepositWithdraw (this.extend (request, params));
// return response
return this.parseTransactions (response['data'], currency, since, limit);
}
@@ -1963,7 +1963,7 @@ module.exports = class huobi extends Exchange {
if (limit !== undefined) {
request['size'] = limit; // max 100
}
- const response = await this.privateGetQueryDepositWithdraw (this.extend (request, params));
+ const response = await this.spotPrivateGetV1QueryDepositWithdraw (this.extend (request, params));
// return response
return this.parseTransactions (response['data'], currency, since, limit);
}
|
huobi fetchDeposits, fetchWithdrawals switched to new endpoint definitions
|
diff --git a/umap/tests/test_parametric_umap.py b/umap/tests/test_parametric_umap.py
index <HASH>..<HASH> 100644
--- a/umap/tests/test_parametric_umap.py
+++ b/umap/tests/test_parametric_umap.py
@@ -93,9 +93,9 @@ def test_save_load():
embedder = ParametricUMAP()
embedding = embedder.fit_transform(X)
- if platform.system() != "Windows":
- # Portable tempfile
- model_path = tempfile.mkdtemp(suffix="_umap_model")
+ # if platform.system() != "Windows":
+ # Portable tempfile
+ model_path = tempfile.mkdtemp(suffix="_umap_model")
- embedder.save(model_path)
- embedder = load_ParametricUMAP(model_path)
+ embedder.save(model_path)
+ embedder = load_ParametricUMAP(model_path)
|
Try restoring save-load test on windows
|
diff --git a/library/CM/Usertext/Filter/MaxLength.php b/library/CM/Usertext/Filter/MaxLength.php
index <HASH>..<HASH> 100644
--- a/library/CM/Usertext/Filter/MaxLength.php
+++ b/library/CM/Usertext/Filter/MaxLength.php
@@ -23,7 +23,7 @@ class CM_Usertext_Filter_MaxLength extends CM_Usertext_Filter_Abstract {
$text = substr($text, 0, $this->_lengthMax);
$lastBlank = strrpos($text, ' ');
if ($lastBlank > 0) {
- $text = substr($text, 0, $lastBlank);
+ $text = substr($text, 0, $lastBlank+1);
}
$text = $text . '…';
}
|
fixed missing space in MaxLength
|
diff --git a/pulsar/client/test/check.py b/pulsar/client/test/check.py
index <HASH>..<HASH> 100644
--- a/pulsar/client/test/check.py
+++ b/pulsar/client/test/check.py
@@ -208,7 +208,10 @@ def run(options):
client_inputs = []
client_inputs.append(ClientInput(temp_input_path, CLIENT_INPUT_PATH_TYPES.INPUT_PATH))
client_inputs.append(ClientInput(temp_input_path, CLIENT_INPUT_PATH_TYPES.INPUT_PATH))
- client_inputs.append(ClientInput(empty_input, CLIENT_INPUT_PATH_TYPES.INPUT_PATH))
+ # Reverting empty input handling added in:
+ # https://github.com/galaxyproject/pulsar/commit/2fb36ba979cf047a595c53cdef833cae79cbb380
+ # Seems like it really should cause a failure.
+ # client_inputs.append(ClientInput(empty_input, CLIENT_INPUT_PATH_TYPES.INPUT_PATH))
client_inputs.append(ClientInput(os.path.join(temp_directory, "dataset_0_files"), CLIENT_INPUT_PATH_TYPES.INPUT_EXTRA_FILES_PATH))
client_inputs.append(ClientInput(temp_input_metadata_path, CLIENT_INPUT_PATH_TYPES.INPUT_METADATA_PATH))
output_files = [
|
Revert empty input testing, it really probably should cause a failure.
|
diff --git a/mythril/laser/ethereum/instructions.py b/mythril/laser/ethereum/instructions.py
index <HASH>..<HASH> 100644
--- a/mythril/laser/ethereum/instructions.py
+++ b/mythril/laser/ethereum/instructions.py
@@ -1004,7 +1004,8 @@ class Instruction:
@StateTransition()
def assert_fail_(self, global_state):
- return []
+ # 0xfe: designated invalid opcode
+ raise InvalidJumpDestination
@StateTransition()
def invalid_(self, global_state):
|
Add assert_fail_ implementation
|
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index <HASH>..<HASH> 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -268,14 +268,14 @@ class BaseTest < ActiveSupport::TestCase
end
test "accessing inline attachments after mail was called works" do
- class LateInlineAttachmentMailer < ActionMailer::Base
+ class LateInlineAttachmentAccessorMailer < ActionMailer::Base
def welcome
mail body: "yay", from: "welcome@example.com", to: "to@example.com"
attachments.inline["invoice.pdf"]
end
end
- assert_nothing_raised { LateInlineAttachmentMailer.welcome.message }
+ assert_nothing_raised { LateInlineAttachmentAccessorMailer.welcome.message }
end
test "adding inline attachments while rendering mail works" do
|
Do not use the same test class in different tests
This fixes the following warnings.
```
actionmailer/test/base_test.rb:<I>: warning: method redefined; discarding old welcome
actionmailer/test/base_test.rb:<I>: warning: previous definition of welcome was here
```
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,10 @@ setup(name='salt',
['init/salt-minion',
'init/salt-master',
]),
+ ('/usr/libexec/salt',
+ ['libexec/clust-up',
+ 'libexec/clust-down',
+ ]),
],
)
|
Add libexec scripts to the package
|
diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
index <HASH>..<HASH> 100644
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/DefaultController.php
@@ -415,7 +415,7 @@ class DefaultController extends Base
* Form validation for edit/create
* @return bool
*/
- private function runFormValidation()
+ protected function runFormValidation()
{
$oFormValidation = Factory::service('FormValidation');
$aRulesFormValidation = [];
@@ -440,7 +440,7 @@ class DefaultController extends Base
* @param \stdClass $oItem The main item object
* @return void
*/
- private function loadEditViewData($oItem = null)
+ protected function loadEditViewData($oItem = null)
{
$this->data['item'] = $oItem;
}
@@ -451,7 +451,7 @@ class DefaultController extends Base
* Extract data from post variable
* @return array
*/
- private function getPostObject()
+ protected function getPostObject()
{
$oInput = Factory::service('Input');
$aOut = [];
|
Changing visibility of methods in DefaultController to allow for overriding.
|
diff --git a/scss/__init__.py b/scss/__init__.py
index <HASH>..<HASH> 100644
--- a/scss/__init__.py
+++ b/scss/__init__.py
@@ -81,7 +81,11 @@ locate_blocks = None
try:
from scss._speedups import locate_blocks
except ImportError:
- sys.stderr.write("Scanning acceleration disabled (_speedups not found)!\n")
+ import warnings
+ warnings.warn(
+ "Scanning acceleration disabled (_speedups not found)!",
+ RuntimeWarning
+ )
from scss._native import locate_blocks
################################################################################
|
scss/__init__.py: raise RuntimeWarning instead of writing to sys.stderr when _speedups is not found
|
diff --git a/dask_ml/cluster/k_means.py b/dask_ml/cluster/k_means.py
index <HASH>..<HASH> 100644
--- a/dask_ml/cluster/k_means.py
+++ b/dask_ml/cluster/k_means.py
@@ -447,7 +447,9 @@ def init_scalable(
# to do that.
if len(centers) < n_clusters:
- logger.warning("Found fewer than %d clusters in init.", n_clusters)
+ logger.warning(
+ "Found fewer than %d clusters in init (found %d).", n_clusters, len(centers)
+ )
# supplement with random
need = n_clusters - len(centers)
locs = sorted(
|
Log amount of found clusters in kmeans init (#<I>)
* Log amount of found clusters in kmeans init
|
diff --git a/lib/Doctrine/ODM/PHPCR/Proxy/ProxyFactory.php b/lib/Doctrine/ODM/PHPCR/Proxy/ProxyFactory.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/ODM/PHPCR/Proxy/ProxyFactory.php
+++ b/lib/Doctrine/ODM/PHPCR/Proxy/ProxyFactory.php
@@ -208,6 +208,8 @@ class ProxyFactory
$attributes[] = $field["fieldName"];
}
+ $attributes[] = $class->identifier;
+
return $attributes;
}
|
fix handling of identifier when handling class properties in proxies
|
diff --git a/Drop-In/src/androidTest/java/com/braintreepayments/api/dropin/CreatePaymentMethodTest.java b/Drop-In/src/androidTest/java/com/braintreepayments/api/dropin/CreatePaymentMethodTest.java
index <HASH>..<HASH> 100644
--- a/Drop-In/src/androidTest/java/com/braintreepayments/api/dropin/CreatePaymentMethodTest.java
+++ b/Drop-In/src/androidTest/java/com/braintreepayments/api/dropin/CreatePaymentMethodTest.java
@@ -468,7 +468,7 @@ public class CreatePaymentMethodTest extends BraintreePaymentActivityTestCase {
waitForPaymentMethodList();
onView(withId(R.id.bt_payment_method_description)).check(
- matches(withText("bt_buyer_us@paypal.com")));
+ matches(withText("jane.doe@example.com")));
onView(withId(R.id.bt_select_payment_method_submit_button)).perform(click());
waitForActivity(activity);
|
Fix PayPal test due to test data change
|
diff --git a/test/morph-stream.js b/test/morph-stream.js
index <HASH>..<HASH> 100644
--- a/test/morph-stream.js
+++ b/test/morph-stream.js
@@ -37,6 +37,16 @@ test('morph promise into stream', assert => {
}))
})
+test('morph stream resolved by a promise', assert => {
+ assert.plan(1)
+ morph(new Promise(resolve => {
+ resolve(stream())
+ })).pipe(concat(data => {
+ assert.equal(data.toString(), 'hello')
+ }))
+})
+
+
test('should pass error to stream when promise throw an error', assert => {
assert.plan(1)
morph(new Promise((resolve, reject) => {
|
Should pipe stream returned by a promise
|
diff --git a/tinytag/tinytag.py b/tinytag/tinytag.py
index <HASH>..<HASH> 100644
--- a/tinytag/tinytag.py
+++ b/tinytag/tinytag.py
@@ -24,6 +24,7 @@
#
import codecs
+import re
import struct
import os
import io
@@ -367,7 +368,7 @@ class ID3(TinyTag):
extended = (header[3] & 0x40) > 0
experimental = (header[3] & 0x20) > 0
footer = (header[3] & 0x10) > 0
- size = self._calc_size(header[4:9], 7)
+ size = self._calc_size(header[4:8], 7)
self._bytepos_after_id3v2 = size
parsed_size = 0
if extended: # just read over the extended header.
@@ -407,6 +408,9 @@ class ID3(TinyTag):
return 0
frame = struct.unpack(binformat, frame_header_data)
frame_id = self._decode_string(frame[0])
+ # Stop parsing the frame if an invalid frame ID is found
+ if not re.match(r'[A-Z0-9]{3,4}', frame_id):
+ return 0
frame_size = self._calc_size(frame[1:1+frame_size_bytes], bits_per_byte)
if frame_size > 0:
|
Fix MemoryError when parsing corrupted frame data
-Frame ID is validated before trying to read its content
|
diff --git a/chef/lib/chef/application.rb b/chef/lib/chef/application.rb
index <HASH>..<HASH> 100644
--- a/chef/lib/chef/application.rb
+++ b/chef/lib/chef/application.rb
@@ -15,6 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+require 'socket'
require 'chef/config'
require 'chef/exceptions'
require 'chef/log'
|
Chef::Application references constants from socket
fixes undefined constant error when config file is missing
|
diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php
index <HASH>..<HASH> 100644
--- a/src/Composer/Util/RemoteFilesystem.php
+++ b/src/Composer/Util/RemoteFilesystem.php
@@ -141,7 +141,7 @@ class RemoteFilesystem
}
if ($this->progress) {
- $this->io->write('');
+ $this->io->overwrite(" Downloading: <comment>100%</comment>");
}
if (false === $this->result) {
|
Fix progress display getting stuck at <I>%
|
diff --git a/lib/routes/google.js b/lib/routes/google.js
index <HASH>..<HASH> 100644
--- a/lib/routes/google.js
+++ b/lib/routes/google.js
@@ -7,7 +7,7 @@ module.exports = function(app){
var google = {},
grasshopper = require('grasshopper-core'),
config = require('../config'),
- redirectUrl = config.identities.google.redirectUrl;
+ redirectUrl = config.identities.google.redirectUrl || 'defaultRoute';
/**
* Method will accept the oauth callback from google, run authentication, then redirect the user to the page that accepts the token.
|
Putting a default redirect url into the google auth rout so all will be chill.
|
diff --git a/Imagine/Cache/Resolver/WebPathResolver.php b/Imagine/Cache/Resolver/WebPathResolver.php
index <HASH>..<HASH> 100644
--- a/Imagine/Cache/Resolver/WebPathResolver.php
+++ b/Imagine/Cache/Resolver/WebPathResolver.php
@@ -117,7 +117,7 @@ class WebPathResolver implements ResolverInterface
*/
protected function getFileUrl($path, $filter)
{
- return $this->cachePrefix.'/'.$filter.'/'.$path;
+ return $this->cachePrefix.'/'.$filter.'/'.ltrim($path, '/');
}
/**
|
Fix of #<I> (Trim of forwarding slash in path)
|
diff --git a/resources/route53-health-checks.go b/resources/route53-health-checks.go
index <HASH>..<HASH> 100644
--- a/resources/route53-health-checks.go
+++ b/resources/route53-health-checks.go
@@ -2,10 +2,11 @@ package resources
import (
"fmt"
+
+ "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/rebuy-de/aws-nuke/pkg/types"
- "github.com/aws/aws-sdk-go/aws"
)
func init() {
@@ -17,7 +18,6 @@ func ListRoute53HealthChecks(sess *session.Session) ([]Resource, error) {
params := &route53.ListHealthChecksInput{}
resources := make([]Resource, 0)
-
for {
resp, err := svc.ListHealthChecks(params)
if err != nil {
@@ -30,7 +30,7 @@ func ListRoute53HealthChecks(sess *session.Session) ([]Resource, error) {
id: check.Id,
})
}
- if aws.BoolValue(resp.IsTruncated) != false {
+ if aws.BoolValue(resp.IsTruncated) == false {
break
}
params.Marker = resp.NextMarker
|
fix Route<I>HealthCheck loop (#<I>)
|
diff --git a/state/metrics.go b/state/metrics.go
index <HASH>..<HASH> 100644
--- a/state/metrics.go
+++ b/state/metrics.go
@@ -146,7 +146,7 @@ func (m *MetricBatch) UUID() string {
return m.doc.UUID
}
-// EnvUUID returns the environment uuid this metric applies to.
+// EnvUUID returns the environment UUID this metric applies to.
func (m *MetricBatch) EnvUUID() string {
return m.doc.EnvUUID
}
|
uuid -> UUID
|
diff --git a/yfi/yql.py b/yfi/yql.py
index <HASH>..<HASH> 100644
--- a/yfi/yql.py
+++ b/yfi/yql.py
@@ -88,7 +88,7 @@ class Yql:
though"""
return self.compiled_str
- def get(self):
+ def run(self):
"""Execute the query inside of self.compiled_str. This method returns a JSON
object for easy manipulation unless another format is specified"""
self.compile()
|
Changed exec to run to eliminate shadowing
|
diff --git a/tests/const.py b/tests/const.py
index <HASH>..<HASH> 100644
--- a/tests/const.py
+++ b/tests/const.py
@@ -7,7 +7,7 @@
# Requirements:
# - Must contain /bin/bash (TestMain::test_*shell_override*)
#
-DOCKER_IMAGE = 'debian:8.2'
+DOCKER_IMAGE = 'debian:10'
# Alternate Docker image
# This image is used for alternate tests (e.g. pulling) and should be small.
|
test: Update DOCKER_IMAGE to debian:<I>
Rationale:
- debian:<I> is old
- debian:<I> uses a v1 schema manifest
- debian:<I> is cached in Ubuntu:<I> GitHub actions image:
<URL>
|
diff --git a/lib/wiselinks/headers.rb b/lib/wiselinks/headers.rb
index <HASH>..<HASH> 100644
--- a/lib/wiselinks/headers.rb
+++ b/lib/wiselinks/headers.rb
@@ -12,7 +12,10 @@ module Wiselinks
end
def render(options = {}, *args, &block)
- if self.request.wiselinks?
+ if self.request.wiselinks?
+ response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
+ response.headers['Pragma'] = 'no-cache'
+
if self.request.wiselinks_partial?
Wiselinks.log("processing partial request")
options[:partial] ||= action_name
|
Added headers to prevent caching in Chrome
|
diff --git a/src/toil/jobStores/aws/jobStore.py b/src/toil/jobStores/aws/jobStore.py
index <HASH>..<HASH> 100644
--- a/src/toil/jobStores/aws/jobStore.py
+++ b/src/toil/jobStores/aws/jobStore.py
@@ -778,7 +778,10 @@ class AWSJobStore(AbstractJobStore):
retry timeout expires.
"""
log.debug("Binding to job store domain '%s'.", domain_name)
- for attempt in retry_sdb(predicate=lambda e: no_such_sdb_domain(e) or sdb_unavailable(e)):
+ retryargs = dict(predicate=lambda e: no_such_sdb_domain(e) or sdb_unavailable(e))
+ if not block:
+ retryargs['timeout'] = 15
+ for attempt in retry_sdb(**retryargs):
with attempt:
try:
return self.db.get_domain(domain_name)
|
Lower timeout for domain binding in Toil Clean (resolves #<I>)
|
diff --git a/contrib/externs/angular-1.5.js b/contrib/externs/angular-1.5.js
index <HASH>..<HASH> 100644
--- a/contrib/externs/angular-1.5.js
+++ b/contrib/externs/angular-1.5.js
@@ -452,7 +452,7 @@ angular.LinkingFunctions.post = function(scope, iElement, iAttrs, controller) {
* function(!angular.JQLite=,!angular.Attributes=)|
* undefined),
* terminal: (boolean|undefined),
- * transclude: (boolean|string|undefined)
+ * transclude: (boolean|string|!Object.<string, string>|undefined)
* }}
*/
angular.Directive;
|
Add !Object<string,string> as a possible type for the transclude field of angular.Directive
-------------
Created by MOE: <URL>
|
diff --git a/lib/jekyll/admin/static_server.rb b/lib/jekyll/admin/static_server.rb
index <HASH>..<HASH> 100644
--- a/lib/jekyll/admin/static_server.rb
+++ b/lib/jekyll/admin/static_server.rb
@@ -3,8 +3,8 @@ module Jekyll
class StaticServer < Sinatra::Base
set :public_dir, File.expand_path("./public/dist", File.dirname(__FILE__))
- # Allow `/admin` and `/admin/` to serve `/public/dist/index.html`
- get "/" do
+ # Allow `/admin` and `/admin/`, and `/admin/*` to serve `/public/dist/index.html`
+ get "/*" do
send_file index_path
end
diff --git a/spec/static_server_spec.rb b/spec/static_server_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/static_server_spec.rb
+++ b/spec/static_server_spec.rb
@@ -10,4 +10,10 @@ describe Jekyll::Admin::StaticServer do
expect(last_response).to be_ok
expect(last_response.body).to match(/<body>/)
end
+
+ it "returns the index for non-existent paths" do
+ get '/collections'
+ expect(last_response).to be_ok
+ expect(last_response.body).to match(/<body>/)
+ end
end
|
always return the index for any non-asset path
|
diff --git a/NavigationGlimpse/navigation.glimpse.js b/NavigationGlimpse/navigation.glimpse.js
index <HASH>..<HASH> 100644
--- a/NavigationGlimpse/navigation.glimpse.js
+++ b/NavigationGlimpse/navigation.glimpse.js
@@ -160,15 +160,15 @@
context.fillText(state.navigationLinks.length + linkText, state.x + 5, state.y + 12);
}
context.textAlign = 'right';
+ var text = null;
if (state.current)
- context.fillText('current', state.x + state.w - 5, state.y + 12);
- if (state.previous) {
- var previousText = state.back ? 'previous & back' : 'previous';
- context.fillText(previousText, state.x + state.w - 5, state.y + 12);
- } else {
- if (state.back)
- context.fillText('back ' + state.back, state.x + state.w - 5, state.y + 12);
- }
+ text = !state.previous ? 'current' : 'previous & current';
+ if (state.back)
+ text = !state.previous ? 'back ' + state.back : 'previous & back';
+ if (!text && state.previous)
+ text = 'previous';
+ if (text)
+ context.fillText(text, state.x + state.w - 5, state.y + 12);
}
},
processSelectedState = function (elements, state) {
|
Not only can it be previous & back but it can be previous & current (after a refresh).
|
diff --git a/tests/test_bitstruct.py b/tests/test_bitstruct.py
index <HASH>..<HASH> 100644
--- a/tests/test_bitstruct.py
+++ b/tests/test_bitstruct.py
@@ -713,6 +713,13 @@ class BitStructTest(unittest.TestCase):
self.assertEqual(str(cm.exception),
"'fam' not found in data dictionary")
+ with self.assertRaises(Error) as cm:
+ data = bytearray(3)
+ pack_into_dict(fmt, names, data, 0, unpacked)
+
+ self.assertEqual(str(cm.exception),
+ "'fam' not found in data dictionary")
+
def test_compile_pack_unpack_formats(self):
fmts = [
('u1s2p3', None, (1, -1)),
|
Test of pack_into_dict with missing value.
|
diff --git a/cors_test.go b/cors_test.go
index <HASH>..<HASH> 100644
--- a/cors_test.go
+++ b/cors_test.go
@@ -68,7 +68,7 @@ func Test_OtherHeaders(t *testing.T) {
AllowCredentials: true,
AllowMethods: []string{"PATCH", "GET"},
AllowHeaders: []string{"Origin", "X-whatever"},
- ExposeHeaders: []string{"Content-Length"},
+ ExposeHeaders: []string{"Content-Length", "Hello"},
MaxAge: 5 * time.Minute,
}))
@@ -93,8 +93,8 @@ func Test_OtherHeaders(t *testing.T) {
t.Errorf("Allow-Headers is expected to be Origin,X-whatever; found %v", headersVal)
}
- if exposedHeadersVal != "Content-Length" {
- t.Errorf("Expose-Headers are expected to be Content-Length, found %v", exposedHeadersVal)
+ if exposedHeadersVal != "Content-Length,Hello" {
+ t.Errorf("Expose-Headers are expected to be Content-Length,Hello. Found %v", exposedHeadersVal)
}
if maxAgeVal != "300" {
|
-n [Migrated]
Testing multiple expose headers.
|
diff --git a/tools/run_tests/xds_k8s_test_driver/tests/baseline_test.py b/tools/run_tests/xds_k8s_test_driver/tests/baseline_test.py
index <HASH>..<HASH> 100644
--- a/tools/run_tests/xds_k8s_test_driver/tests/baseline_test.py
+++ b/tools/run_tests/xds_k8s_test_driver/tests/baseline_test.py
@@ -44,16 +44,14 @@ class BaselineTest(xds_k8s_testcase.RegularXdsKubernetesTestCase):
with self.subTest('4_create_forwarding_rule'):
self.td.create_forwarding_rule(self.server_xds_port)
- test_servers: _XdsTestServer
with self.subTest('5_start_test_server'):
- test_servers = self.startTestServers()
+ test_server: _XdsTestServer = self.startTestServers()[0]
with self.subTest('6_add_server_backends_to_backend_service'):
self.setupServerBackends()
- test_client: _XdsTestClient
with self.subTest('7_start_test_client'):
- test_client = self.startTestClient(test_servers[0])
+ test_client: _XdsTestClient = self.startTestClient(test_server)
with self.subTest('8_test_client_xds_config_exists'):
self.assertXdsConfigExists(test_client)
|
xds-k8s: Fix incorrect type hint in the baseline test (#<I>)
|
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index <HASH>..<HASH> 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -36,7 +36,7 @@
, transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd'
, 'MozTransition' : 'transitionend'
- , 'OTransition' : 'otransitionend'
+ , 'OTransition' : 'oTransitionEnd otransitionend'
, 'msTransition' : 'MSTransitionEnd'
, 'transition' : 'transitionend'
}
|
Fix transition end name for opera <I>
Fix transition end name for Opera <I> and Opera <I>.
Should fix issues: #<I>, #<I>, #<I>, #<I>
|
diff --git a/remoteservice/wit.go b/remoteservice/wit.go
index <HASH>..<HASH> 100644
--- a/remoteservice/wit.go
+++ b/remoteservice/wit.go
@@ -160,8 +160,7 @@ func (r *RemoteWITServiceCaller) GetWITUser(ctx context.Context, req *goa.Reques
}
identity = &account.Identity{
- ProfileURL: witServiceUser.Data.Attributes.URL,
- UserID: account.NullUUID{UUID: user.ID, Valid: true},
+ UserID: account.NullUUID{UUID: user.ID, Valid: true},
}
if witServiceUser.Data.Attributes.IdentityID != nil {
|
Don't fetch profileURL from WIT (#<I>)
|
diff --git a/pysd/py_backend/vensim/vensim2py.py b/pysd/py_backend/vensim/vensim2py.py
index <HASH>..<HASH> 100644
--- a/pysd/py_backend/vensim/vensim2py.py
+++ b/pysd/py_backend/vensim/vensim2py.py
@@ -276,7 +276,7 @@ def get_equation_components(equation_str, root_path=None):
name = basic_id / escape_group
literal_subscript = subscript _ ("," _ subscript _)*
- imported_subscript = func _ "(" _ (string _ ","? _)* ")"
+ imported_subscript = imp_subs_func _ "(" _ (string _ ","? _)* ")"
numeric_range = _ (range / value) _ ("," _ (range / value) _)*
value = _ sequence_id _
range = "(" _ sequence_id _ "-" _ sequence_id _ ")"
@@ -594,10 +594,7 @@ functions = {
"original_name": "INVERT MATRIX"},
"get time value": {"name": "not_implemented_function",
"module": "functions",
- "original_name": "GET TIME VALUE"},
- "sample if true": {"name": "not_implemented_function",
- "module": "functions",
- "original_name": "SAMPLE IF TRUE"}
+ "original_name": "GET TIME VALUE"}
}
# list of fuctions that accept a dimension to apply over
|
The conflict merged and tests bugs fixed
|
diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php
index <HASH>..<HASH> 100644
--- a/code/Control/UserDefinedFormController.php
+++ b/code/Control/UserDefinedFormController.php
@@ -323,7 +323,7 @@ JS
// Merge fields are used for CMS authors to reference specific form fields in email content
$mergeFields = $this->getMergeFieldsMap($emailData['Fields']);
- if ($attachments) {
+ if ($attachments && (bool) $recipient->HideFormData === false) {
foreach ($attachments as $file) {
/** @var File $file */
if ((int) $file->ID === 0) {
|
Only add attachments when HideFormData-setting is not set for this recipient
|
diff --git a/packages/neos-ui/src/Containers/ContentCanvas/index.js b/packages/neos-ui/src/Containers/ContentCanvas/index.js
index <HASH>..<HASH> 100644
--- a/packages/neos-ui/src/Containers/ContentCanvas/index.js
+++ b/packages/neos-ui/src/Containers/ContentCanvas/index.js
@@ -106,10 +106,10 @@ export default class ContentCanvas extends PureComponent {
canvasContentOnlyStyle.overflow = 'auto';
}
- if (backgroundColor && !currentEditPreviewModeConfiguration.backgroundColor) {
- canvasContentStyle.background = backgroundColor;
- } else if (currentEditPreviewModeConfiguration.backgroundColor) {
+ if (currentEditPreviewModeConfiguration.backgroundColor) {
canvasContentStyle.background = currentEditPreviewModeConfiguration.backgroundColor;
+ } else if (backgroundColor) {
+ canvasContentStyle.background = backgroundColor;
}
// ToDo: Is the `[data-__neos__hook]` attr used?
|
TASK: Reduce logical complexity
by changing the order of the if statements
|
diff --git a/api-spec-testing/rspec_matchers.rb b/api-spec-testing/rspec_matchers.rb
index <HASH>..<HASH> 100644
--- a/api-spec-testing/rspec_matchers.rb
+++ b/api-spec-testing/rspec_matchers.rb
@@ -229,6 +229,11 @@ RSpec::Matchers.define :match_response do |pairs, test|
# match: {task: '/.+:\d+/'}
if expected[0] == "/" && expected[-1] == "/"
/#{expected.tr("/", "")}/ =~ actual_value
+ elsif !!(expected.match?(/[0-9]{1}\.[0-9]+E[0-9]+/))
+ # When the value in the yaml test is a big number, the format is
+ # different from what Ruby uses, so we transform X.XXXXEXX to X.XXXXXe+XX
+ # to be able to compare the values
+ actual_value.to_s == expected.gsub('E', 'e+')
elsif expected == ''
actual_value == response
else
|
[API] Updates rspec matchers in YAML test runners to be able to compare big numbers
|
diff --git a/treetime/treetime.py b/treetime/treetime.py
index <HASH>..<HASH> 100644
--- a/treetime/treetime.py
+++ b/treetime/treetime.py
@@ -27,8 +27,8 @@ class TreeTime(ClockTree):
# initially, infer ancestral sequences and infer gtr model if desired
if use_input_branch_length:
- self.infer_ancestral_sequences(infer_gtr=infer_gtr,
- prune_short=True, **seq_kwargs)
+ self.infer_ancestral_sequences(infer_gtr=infer_gtr, **seq_kwargs)
+ self.prune_short_branches()
else:
self.optimize_sequences_and_branch_length(infer_gtr=infer_gtr,
max_iter=2, prune_short=True, **seq_kwargs)
@@ -46,7 +46,7 @@ class TreeTime(ClockTree):
self.reroot(root=root)
if use_input_branch_length:
- self.infer_ancestral_sequences(prune_short=False, **seq_kwargs)
+ self.infer_ancestral_sequences(**seq_kwargs)
else:
self.optimize_sequences_and_branch_length(max_iter=2,**seq_kwargs)
|
prune short branches even when not optizing branch length
|
diff --git a/afkak/test/test_brokerclient.py b/afkak/test/test_brokerclient.py
index <HASH>..<HASH> 100644
--- a/afkak/test/test_brokerclient.py
+++ b/afkak/test/test_brokerclient.py
@@ -365,6 +365,12 @@ class KafkaBrokerClientTestCase(unittest.TestCase):
c.connector.factory = c # MemoryReactor doesn't make this connection.
def test_delay_reset(self):
+ """test_delay_reset
+ Test that reconnect delay is handled correctly:
+ 1) That initializer values are respected
+ 2) That delay maximum is respected
+ 3) That delay is reset to initial delay on successful connection
+ """
init_delay = last_delay = 0.025
max_delay = 14
reactor = MemoryReactorClock()
|
Add docstring comment to new test as requested by review.
|
diff --git a/lib/geocoder/lookups/yandex.rb b/lib/geocoder/lookups/yandex.rb
index <HASH>..<HASH> 100644
--- a/lib/geocoder/lookups/yandex.rb
+++ b/lib/geocoder/lookups/yandex.rb
@@ -18,6 +18,7 @@ module Geocoder::Lookup
end
def query_url(query, reverse = false)
+ query = query.split(",").reverse.join(",") if reverse
params = {
:geocode => query,
:format => "json",
diff --git a/lib/geocoder/results/yandex.rb b/lib/geocoder/results/yandex.rb
index <HASH>..<HASH> 100644
--- a/lib/geocoder/results/yandex.rb
+++ b/lib/geocoder/results/yandex.rb
@@ -4,7 +4,7 @@ module Geocoder::Result
class Yandex < Base
def coordinates
- @data['GeoObject']['Point']['pos'].split(' ').map(&:to_f)
+ @data['GeoObject']['Point']['pos'].split(' ').reverse.map(&:to_f)
end
def address(format = :full)
|
Reverse coordinate order for Yandex.
On input and output (expects/returns lon,lat instead of lat,lon).
|
diff --git a/lib/providers/index.js b/lib/providers/index.js
index <HASH>..<HASH> 100644
--- a/lib/providers/index.js
+++ b/lib/providers/index.js
@@ -119,6 +119,38 @@ module.exports = {
* OAuth 2.0 Providers
*/
+
+ '37signals': {
+ id: '37signals',
+ name: '37signals',
+ protocol: 'OAuth 2.0',
+ url: '',
+ redirect_uri: config.issuer + '/connect/37signals/callback',
+ endpoints: {
+ authorize: {
+ url: 'https://launchpad.37signals.com/authorization/new',
+ method: 'POST'
+ },
+ token: {
+ url: 'https://launchpad.37signals.com/authorization/token',
+ method: 'POST',
+ auth: 'client_secret_basic'
+ },
+ user: {
+ url: 'https://launchpad.37signals.com/authorization.json',
+ method: 'GET',
+ auth: {
+ header: 'Authorization',
+ scheme: 'Bearer'
+ }
+ }
+ },
+ mapping: {
+
+ }
+ },
+
+
angellist: {
id: 'angellist',
name: 'angellist',
|
Draft <I>signals OAuth <I> provider integration
|
diff --git a/webmentiontools/send.py b/webmentiontools/send.py
index <HASH>..<HASH> 100644
--- a/webmentiontools/send.py
+++ b/webmentiontools/send.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+import itertools
import urlparse
import re
import requests
@@ -50,11 +51,10 @@ class WebmentionSend():
html = r.text
soup = BeautifulSoup(html)
tag = None
- for name in 'link', 'a':
- for rel in 'webmention', 'http://webmention.org/':
- tag = soup.find(name, attrs={'rel': rel})
- if tag:
- break
+ for name, rel in itertools.product(('link', 'a'), ('webmention', 'http://webmention.org/')):
+ tag = soup.find(name, attrs={'rel': rel})
+ if tag:
+ break
if tag and tag.get('href'):
# add the base scheme and host to relative endpoints
|
fix bug introduced by f<I>a<I>f3a<I>cba<I>af<I>d0cd<I>
break only breaks out of one loop :P
|
diff --git a/src/specs/index.js b/src/specs/index.js
index <HASH>..<HASH> 100644
--- a/src/specs/index.js
+++ b/src/specs/index.js
@@ -6,7 +6,7 @@ describe('ui-harness', function() {
require('./it-server.spec');
require('./PropTypes.spec');
require('./page.spec');
- require('./typescript.spec.tsx')
+ require('./typescript.spec')
});
// External libs.
|
Remove .tsx extension from specs/index.js
|
diff --git a/lib/active_scaffold/actions/batch_destroy.rb b/lib/active_scaffold/actions/batch_destroy.rb
index <HASH>..<HASH> 100644
--- a/lib/active_scaffold/actions/batch_destroy.rb
+++ b/lib/active_scaffold/actions/batch_destroy.rb
@@ -19,7 +19,8 @@ module ActiveScaffold::Actions
end
when :delete_all then
do_search if respond_to? :do_search
- active_scaffold_config.model.delete_all(all_conditions)
+ # dummy condition cause we have to call delete_all on relation not on association
+ beginning_of_chain.where('1=1').delete_all(all_conditions)
else
Rails.logger.error("Unknown process_mode: #{active_scaffold_config.batch_destroy.process_mode} for action batch_destroy")
end
|
Bugfix: using delete_all process mode in nested_scope destroy all model
records instead of just the one for the nesting (issue 1 by jsurrett)
|
diff --git a/lib/ruote/worker.rb b/lib/ruote/worker.rb
index <HASH>..<HASH> 100644
--- a/lib/ruote/worker.rb
+++ b/lib/ruote/worker.rb
@@ -102,6 +102,8 @@ module Ruote
@state = 'running'
@run_thread = Thread.new { run }
+
+ @run_thread['worker'] = self
@run_thread['worker_name'] = @name
end
|
place link to worker in its @run_thread['worker']
|
diff --git a/src/ClientEngine.js b/src/ClientEngine.js
index <HASH>..<HASH> 100644
--- a/src/ClientEngine.js
+++ b/src/ClientEngine.js
@@ -50,7 +50,6 @@ export default class ClientEngine {
healthCheckRTTSample: 10,
stepPeriod: 1000 / GAME_UPS,
scheduler: 'fixed',
- clientIDSpace: 1000000, //todo add docs
}, inputOptions);
/**
|
remove clientIDSpace from clientEngine.. this needs a more robust solution
|
diff --git a/azurerm/internal/services/costmanagement/cost_management_export_resource_group_resource_test.go b/azurerm/internal/services/costmanagement/cost_management_export_resource_group_resource_test.go
index <HASH>..<HASH> 100644
--- a/azurerm/internal/services/costmanagement/cost_management_export_resource_group_resource_test.go
+++ b/azurerm/internal/services/costmanagement/cost_management_export_resource_group_resource_test.go
@@ -1,9 +1,8 @@
package costmanagement_test
import (
- `context`
+ "context"
"fmt"
- "net/http"
"testing"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
|
make fmt and fix tests
|
diff --git a/src/main/java/com/googlecode/lanterna/gui2/LayoutManager.java b/src/main/java/com/googlecode/lanterna/gui2/LayoutManager.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/LayoutManager.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/LayoutManager.java
@@ -39,5 +39,6 @@ public interface LayoutManager {
TerminalPosition getTopLeftCorner();
TerminalSize getSize();
Component getComponent();
+ boolean isVisible();
}
}
|
Changing the interface of LayoutManager
|
diff --git a/vendor/plugins/refinery_settings/app/models/refinery_setting.rb b/vendor/plugins/refinery_settings/app/models/refinery_setting.rb
index <HASH>..<HASH> 100644
--- a/vendor/plugins/refinery_settings/app/models/refinery_setting.rb
+++ b/vendor/plugins/refinery_settings/app/models/refinery_setting.rb
@@ -59,7 +59,7 @@ class RefinerySetting < ActiveRecord::Base
if self.column_names.include?('scoping')
setting = find_or_create_by_name_and_scoping(:name => name.to_s, :value => the_value, :scoping => scoping, :restricted => restricted)
else
- setting = find_or_create_by_name(:name => name.to_s, :value => the_value, :required => restricted)
+ setting = find_or_create_by_name(:name => name.to_s, :value => the_value, :restricted => restricted)
end
# cache whatever we found including its scope in the name, even if it's nil.
|
At this point, things are getting out of hand.
|
diff --git a/lib/Studio.js b/lib/Studio.js
index <HASH>..<HASH> 100644
--- a/lib/Studio.js
+++ b/lib/Studio.js
@@ -306,8 +306,12 @@ module.exports = function(controller) {
if(options.execute){
var script = options.execute.script;
var thread = options.execute.thread;
- controller.studio.run(bot, script, convo.source_message.user, convo.source_message.channel, convo.original_message).then(function(new_convo){
+ controller.studio.get(bot, script, convo.source_message.user, convo.source_message.channel, convo.source_message).then(function(new_convo){
convo.stop('transitioning to ', script);
+ // new_convo.transcript = convo.transcript;
+ new_convo.responses = convo.responses;
+ new_convo.vars = convo.vars;
+ new_convo.activate();
new_convo.gotoThread(thread);
})
}
|
new convo getting vars and responses from old convo
|
diff --git a/src/pymlab/sensors/atmega.py b/src/pymlab/sensors/atmega.py
index <HASH>..<HASH> 100755
--- a/src/pymlab/sensors/atmega.py
+++ b/src/pymlab/sensors/atmega.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-import smbus
+#import smbus
import time
from pymlab.sensors import Device
diff --git a/src/pymlab/sensors/i2chub.py b/src/pymlab/sensors/i2chub.py
index <HASH>..<HASH> 100755
--- a/src/pymlab/sensors/i2chub.py
+++ b/src/pymlab/sensors/i2chub.py
@@ -3,7 +3,7 @@
import logging
-import smbus
+#import smbus
from pymlab.sensors import Device, SimpleBus
diff --git a/src/pymlab/sensors/sht25.py b/src/pymlab/sensors/sht25.py
index <HASH>..<HASH> 100755
--- a/src/pymlab/sensors/sht25.py
+++ b/src/pymlab/sensors/sht25.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-import smbus
+#import smbus
import time
from pymlab.sensors import Device
|
Remove unused smbus imports from some modules.
|
diff --git a/DependencyInjection/ClientFactory.php b/DependencyInjection/ClientFactory.php
index <HASH>..<HASH> 100644
--- a/DependencyInjection/ClientFactory.php
+++ b/DependencyInjection/ClientFactory.php
@@ -395,7 +395,15 @@ class ClientFactory
return ['id' => $user->getUserIdentifier()];
}
- return ['id' => $user->getUsername()];
+ // Symfony 5.4 and below use 'getUsername' ('getUserIdentifier'
+ // wasn't added to the interface until Symfony 6.0 for BC)
+ if (method_exists(UserInterface::class, 'getUsername')) {
+ return ['id' => $user->getUsername()];
+ }
+
+ // if neither method exists then we don't know how to deal with
+ // this version of Symfony's UserInterface, so can't get an ID
+ return;
}
return ['id' => (string) $user];
|
Guard against future changes to UserInterface
|
diff --git a/org.carewebframework.testharness.webapp/src/main/java/org/carewebframework/testharness/security/impl/MockAuthenticationProvider.java b/org.carewebframework.testharness.webapp/src/main/java/org/carewebframework/testharness/security/impl/MockAuthenticationProvider.java
index <HASH>..<HASH> 100644
--- a/org.carewebframework.testharness.webapp/src/main/java/org/carewebframework/testharness/security/impl/MockAuthenticationProvider.java
+++ b/org.carewebframework.testharness.webapp/src/main/java/org/carewebframework/testharness/security/impl/MockAuthenticationProvider.java
@@ -17,6 +17,7 @@ import org.carewebframework.api.domain.EntityIdentifier;
import org.carewebframework.api.domain.IInstitution;
import org.carewebframework.api.domain.IUser;
import org.carewebframework.api.property.PropertyUtil;
+import org.carewebframework.common.StrUtil;
import org.carewebframework.security.spring.AbstractAuthenticationProvider;
import org.carewebframework.security.spring.CWFAuthenticationDetails;
@@ -147,7 +148,7 @@ public class MockAuthenticationProvider extends AbstractAuthenticationProvider {
@Override
protected List<String> getAuthorities(IUser user) {
- return user == null ? null : PropertyUtil.getValues("mock.authorities", null);
+ return user == null ? null : StrUtil.toList(PropertyUtil.getValue("mock.authorities", null), ",");
}
}
|
Allow comma delimiter for mock authorities.
|
diff --git a/src/main/org/openscience/cdk/io/iterator/IteratingMDLReader.java b/src/main/org/openscience/cdk/io/iterator/IteratingMDLReader.java
index <HASH>..<HASH> 100644
--- a/src/main/org/openscience/cdk/io/iterator/IteratingMDLReader.java
+++ b/src/main/org/openscience/cdk/io/iterator/IteratingMDLReader.java
@@ -156,6 +156,8 @@ public class IteratingMDLReader extends DefaultIteratingChemObjectReader impleme
logger.debug("MDL file part read: ", buffer);
ISimpleChemObjectReader reader = factory.createReader(currentFormat);
reader.setReader(new StringReader(buffer.toString()));
+ reader.setErrorHandler(this.errorHandler);
+ reader.setReaderMode(this.mode);
if (currentFormat instanceof MDLV2000Format) {
reader.addChemObjectIOListener(this);
((MDLV2000Reader)reader).customizeJob();
|
Fixed propagating of the error handler and reading mode.
|
diff --git a/src/apexpy/apex.py b/src/apexpy/apex.py
index <HASH>..<HASH> 100644
--- a/src/apexpy/apex.py
+++ b/src/apexpy/apex.py
@@ -57,6 +57,8 @@ class Apex(object):
Notes
-----
The calculations use IGRF-12 with coefficients from 1900 to 2020 [1]_.
+
+ The geodetic reference ellipsoid is WGS84.
References
----------
|
Update apex.py
adding a note to the `Apex` class to address #<I>
|
diff --git a/test/main.js b/test/main.js
index <HASH>..<HASH> 100644
--- a/test/main.js
+++ b/test/main.js
@@ -50,6 +50,7 @@ describe('gulp-inject', function () {
should.exist(newFile);
should.exist(newFile.contents);
+ newFile.base.should.equal(path.join(__dirname, 'fixtures'));
String(newFile.contents).should.equal(String(expectedFile('defaults.html').contents));
done();
|
Adding test to verify Issue #3 is fixed
|
diff --git a/atomic_reactor/utils/koji.py b/atomic_reactor/utils/koji.py
index <HASH>..<HASH> 100644
--- a/atomic_reactor/utils/koji.py
+++ b/atomic_reactor/utils/koji.py
@@ -212,18 +212,18 @@ def stream_task_output(session, task_id, file_name,
def tag_koji_build(session, build_id, target, poll_interval=5):
- logger.debug('Finding build tag for target %s', target)
+ logger.debug('Finding destination tag for target %s', target)
target_info = session.getBuildTarget(target)
- build_tag = target_info['dest_tag_name']
- logger.info('Tagging build with %s', build_tag)
- task_id = session.tagBuild(build_tag, build_id)
+ dest_tag = target_info['dest_tag_name']
+ logger.info('Tagging build with %s', dest_tag)
+ task_id = session.tagBuild(dest_tag, build_id)
task = TaskWatcher(session, task_id, poll_interval=poll_interval)
task.wait()
if task.failed():
raise RuntimeError('Task %s failed to tag koji build' % task_id)
- return build_tag
+ return dest_tag
def get_koji_task_owner(session, task_id, default=None):
|
Fix debug message
We're fetching the destination tag here. The build tag is something
different.
|
diff --git a/concrete/src/Tree/Node/Type/FileFolder.php b/concrete/src/Tree/Node/Type/FileFolder.php
index <HASH>..<HASH> 100644
--- a/concrete/src/Tree/Node/Type/FileFolder.php
+++ b/concrete/src/Tree/Node/Type/FileFolder.php
@@ -71,7 +71,7 @@ class FileFolder extends Category
}
}
if (is_array($sort)) {
- $list->sortBy($sort[0], $sort[1]);
+ $list->sanitizedSortBy($sort[0], $sort[1]);
}
}
if (!is_array($sort)) {
|
Sanitized sort by <URL>
|
diff --git a/src/foremast/configs/outputs.py b/src/foremast/configs/outputs.py
index <HASH>..<HASH> 100644
--- a/src/foremast/configs/outputs.py
+++ b/src/foremast/configs/outputs.py
@@ -88,7 +88,9 @@ def write_variables(app_configs=None, out_file='', git_short=''):
rendered_configs = json.loads(
get_template('configs/configs.json.j2', env=env, app=generated.app_name(), profile=instance_profile))
json_configs[env] = dict(DeepChainMap(configs, rendered_configs))
- for region in json_configs[env]['regions']:
+ region_list = configs['regions']
+ json_configs[env]['regions'] = region_list # removes regions defined in templates but not configs.
+ for region in region_list:
region_config = json_configs[env][region]
json_configs[env][region] = dict(DeepChainMap(region_config, rendered_configs))
else:
|
overrides regions in templates with regions in configs
|
diff --git a/src/js/components/scroll.js b/src/js/components/scroll.js
index <HASH>..<HASH> 100644
--- a/src/js/components/scroll.js
+++ b/src/js/components/scroll.js
@@ -13,7 +13,7 @@ function smoothScroll(el, to, duration) {
}, 10);
}
-$('a[href*="#"]').on('click', (e) => {
+$(window).on('click', 'a[href*="#"]', e => {
let scrollDuration = 300;
let targetName = $(e.currentTarget).attr('href').split('#');
let targetSelector = 'a[name="' + targetName[1] + '"]';
|
triggering smooth scrolling for all links
|
diff --git a/classes/Util.php b/classes/Util.php
index <HASH>..<HASH> 100644
--- a/classes/Util.php
+++ b/classes/Util.php
@@ -332,12 +332,12 @@ class QM_Util {
public static function sort( array &$array, $field ) {
self::$sort_field = $field;
- usort( $array, array( self, '_sort' ) );
+ usort( $array, array( __CLASS__, '_sort' ) );
}
public static function rsort( array &$array, $field ) {
self::$sort_field = $field;
- usort( $array, array( self, '_rsort' ) );
+ usort( $array, array( __CLASS__, '_rsort' ) );
}
private static function _rsort( $a, $b ) {
|
Correct the class name for static callback.
|
diff --git a/aa_composer.js b/aa_composer.js
index <HASH>..<HASH> 100644
--- a/aa_composer.js
+++ b/aa_composer.js
@@ -1052,7 +1052,8 @@ function handleTrigger(conn, batch, trigger, params, stateVars, arrDefinition, a
return sortOutputsAndReturn();
if (!asset)
return cb('not enough funds for ' + target_amount + ' bytes');
- if (send_all_output && payload.outputs.length === 1) // send-all is the only output - don't issue for it
+ var bSelfIssueForSendAll = (constants.bTestnet && mci < 2080483);
+ if (!bSelfIssueForSendAll && send_all_output && payload.outputs.length === 1) // send-all is the only output - don't issue for it
return sortOutputsAndReturn();
issueAsset(function (err) {
if (err) {
|
self-issue on testnet for old MCIs
|
diff --git a/lib/rb/lib/thrift/transport.rb b/lib/rb/lib/thrift/transport.rb
index <HASH>..<HASH> 100644
--- a/lib/rb/lib/thrift/transport.rb
+++ b/lib/rb/lib/thrift/transport.rb
@@ -35,7 +35,9 @@ module Thrift
def close; end
- def read(sz); end
+ def read(sz)
+ raise NotImplementedError
+ end
def read_all(size)
buf = ''
|
THRIFT-<I>. rb: Abstract Transport in Ruby #read method should throw NotImplementedException
The name says it all.
git-svn-id: <URL>
|
diff --git a/bcbio/chipseq/__init__.py b/bcbio/chipseq/__init__.py
index <HASH>..<HASH> 100644
--- a/bcbio/chipseq/__init__.py
+++ b/bcbio/chipseq/__init__.py
@@ -95,6 +95,11 @@ def _bam_coverage(name, bam_input, data):
except config_utils.CmdNotFound:
logger.info("No bamCoverage found, skipping bamCoverage.")
return None
+ resources = config_utils.get_resources("bamCoverage", data["config"])
+ if resources:
+ options = resources.get("options")
+ if options:
+ cmd += " %s" % " ".join([str(x) for x in options])
bw_output = os.path.join(os.path.dirname(bam_input), "%s.bw" % name)
if utils.file_exists(bw_output):
return bw_output
|
ChIP-seq: allow specification of options for bamCoverage
Enables specification of custom normalization through `resources`.
Fixes bcbio/bcbio-nextgen#<I>
|
diff --git a/mtools/util/logfile.py b/mtools/util/logfile.py
index <HASH>..<HASH> 100644
--- a/mtools/util/logfile.py
+++ b/mtools/util/logfile.py
@@ -85,14 +85,14 @@ class LogFile(InputSource):
def __iter__(self):
""" iteration over LogFile object will return a LogEvent object for each line. """
- # always start from the beginning logfile
- if not self.from_stdin:
- self.filehandle.seek(0)
-
for line in self.filehandle:
le = LogEvent(line)
yield le
+ # future iterations start from the beginning
+ if not self.from_stdin:
+ self.filehandle.seek(0)
+
def __len__(self):
""" return the number of lines in a log file. """
|
fixed bug where mlogfilter fast_forward wasn't working anymore.
|
diff --git a/tests/Unit/Application/Model/DiscountlistTest.php b/tests/Unit/Application/Model/DiscountlistTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/Application/Model/DiscountlistTest.php
+++ b/tests/Unit/Application/Model/DiscountlistTest.php
@@ -219,6 +219,7 @@ class DiscountlistTest extends \OxidTestCase
0,
1)
)";
+ $sQ .= " order by $sTable.oxsort ";
$this->assertEquals($this->cleanSQL($sQ), $this->cleanSQL($oList->UNITgetFilterSelect(null)));
}
@@ -258,6 +259,7 @@ class DiscountlistTest extends \OxidTestCase
EXISTS(select oxobject2discount.oxid from oxobject2discount where oxobject2discount.OXDISCOUNTID=$sTable.OXID and oxobject2discount.oxtype='oxgroups' and oxobject2discount.OXOBJECTID in ($sGroupIds) ),
1)
)";
+ $sQ .= " order by $sTable.oxsort ";
$this->assertEquals($this->cleanSQL($sQ), $this->cleanSQL($oList->UNITgetFilterSelect($oUser)));
}
|
ESDEV-<I> Update DiscountlistTest
|
diff --git a/test/basic-example.js b/test/basic-example.js
index <HASH>..<HASH> 100644
--- a/test/basic-example.js
+++ b/test/basic-example.js
@@ -1,21 +1,41 @@
var SoftAPSetup = require('../index');
var sap = new SoftAPSetup();
-console.log("Requesting public key...");
-sap.publicKey(scan);
+console.log("Obtaining device information...");
+sap.deviceInfo(claim);
+
+function claim(err, dat) {
+
+ console.log(dat);
+ console.log("-------");
+ console.log("Obtained device information. Setting claim code...");
+ sap.setClaimCode("wat", key);
+}
+
+function key(err, dat) {
+
+ if (err) { throw err; }
+ console.log(dat);
+ console.log("-------");
+ console.log("Requesting public key...");
+ sap.publicKey(scan);
+};
function scan(err, dat) {
if(err) { throw err; }
+ console.log(dat);
+ console.log("-------");
console.log("Received public key. Scanning for APs...");
sap.scan(configure);
-}
+};
function configure(err, dat) {
if(err) { throw err; }
- console.log("Scanned APs. Configuring device...");
console.log(dat);
+ console.log("-------");
+ console.log("Scanned APs. Configuring device...");
sap.configure({
ssid: 'test'
|
Added more steps to basic-example test
|
diff --git a/EntitySilo.php b/EntitySilo.php
index <HASH>..<HASH> 100644
--- a/EntitySilo.php
+++ b/EntitySilo.php
@@ -76,7 +76,7 @@ class EntitySilo implements \Countable, \Iterator, \ArrayAccess
{
if ($this->contains($entity)) {
$orig = $this->entities[$entity];
- $orig['data'] = array_merge($orig['data'], $data);
+ $orig['data'] = array_merge_recursive($orig['data'], $data);
$this->entities[$entity] = $orig;
$this->data[$orig['class']][$orig['id']] = array_merge(
|
merge recursively entity infos (to be sure nothing is lost)
|
diff --git a/lib/podio/models/integration.rb b/lib/podio/models/integration.rb
index <HASH>..<HASH> 100644
--- a/lib/podio/models/integration.rb
+++ b/lib/podio/models/integration.rb
@@ -78,7 +78,7 @@ class Podio::Integration < ActivePodio::Base
# @see https://developers.podio.com/doc/integrations/get-available-fields-86890
def find_available_fields_for(app_id)
- list Podio.connection.get("/integration/#{app_id}/field/").body
+ Podio.connection.get("/integration/#{app_id}/field/").body
end
# @see https://developers.podio.com/doc/integrations/delete-integration-86876
|
find_available_fields_for never returned a list of integrations, so stop wrapping the returned collection into Integration instances
|
diff --git a/spyderlib/widgets/editor.py b/spyderlib/widgets/editor.py
index <HASH>..<HASH> 100644
--- a/spyderlib/widgets/editor.py
+++ b/spyderlib/widgets/editor.py
@@ -1791,7 +1791,7 @@ class EditorStack(QWidget):
_("Loading %s...") % filename)
text, enc = encoding.read(filename)
finfo = self.create_new_editor(filename, enc, text, set_current)
- index = self.get_stack_index()
+ index = self.data.index(finfo)
self._refresh_outlineexplorer(index, update=True)
self.emit(SIGNAL('ending_long_process(QString)'), "")
if self.isVisible() and self.checkeolchars_enabled \
|
Editor: if user accept to fix "mixed end-of-line characters", when opening file,
the current editor was set as "modified" (the tab title had a '*' at the end)
instead of the newly created editor
|
diff --git a/tests/test_signature_parser.py b/tests/test_signature_parser.py
index <HASH>..<HASH> 100644
--- a/tests/test_signature_parser.py
+++ b/tests/test_signature_parser.py
@@ -292,3 +292,10 @@ class ParseTestCase(unittest.TestCase):
with self.assertRaises(IntoDPError):
xform([{True: True}])
+
+ def testBadArrayValue(self):
+ """
+ Verify that passing a dict for an array will raise an exception.
+ """
+ with self.assertRaises(IntoDPError):
+ xformer('a(qq)')([dict()])
|
Add a test to force exception raising if Python type for dbus array is dict.
|
diff --git a/azure-keyvault/azure/keyvault/custom/key_vault_authentication.py b/azure-keyvault/azure/keyvault/custom/key_vault_authentication.py
index <HASH>..<HASH> 100644
--- a/azure-keyvault/azure/keyvault/custom/key_vault_authentication.py
+++ b/azure-keyvault/azure/keyvault/custom/key_vault_authentication.py
@@ -31,7 +31,7 @@ class KeyVaultAuthBase(AuthBase):
# send the request to retrieve the challenge, then request the token and update
# the request
# TODO: wire up commons flag for things like Fiddler, logging, etc.
- response = requests.Session().send(request, verify=os.environ.get('REQUESTS_CA_BUNDLE') or os.environ.get('CURL_CA_BUNDLE'))
+ response = requests.Session().send(request)
if response.status_code == 401:
auth_header = response.headers['WWW-Authenticate']
if HttpBearerChallenge.is_bearer_challenge(auth_header):
|
reverting changes to KeyVaultAuthBase
|
diff --git a/lib/s3/service.rb b/lib/s3/service.rb
index <HASH>..<HASH> 100644
--- a/lib/s3/service.rb
+++ b/lib/s3/service.rb
@@ -2,7 +2,7 @@ module S3
class Service
extend Roxy::Moxie
- attr_reader :access_key_id, :secret_access_key
+ attr_reader :access_key_id, :secret_access_key, :use_ssl
def initialize(options)
@access_key_id = options[:access_key_id] or raise ArgumentError.new("no access key id given")
|
added use_ssl reader to bucket
|
diff --git a/duradmin/src/main/webapp/jquery/dc/widget/ui.restore.js b/duradmin/src/main/webapp/jquery/dc/widget/ui.restore.js
index <HASH>..<HASH> 100644
--- a/duradmin/src/main/webapp/jquery/dc/widget/ui.restore.js
+++ b/duradmin/src/main/webapp/jquery/dc/widget/ui.restore.js
@@ -55,8 +55,8 @@ $.widget("ui.restore",
var data = [];
data.push(["Status", restore.status]);
data.push(["Status Message", restore.statusText]);
- data.push(["Start Date", (restore.startDate ? new Date(restore.startDate):"")]);
- data.push(["End Date", (restore.endDate ? new Date(restore.endDate):"")]);
+ data.push(["Start Date", (restore.startDate ? new Date(restore.startDate).toString():"")]);
+ data.push(["End Date", (restore.endDate ? new Date(restore.endDate).toString():"")]);
data.push(["Snaphshot ID", restore.snapshotId]);
var table = dc.createTable(data);
|
Fixes missing restore start and end dates.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ with open(here / 'README.md', encoding='utf-8') as f:
setup(
name='pythonanywhere',
- version='0.0.9',
+ version='0.0.10',
description='PythonAnywhere helper tools for users',
long_description=long_description,
url='https://github.com/pythonanywhere/helper_scripts/',
|
bumped version for ssl test mode env var. by: Glenn, Harry
|
diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go
index <HASH>..<HASH> 100644
--- a/test/extended/prometheus/prometheus.go
+++ b/test/extended/prometheus/prometheus.go
@@ -232,8 +232,7 @@ var _ = g.Describe("[sig-instrumentation] Prometheus", func() {
targets.Expect(labels{"job": "kube-state-metrics"}, "up", "^https://.*/metrics$"),
// Cluster version operator
- // TODO: require HTTPS once https://github.com/openshift/cluster-version-operator/pull/385 lands
- targets.Expect(labels{"job": "cluster-version-operator"}, "up", "^https?://.*/metrics$"),
+ targets.Expect(labels{"job": "cluster-version-operator"}, "up", "^https://.*/metrics$"),
)
}
|
test/extended/prometheus: Require HTTPS for the CVO
Now that the CVO pull request has landed, require HTTPS going forward.
|
diff --git a/lib/delegate.js b/lib/delegate.js
index <HASH>..<HASH> 100644
--- a/lib/delegate.js
+++ b/lib/delegate.js
@@ -387,8 +387,8 @@ Delegate.prototype.fire = function(event, target, listener) {
Delegate.prototype.matches = (function(el) {
if (!el) return;
var p = el.prototype;
- return (p.matchesSelector || p.webkitMatchesSelector || p.mozMatchesSelector || p.msMatchesSelector || p.oMatchesSelector);
-}(HTMLElement));
+ return (p.matches || p.matchesSelector || p.webkitMatchesSelector || p.mozMatchesSelector || p.msMatchesSelector || p.oMatchesSelector);
+}(Element));
/**
* Check whether an element
|
Changed from using HTMLElement to Element for matches
Because
a) ie8 doesn't support HTMLElement
b) matches is defined on Element.prototype not on HTMLElelment.prototype
Also added p.matches as the preferred native method to use
|
diff --git a/src/phpFastCache/Cache/ExtendedCacheItemPoolInterface.php b/src/phpFastCache/Cache/ExtendedCacheItemPoolInterface.php
index <HASH>..<HASH> 100644
--- a/src/phpFastCache/Cache/ExtendedCacheItemPoolInterface.php
+++ b/src/phpFastCache/Cache/ExtendedCacheItemPoolInterface.php
@@ -121,7 +121,7 @@ interface ExtendedCacheItemPoolInterface extends CacheItemPoolInterface
* If any of the keys in $keys are not a legal value a \Psr\Cache\InvalidArgumentException
* MUST be thrown.
*
- * @return array|\Traversable
+ * @return ExtendedCacheItemInterface[]
* A traversable collection of Cache Items keyed by the cache keys of
* each item. A Cache item will be returned for each key, even if that
* key is not found. However, if no keys are specified then an empty
@@ -139,7 +139,7 @@ interface ExtendedCacheItemPoolInterface extends CacheItemPoolInterface
* If any of the keys in $keys are not a legal value a \Psr\Cache\InvalidArgumentException
* MUST be thrown.
*
- * @return array|\Traversable
+ * @return ExtendedCacheItemInterface[]
* A traversable collection of Cache Items keyed by the cache keys of
* each item. A Cache item will be returned for each key, even if that
* key is not found. However, if no keys are specified then an empty
|
Fixed wrong class name in ExtendedCacheItemPoolInterface
|
diff --git a/classes/Peyote/Condition.php b/classes/Peyote/Condition.php
index <HASH>..<HASH> 100644
--- a/classes/Peyote/Condition.php
+++ b/classes/Peyote/Condition.php
@@ -79,6 +79,10 @@ abstract class Condition extends \Peyote\Base
{
$sql[] = "{$column} {$op} {$this->quote($value[0])} AND {$this->quote($value[1])}";
}
+ else if ($op === "AGAINST")
+ {
+ $sql[] = "MATCH({$column}) AGAINST({$this->quote($value)})";
+ }
else
{
$sql[] = "{$column} {$op}";
|
Adding Match … Against to the condition builder.
|
diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js
index <HASH>..<HASH> 100644
--- a/lib/OpenLayers/Layer/Markers.js
+++ b/lib/OpenLayers/Layer/Markers.js
@@ -22,7 +22,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
isBaseLayer: false,
/**
- * Property: markers
+ * APIProperty: markers
* {Array(<OpenLayers.Marker>)} internal marker list
*/
markers: null,
|
Seems odd to not expose the 'markers' property on this layer. I have buyin from cr5. If anyone has vehement opinions on this, yell and i'll roll back
git-svn-id: <URL>
|
diff --git a/select2.js b/select2.js
index <HASH>..<HASH> 100644
--- a/select2.js
+++ b/select2.js
@@ -1219,7 +1219,7 @@ the specific language governing permissions and limitations under the Apache Lic
mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
mask.hide();
mask.appendTo(this.body());
- mask.on("mousedown touchstart", function (e) {
+ mask.on("mousedown touchstart click", function (e) {
var dropdown = $("#select2-drop"), self;
if (dropdown.length > 0) {
self=dropdown.data("select2");
|
a tweak to prevent clicks propagating through the mask on IE9. #<I>
|
diff --git a/lib/discordrb/bot.rb b/lib/discordrb/bot.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/bot.rb
+++ b/lib/discordrb/bot.rb
@@ -1000,6 +1000,12 @@ module Discordrb
if opcode == Opcodes::HELLO
LOGGER.debug 'Hello!'
+ # Activate the heartbeats
+ @heartbeat_interval = data['heartbeat_interval'].to_f / 1000.0
+ @heartbeat_active = true
+ debug("Desired heartbeat_interval: #{@heartbeat_interval}")
+ send_heartbeat
+
return
end
@@ -1032,12 +1038,6 @@ module Discordrb
# Set the session ID in case we get disconnected and have to resume
@session_id = data['session_id']
- # Activate the heartbeats
- @heartbeat_interval = data['heartbeat_interval'].to_f / 1000.0
- @heartbeat_active = true
- debug("Desired heartbeat_interval: #{@heartbeat_interval}")
- send_heartbeat
-
@profile = Profile.new(data['user'], self, @email, @password)
# Initialize servers
|
Move heartbeat handling from READY to HELLO
|
diff --git a/gutenberg/download.py b/gutenberg/download.py
index <HASH>..<HASH> 100644
--- a/gutenberg/download.py
+++ b/gutenberg/download.py
@@ -2,11 +2,11 @@
from __future__ import absolute_import
-import bs4
-import collections
import gutenberg.common.functutil as functutil
import gutenberg.common.osutil as osutil
import gutenberg.common.stringutil as stringutil
+import bs4
+import collections
import logging
import os
import random
|
No-op: sort imports
|
diff --git a/textract/parsers/tesseract.py b/textract/parsers/tesseract.py
index <HASH>..<HASH> 100644
--- a/textract/parsers/tesseract.py
+++ b/textract/parsers/tesseract.py
@@ -1,25 +1,12 @@
-"""
-Process an image file using tesseract.
-"""
-
-import tempfile
-import os
-
from ..shell import run
-def temp_filename():
- """
- Return a unique tempfile name.
- """
- handle, filename = tempfile.mkstemp()
- os.close(handle)
- return filename
def extract(filename, **kwargs):
"""Extract text from various image file formats using tesseract-ocr"""
# Tesseract can't output to console directly so you must first create
# a dummy file to write to, read, and then delete
- cmd = 'tesseract %(filename)s {0} && cat {0}.txt && rm -f {0} {0}.txt'
- temp_name = temp_filename()
- stdout, _ = run(cmd.format(temp_name) % locals())
+ stdout, stderr = run(
+ 'tesseract %(filename)s tmpout && cat tmpout.txt && rm -f tmpout.txt'
+ % locals()
+ )
return stdout
|
Reverted tesseract.py from upstream in response to
@christomitov's update re: ticket #<I> in the conversation for #<I>.
|
diff --git a/tests/integration/Inventory/InventoryUpdateRequestTest.php b/tests/integration/Inventory/InventoryUpdateRequestTest.php
index <HASH>..<HASH> 100644
--- a/tests/integration/Inventory/InventoryUpdateRequestTest.php
+++ b/tests/integration/Inventory/InventoryUpdateRequestTest.php
@@ -206,7 +206,7 @@ class InventoryUpdateRequestTest extends ApiTestCase
} while ($result->count() == 0 && $retries <= 20);
if ($result->count() == 0) {
- $this->markTestSkipped('Product availability not updated in time');
+ $this->markTestSkipped('Product not updated in time');
}
$retries = 0;
@@ -222,6 +222,10 @@ class InventoryUpdateRequestTest extends ApiTestCase
$result = $request->mapResponse($response);
} while ($result->count() == 0 && $retries <= 9);
+ if ($result->count() == 0) {
+ $this->markTestSkipped('Product channel availability not updated in time');
+ }
+
$this->assertSame(
$product->getId(),
$result->current()->getId()
|
test(Inventory): fix inventory query for channel test
|
diff --git a/lib/cursor.js b/lib/cursor.js
index <HASH>..<HASH> 100644
--- a/lib/cursor.js
+++ b/lib/cursor.js
@@ -1069,7 +1069,10 @@ Cursor.prototype.close = function(options, callback) {
this.emit('close');
// Callback if provided
- if (typeof callback === 'function') return handleCallback(callback, null, this);
+ if (typeof callback === 'function') {
+ return handleCallback(callback, null, this);
+ }
+
// Return a Promise
return new this.s.promiseLibrary(function(resolve) {
resolve();
@@ -1080,7 +1083,7 @@ Cursor.prototype.close = function(options, callback) {
return this.s.session.endSession(() => completeClose());
}
- completeClose();
+ return completeClose();
};
define.classMethod('close', { callback: true, promise: true });
|
refactor(cursor): return result of `completeClose` for promises
NODE-<I>
|
diff --git a/docs/index.rst b/docs/index.rst
index <HASH>..<HASH> 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -105,6 +105,13 @@ Thanks guys!
Changelog
=========
+v1.8.8
+------
+*Release date: 2020-09-28*
+
+ - Updated supported DRF versions
+
+
v1.8.7
------
*Release date: 2020-08-01*
diff --git a/drf_haystack/__init__.py b/drf_haystack/__init__.py
index <HASH>..<HASH> 100644
--- a/drf_haystack/__init__.py
+++ b/drf_haystack/__init__.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
__title__ = "drf-haystack"
-__version__ = "1.8.7"
+__version__ = "1.8.8"
__author__ = "Rolf Haavard Blindheim"
__license__ = "MIT License"
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(
include_package_data=True,
install_requires=[
"Django>=2.2,<3.1",
- "djangorestframework>=3.7,<3.12",
+ "djangorestframework>=3.7,<3.13",
"django-haystack>=2.8,<3.1",
"python-dateutil"
],
|
Support DRF < <I>.x (#<I>)
Thanks again ;)
|
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java
index <HASH>..<HASH> 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java
@@ -760,6 +760,12 @@ public abstract class UnalignedCheckpointTestBase extends TestLogger {
SharedPoolNettyShuffleServiceFactory.class.getName());
conf.set(NettyShuffleEnvironmentOptions.NETWORK_BUFFERS_PER_CHANNEL, buffersPerChannel);
conf.set(NettyShuffleEnvironmentOptions.NETWORK_REQUEST_BACKOFF_MAX, 60000);
+ // half memory consumption of network buffers (default is 64mb), as some tests spawn a
+ // large number of task managers (25)
+ // 12mb was sufficient to run the tests, so 32mb should put us above the recommended
+ // amount of buffers
+ conf.set(TaskManagerOptions.NETWORK_MEMORY_MIN, MemorySize.ofMebiBytes(32));
+ conf.set(TaskManagerOptions.NETWORK_MEMORY_MAX, MemorySize.ofMebiBytes(32));
conf.set(AkkaOptions.ASK_TIMEOUT_DURATION, Duration.ofMinutes(1));
return conf;
}
|
[FLINK-<I>][tests] Reduce network memory in UnalignedCheckpointTestBase
|
diff --git a/src/Illuminate/Collections/EnumeratesValues.php b/src/Illuminate/Collections/EnumeratesValues.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Collections/EnumeratesValues.php
+++ b/src/Illuminate/Collections/EnumeratesValues.php
@@ -6,9 +6,6 @@ use CachingIterator;
use Exception;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Support\Jsonable;
-use Illuminate\Collections\Arr;
-use Illuminate\Collections\Enumerable;
-use Illuminate\Collections\HigherOrderCollectionProxy;
use JsonSerializable;
use Symfony\Component\VarDumper\VarDumper;
use Traversable;
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Support/Collection.php
+++ b/src/Illuminate/Support/Collection.php
@@ -13,7 +13,7 @@ class Collection extends BaseCollection
*/
public function collect()
{
- return new Collection($this->all());
+ return new self($this->all());
}
/**
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/core/src/main/java/com/orientechnologies/common/concur/lock/OSimpleLockManagerImpl.java b/core/src/main/java/com/orientechnologies/common/concur/lock/OSimpleLockManagerImpl.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/orientechnologies/common/concur/lock/OSimpleLockManagerImpl.java
+++ b/core/src/main/java/com/orientechnologies/common/concur/lock/OSimpleLockManagerImpl.java
@@ -1,5 +1,7 @@
package com.orientechnologies.common.concur.lock;
+import com.orientechnologies.common.exception.OException;
+
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -36,7 +38,7 @@ public class OSimpleLockManagerImpl<T> implements OSimpleLockManager<T> {
c = lock.newCondition();
map.put(key, c);
} catch (InterruptedException e) {
- Thread.currentThread().interrupt();
+ throw OException.wrapException(new OInterruptedException("Interrupted Lock"), e);
}
} finally {
lock.unlock();
|
made sure that interrupt exception interrupt operation from locks
|
diff --git a/lib/govuk_navigation_helpers/content_item.rb b/lib/govuk_navigation_helpers/content_item.rb
index <HASH>..<HASH> 100644
--- a/lib/govuk_navigation_helpers/content_item.rb
+++ b/lib/govuk_navigation_helpers/content_item.rb
@@ -7,7 +7,7 @@ module GovukNavigationHelpers
attr_reader :content_store_response
def initialize(content_store_response)
- @content_store_response = content_store_response
+ @content_store_response = content_store_response.to_h
end
def parent
|
Convert content item to hash
The ContentItem class assumes a number of hash methods that may not
necessarily be available on a content item. By explicitly converting
this object to a hash, we can avoid bad method calls
|
diff --git a/geist/core.py b/geist/core.py
index <HASH>..<HASH> 100644
--- a/geist/core.py
+++ b/geist/core.py
@@ -166,7 +166,7 @@ class GUI(object):
inc_x = x_distance / num_increments
inc_y = y_distance / num_increments
for i in range(start_increment, num_increments):
- actions.add_move((from_x + (inc_x*i), from_y + (inc_y*i)))
+ actions.add_move((int(from_x + (inc_x*i)), int(from_y + (inc_y*i))))
if merged_opts.mouse_move_wait != 0:
actions.add_wait(merged_opts.mouse_move_wait)
actions.add_move(to_point)
diff --git a/geist/finders.py b/geist/finders.py
index <HASH>..<HASH> 100644
--- a/geist/finders.py
+++ b/geist/finders.py
@@ -1,3 +1,4 @@
+from __future__ import division
import numpy as np
|
Fixed error with mouse move not using integer points
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.