diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/test/unit/result_test.rb b/test/unit/result_test.rb
index <HASH>..<HASH> 100644
--- a/test/unit/result_test.rb
+++ b/test/unit/result_test.rb
@@ -37,7 +37,7 @@ class ResultTest < GeocoderTestCase
def test_result_accepts_reverse_coords_in_reasonable_range_for_madison_square_garden
Geocoder::Lookup.street_services.each do |l|
next unless File.exist?(File.join("test", "fixtures", "#{l.to_s}_madison_square_garden"))
- next if [:bing, :esri, :geocoder_ca, :google_places_search, :geocoder_us, :geoportail_lu].include? l # Reverse fixture does not match forward
+ next if [:bing, :esri, :geocoder_ca, :google_places_search, :geoportail_lu].include? l # Reverse fixture does not match forward
Geocoder.configure(:lookup => l)
set_api_key!(l)
result = Geocoder.search([40.750354, -73.993371]).first
|
Remove reference to :geocoder_us lookup.
(should have been part of fc9dc2e<I>c0ce1e<I>e4e<I>ff5f5d4c5b<I>ae<I>)
|
diff --git a/www/setup.py b/www/setup.py
index <HASH>..<HASH> 100644
--- a/www/setup.py
+++ b/www/setup.py
@@ -113,7 +113,7 @@ bower_json = {
"angular": ANGULAR_TAG,
"angular-animate": ANGULAR_TAG,
"angular-bootstrap": "~0.6.0",
- "angular-ui-router": "~0.2.0",
+ "angular-ui-router": "0.2.7",
"restangular": "latest",
"lodash": "latest",
"html5shiv": "~3.6.2",
|
Ticket #<I> `grunt prod` no longer works..
- Force to use angular-ui-router <I>
- angular-ui-router <I> (which was released yesterday) breaks the build.
|
diff --git a/src/u.js b/src/u.js
index <HASH>..<HASH> 100644
--- a/src/u.js
+++ b/src/u.js
@@ -747,6 +747,21 @@
/**
+ * prfx method
+ * get prefixed version of css properties
+ * @param {string} a - css property
+ * @param {undefined} b,c,d - placeholder variables
+ * @return {string} prefixed css property
+ */
+ u.prfx = function prfx(a,b,c,d){
+ for (d?d=b.toUpperCase():b=4;!d&&b--;d=(d=d.replace(/-(.)/g,prfx)) in (new Image).style&&d) {
+ d=[['Moz-','Webkit-','Ms-','O-'][b]]+a;
+ }
+ return d;
+ },
+
+
+ /**
* stop method
* preventDefaut
* @param {object} e - event
|
add prfx() method to get prefixed css property
|
diff --git a/couriers/australia_post/index.js b/couriers/australia_post/index.js
index <HASH>..<HASH> 100644
--- a/couriers/australia_post/index.js
+++ b/couriers/australia_post/index.js
@@ -7,6 +7,14 @@ function valid(connote) {
if (typeof connote != "string") {
return false;
}
+
+ connote = connote.trim().toUpperCase();
+
+ // handle 14 character couriers please
+ if (connote.length === 14 && connote.indexOf("CP") === 0) {
+ return false;
+ }
+
return [10, 14, 18, 21, 39].indexOf(connote.length) != -1;
}
diff --git a/couriers/australia_post/index.test.js b/couriers/australia_post/index.test.js
index <HASH>..<HASH> 100644
--- a/couriers/australia_post/index.test.js
+++ b/couriers/australia_post/index.test.js
@@ -16,6 +16,7 @@ describe("Australia Post", () => {
describe("with an invalid connote", () => {
test("returns false", () => {
+ expect(australia_post.valid("CP000000000000")).toBe(false); // 14 Couriers Please
expect(australia_post.valid("12345")).toBe(false);
expect(australia_post.valid("")).toBe(false);
expect(australia_post.valid(null)).toBe(false);
|
Return false if a couriers please connote
Australia Post and Couriers Please both have <I> digit connotes however
Couriers Please prepends theirs with 'CP'
|
diff --git a/framework/yii/data/Pagination.php b/framework/yii/data/Pagination.php
index <HASH>..<HASH> 100644
--- a/framework/yii/data/Pagination.php
+++ b/framework/yii/data/Pagination.php
@@ -48,7 +48,7 @@ use yii\base\Object;
* }
*
* // display pagination
- * LinkPager::widget(array(
+ * echo LinkPager::widget(array(
* 'pagination' => $pages,
* ));
* ~~~
|
Add echo into docs for link pager
I'm not sure if echo should be mentioned, but without the echo before the LinkPager::widget() the user would see nothing.
|
diff --git a/gcs/bucket.go b/gcs/bucket.go
index <HASH>..<HASH> 100644
--- a/gcs/bucket.go
+++ b/gcs/bucket.go
@@ -79,7 +79,7 @@ type Bucket interface {
ctx context.Context,
req *CopyObjectRequest) (*Object, error)
- // Compose zero or more source objects into a single destination object by
+ // Compose one or more source objects into a single destination object by
// concatenating. Any existing generation of the destination name will be
// overwritten.
//
diff --git a/gcs/requests.go b/gcs/requests.go
index <HASH>..<HASH> 100644
--- a/gcs/requests.go
+++ b/gcs/requests.go
@@ -86,7 +86,7 @@ const MaxSourcesPerComposeRequest = 32
// Cf. https://cloud.google.com/storage/docs/composite-objects#_Count
const MaxComponentCount = 1024
-// A request to compose multiple objects into a single composite object.
+// A request to compose one or more objects into a single composite object.
type ComposeObjectsRequest struct {
// The name of the destination composite object.
DstName string
@@ -99,7 +99,7 @@ type ComposeObjectsRequest struct {
// MaxComponentCount.
DstGenerationPrecondition *int64
- // The source objects from which to compose.
+ // The source objects from which to compose. This must be non-empty.
Sources []ComposeSource
}
|
Fixed the ComposeObjects description.
The text "zero or more" was never correct. Previously "two or more"
would have been correct, but since Google-internal bug <I> was
fixed, now it's "one ore more".
|
diff --git a/lib/bolt/version.rb b/lib/bolt/version.rb
index <HASH>..<HASH> 100644
--- a/lib/bolt/version.rb
+++ b/lib/bolt/version.rb
@@ -1,3 +1,3 @@
module Bolt
- VERSION = '0.0.3'.freeze
+ VERSION = '0.0.4'.freeze
end
|
(GEM) update bolt version to <I>
|
diff --git a/lib/ronin/ui/command_line/command.rb b/lib/ronin/ui/command_line/command.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/ui/command_line/command.rb
+++ b/lib/ronin/ui/command_line/command.rb
@@ -35,7 +35,7 @@ module Ronin
# Creates a new Command object.
#
def initialize(&block)
- @name = $0
+ @name = File.basename($0)
Options.new(@name) do |opts|
define_options(opts)
|
Use the File.basename of $0 for the command name.
|
diff --git a/EntityContext.js b/EntityContext.js
index <HASH>..<HASH> 100644
--- a/EntityContext.js
+++ b/EntityContext.js
@@ -301,7 +301,7 @@ JEFRi.EntityComparator = function(a, b){
{ //Need a setter
var callback = function(){};
definition.Constructor.prototype['set' + field] = function(entity) {
- var id = entity.id();
+ var id = entity[relationship.to.property]();
if( !(id === this[relationship.from.property]()))
{ //Changing
this[field] = entity;
|
Moved Availibities to FieldRep from Users
|
diff --git a/src/rez/bind/rez.py b/src/rez/bind/rez.py
index <HASH>..<HASH> 100644
--- a/src/rez/bind/rez.py
+++ b/src/rez/bind/rez.py
@@ -31,7 +31,7 @@ def bind(path, version_range=None, opts=None, parser=None):
with make_package("rez", path, make_root=make_root) as pkg:
pkg.version = version
pkg.commands = commands
- pkg.requires = ["python-2.6+<3"]
+ pkg.requires = ["python-2.7+<4"]
pkg.variants = [system.variant]
return pkg.installed_variants
|
expand rez-binds requirement range
|
diff --git a/lib/chef/provider/aws_key_pair.rb b/lib/chef/provider/aws_key_pair.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/provider/aws_key_pair.rb
+++ b/lib/chef/provider/aws_key_pair.rb
@@ -176,7 +176,7 @@ class Chef::Provider::AwsKeyPair < Chef::Provider::AwsProvider
@current_resource = Chef::Resource::AwsKeyPair.new(new_resource.name, run_context)
current_key_pair = ec2.key_pairs[new_resource.name]
- if current_key_pair
+ if current_key_pair && current_key_pair.exists?
@current_fingerprint = current_key_pair ? current_key_pair.fingerprint : nil
else
current_resource.action :delete
|
Make sure the EC2 ssh key exists upstream
|
diff --git a/lib/espn_rb/headline_response.rb b/lib/espn_rb/headline_response.rb
index <HASH>..<HASH> 100644
--- a/lib/espn_rb/headline_response.rb
+++ b/lib/espn_rb/headline_response.rb
@@ -12,13 +12,7 @@ class HeadlineResponse
# define each so that Enumerable methods work properly.
def each &block
- @responses.each do |response|
- if block_given?
- block.call response
- else
- yield response
- end
- end
+ @responses.each &block
end
# Allows the user to specify which HeadlineItem they'd like to work with via it's index in the @responses array
|
Simplify HeadlineResponse#each.
|
diff --git a/src/Uri.php b/src/Uri.php
index <HASH>..<HASH> 100644
--- a/src/Uri.php
+++ b/src/Uri.php
@@ -78,8 +78,8 @@ class Uri extends LaminasUri
$path = $data['path'] . (isset($data['query']) ? '?' . $data['query'] : '');
$frag = isset($data['fragment']) ? '#' . $data['fragment'] : '';
- if ($absolute || (isset($data['scheme']) && $data['scheme'] !== $curr['scheme'])) {
- return $data['scheme'] . '://' . $host . $path . $frag;
+ if ($absolute || (isset($data['scheme']) && $data['scheme'] !== ($curr['scheme'] ?? null))) {
+ return (isset($data['scheme']) ? $data['scheme'] . ':' : '') . '//' . $host . $path . $frag;
}
if ((isset($data['host']) && $data['host'] !== $curr['host']) ||
(isset($data['port']) && $data['port'] !== $curr['port'])
|
fixed linkTo method in edge cases with no schema
|
diff --git a/src/ActivitylogServiceProvider.php b/src/ActivitylogServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/ActivitylogServiceProvider.php
+++ b/src/ActivitylogServiceProvider.php
@@ -43,9 +43,7 @@ class ActivitylogServiceProvider extends ServiceProvider
public static function determineActivityModel(): string
{
- $activityModel = config('laravel-activitylog.activity_model') !== null ?
- config('laravel-activitylog.activity_model') :
- Activity::class;
+ $activityModel = config('laravel-activitylog.activity_model') ?? Activity::class;
if (! is_a($activityModel, Activity::class, true)) {
throw InvalidConfiguration::modelIsNotValid($activityModel);
|
Using Null coalescing operator (#<I>)
Using null coalescing operator instead of ternary operator.
|
diff --git a/template/View.php b/template/View.php
index <HASH>..<HASH> 100644
--- a/template/View.php
+++ b/template/View.php
@@ -382,11 +382,15 @@ class View extends \lithium\core\Object {
$_renderer = $this->_renderer;
$_loader = $this->_loader;
$filters = $this->outputFilters;
- $params = compact('step', 'params', 'options') + array('data' => $data + $filters);
+ $params = compact('step', 'params', 'options') + array(
+ 'data' => $data + $filters,
+ 'loader' => $_loader,
+ 'renderer' => $_renderer
+ );
- $filter = function($self, $params) use (&$_renderer, &$_loader) {
- $template = $_loader->template($params['step']['path'], $params['params']);
- return $_renderer->render($template, $params['data'], $params['options']);
+ $filter = function($self, $params) {
+ $template = $params['loader']->template($params['step']['path'], $params['params']);
+ return $params['renderer']->render($template, $params['data'], $params['options']);
};
$result = $this->_filter(__METHOD__, $params, $filter);
|
Make view step filter pass renderer & template in param instead of use
|
diff --git a/lib/rabl/builder.rb b/lib/rabl/builder.rb
index <HASH>..<HASH> 100644
--- a/lib/rabl/builder.rb
+++ b/lib/rabl/builder.rb
@@ -106,7 +106,8 @@ module Rabl
# data_name(@user => :person) => :person
# data_name(@users) => :user
def data_name(data)
- return data.values.first if data.is_a?(Hash)
+ return data.values.first if data.is_a?(Hash) # @user => :user
+ data = @_object.send(data) if data.is_a?(Symbol) # :address
@options[:engine].model_name(data)
end
|
Adds support for determining type for data symbols
|
diff --git a/admin/configvars.php b/admin/configvars.php
index <HASH>..<HASH> 100644
--- a/admin/configvars.php
+++ b/admin/configvars.php
@@ -218,16 +218,17 @@ class configvarrss extends configvar {
}
$timenow = time();
$timeformat = get_string('strftimedaytime');
+ $timeformat = substr($timeformat, 1);
for ($tz = -26; $tz <= 26; $tz++) {
$zone = (float)$tz/2.0;
$usertime = $timenow + ($tz * 1800);
if ($tz == 0) {
- $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT)";
+ $timezones["$zone"] = gmdate($timeformat, $usertime)." (GMT)";
} else if ($tz < 0) {
- $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT$zone)";
+ $timezones["$zone"] = gmdate($timeformat, $usertime)." (GMT$zone)";
} else {
- $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT+$zone)";
+ $timezones["$zone"] = gmdate($timeformat, $usertime)." (GMT+$zone)";
}
}
|
Patching with a metahack to handle our date-format-string compatibility hack.
|
diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java b/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java
index <HASH>..<HASH> 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java
@@ -65,10 +65,10 @@ public class PercentEscaper extends UnicodeEscaper {
public static final String SAFEPATHCHARS_URLENCODER = "-_.!~*'()@:$&,;=+";
/**
- * Contains the save characters plus all reserved characters. This happens to be the safe path
- * characters plus those characters which are reserved for URI segments, namely '+', '/', and '?'.
+ * Contains the safe characters plus all reserved characters. This happens to be the safe path
+ * characters plus those characters which are reserved for URI segments, namely '/' and '?'.
*/
- public static final String SAFE_PLUS_RESERVED_CHARS_URLENCODER = SAFEPATHCHARS_URLENCODER + "+/?";
+ public static final String SAFE_PLUS_RESERVED_CHARS_URLENCODER = SAFEPATHCHARS_URLENCODER + "/?";
/**
* A string of characters that do not need to be encoded when used in URI user info part, as
|
fix: include '+' in SAFEPATHCHARS_URLENCODER (#<I>)
|
diff --git a/tests/test_contentsmanager.py b/tests/test_contentsmanager.py
index <HASH>..<HASH> 100644
--- a/tests/test_contentsmanager.py
+++ b/tests/test_contentsmanager.py
@@ -767,6 +767,7 @@ def test_global_pairing_allows_to_save_other_file_types(nb_file, tmpdir):
compare_notebooks(nb, nb2)
+@skip_if_dict_is_not_ordered
@pytest.mark.parametrize('nb_file', list_notebooks('R'))
def test_python_kernel_preserves_R_files(nb_file, tmpdir):
"""Opening a R file with a Jupyter server that has no R kernel should not modify the file"""
|
Skip test when dict is not ordered
|
diff --git a/src/Models/Permission.php b/src/Models/Permission.php
index <HASH>..<HASH> 100644
--- a/src/Models/Permission.php
+++ b/src/Models/Permission.php
@@ -105,7 +105,7 @@ class Permission extends Model implements PermissionContract
$permission = static::getPermissions()->where('name', $name)->where('guard_name', $guardName)->first();
if (! $permission) {
- return static::create(['guard_name' => $guardName, 'name' => $name]);
+ return static::create(['name' => $name, 'guard_name' => $guardName]);
}
return $permission;
|
Update Permission.php
Just switched the elements around for consistency with other parts of the code
|
diff --git a/spec/helper.rb b/spec/helper.rb
index <HASH>..<HASH> 100644
--- a/spec/helper.rb
+++ b/spec/helper.rb
@@ -1,9 +1,5 @@
+# encoding: utf-8
require 'simplecov'
-# HACK - couldn't get tests to run without this, simple cov barfed with the following error:
-# .../simplecov-0.5.4/lib/simplecov/source_file.rb:157:in `block in process_skipped_lines!': invalid byte sequence in US-ASCII #(ArgumentError)
-# I intend to find a better solution before making the pull request
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
SimpleCov.start
require 'twitter'
|
removing encoding hack on specs helper
|
diff --git a/webapi/webapi.go b/webapi/webapi.go
index <HASH>..<HASH> 100644
--- a/webapi/webapi.go
+++ b/webapi/webapi.go
@@ -83,7 +83,7 @@ func serveResults(w http.ResponseWriter, r *http.Request) {
URL: url,
Concurrency: 5,
TotalRequests: 1000,
- RequestTimeout: time.Duration(7),
+ RequestTimeout: time.Duration(5 * time.Second),
Regions: []string{"us-east-1"},
}
|
7 nanoseconds is just too small of a timeout
|
diff --git a/asap.js b/asap.js
index <HASH>..<HASH> 100644
--- a/asap.js
+++ b/asap.js
@@ -1,7 +1,6 @@
"use strict";
var rawAsap = require("./raw");
-var domain = require("domain");
var freeTasks = [];
/**
@@ -23,7 +22,7 @@ function asap(task) {
rawTask = new RawTask();
}
rawTask.task = task;
- rawTask.domain = domain.active;
+ rawTask.domain = process.domain;
rawAsap(rawTask);
}
|
Remove dependency on domain in asap
Per @rkatic. Thanks.
|
diff --git a/salt/utils/schedule.py b/salt/utils/schedule.py
index <HASH>..<HASH> 100644
--- a/salt/utils/schedule.py
+++ b/salt/utils/schedule.py
@@ -305,9 +305,9 @@ class Schedule(object):
else:
func = None
if func not in self.functions:
- log.info(
+ log.warn(
'Invalid function: {0} in job {1}. Ignoring.'.format(
- job, func
+ func, job
)
)
continue
|
A missing schedule function should be a "warn" rather than "info".
Fix the ordering of the fields in the message format.
|
diff --git a/src/main/java/com/stripe/param/checkout/SessionCreateParams.java b/src/main/java/com/stripe/param/checkout/SessionCreateParams.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/stripe/param/checkout/SessionCreateParams.java
+++ b/src/main/java/com/stripe/param/checkout/SessionCreateParams.java
@@ -3560,6 +3560,9 @@ public class SessionCreateParams extends ApiRequestParams {
}
public enum PaymentMethodType implements ApiRequestParams.EnumParam {
+ @SerializedName("alipay")
+ ALIPAY("alipay"),
+
@SerializedName("bacs_debit")
BACS_DEBIT("bacs_debit"),
|
Codegen for openapi cfb1c<I>
|
diff --git a/vendor/seahorse/lib/seahorse/client/configuration.rb b/vendor/seahorse/lib/seahorse/client/configuration.rb
index <HASH>..<HASH> 100644
--- a/vendor/seahorse/lib/seahorse/client/configuration.rb
+++ b/vendor/seahorse/lib/seahorse/client/configuration.rb
@@ -54,7 +54,7 @@ module Seahorse
# @api private
Defaults = Class.new(Array) do
def each(&block)
- reverse.each(&block)
+ reverse.to_a.each(&block)
end
end
|
Don't blow the stack on JRuby
The Defaults class was making an assumption about the return value of
Array#reverse that doesn't hold up on JRuby nor will it on Ruby <I>
once that comes out. Calling to_a after reverse ensures we have an
actual Array object so we don't recursively call the overridden each
method until things blow up.
|
diff --git a/ghost/admin/app/components/gh-post-settings-menu/email.js b/ghost/admin/app/components/gh-post-settings-menu/email.js
index <HASH>..<HASH> 100644
--- a/ghost/admin/app/components/gh-post-settings-menu/email.js
+++ b/ghost/admin/app/components/gh-post-settings-menu/email.js
@@ -125,6 +125,7 @@ export default Component.extend({
if (email.status === 'failed') {
throw new EmailFailedError(email.error);
}
+ pollTimeout += RETRY_EMAIL_POLL_LENGTH;
}
}
|
🐛 Fixed retry email not timing out on poll
no refs
Fixes a small bug in email retry logic meant we never timeout on polling for email retry while listening for the email status to see if it failed or submitted.
|
diff --git a/spec/features/payments_spec.rb b/spec/features/payments_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/features/payments_spec.rb
+++ b/spec/features/payments_spec.rb
@@ -37,11 +37,15 @@ feature 'Payments' do
expect(page).to have_content 'Successful transaction'
end
- scenario 'Fails to complete a transaction with an invalid credit card', js: true do
- fill_in 'card_number', with: '4111111111111112'
- click_button 'Submit'
-
- expect(page).to have_content 'Declined: One or more fields in the request contains invalid data'
- end
+ # TODO: this test is currently failing because it depends on cookies being set, and the way
+ # the tests are running right now, we end up on a different server for the /confirm page, so the
+ # cookies aren't there
+ # scenario 'Fails to complete a transaction with an invalid credit card', js: true do
+ # page.driver.browser.set_cookie("auth_token=#{auth_token_value}")
+ # fill_in 'card_number', with: '4111111111111112'
+ # click_button 'Submit'
+ #
+ # expect(page).to have_content 'Declined: One or more fields in the request contains invalid data'
+ # end
end
end
|
for now, comment out test for a failed transaction (see TODO comment)
|
diff --git a/lib/flt/support.rb b/lib/flt/support.rb
index <HASH>..<HASH> 100644
--- a/lib/flt/support.rb
+++ b/lib/flt/support.rb
@@ -681,7 +681,7 @@ module Flt
while i>=0
digits[i] += 1
if digits[i] == base
- digits[i] == 0
+ digits[i] = 0
else
break
end
|
Fix bug in Reader#adjusted_digits: round up was incorrect.
|
diff --git a/lib/active_scaffold/extensions/action_view_rendering.rb b/lib/active_scaffold/extensions/action_view_rendering.rb
index <HASH>..<HASH> 100644
--- a/lib/active_scaffold/extensions/action_view_rendering.rb
+++ b/lib/active_scaffold/extensions/action_view_rendering.rb
@@ -66,8 +66,8 @@ module ActionView::Rendering #:nodoc:
id = "as_#{eid}-content"
url_options = {:controller => remote_controller.to_s, :action => 'index'}.merge(options[:params])
- if respond_to? :render_component
- render_component url_options
+ if controller.respond_to?(:render_component_into_view)
+ controller.send(:render_component_into_view, url_options)
else
content_tag(:div, {:id => id}) do
url = url_for(url_options)
|
render_component is sometimes not available in views (reason still
unknown)
|
diff --git a/insights/specs/insights_archive.py b/insights/specs/insights_archive.py
index <HASH>..<HASH> 100644
--- a/insights/specs/insights_archive.py
+++ b/insights/specs/insights_archive.py
@@ -16,7 +16,7 @@ class InsightsArchiveSpecs(Specs):
brctl_show = simple_file("insights_commands/brctl_show")
ceph_df_detail = simple_file("insights_commands/ceph_df_detail_-f_json-pretty")
ceph_health_detail = simple_file("insights_commands/ceph_health_detail_-f_json-pretty")
- ceph_insights = simple_file("insights_commands/python_-m_insights.tools.cat_ceph_insights")
+ ceph_insights = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_ceph_insights")
ceph_osd_df = simple_file("insights_commands/ceph_osd_df_-f_json-pretty")
ceph_osd_dump = simple_file("insights_commands/ceph_osd_dump_-f_json-pretty")
ceph_osd_ec_profile_ls = simple_file("insights_commands/ceph_osd_erasure-code-profile_ls")
|
Fix insights archive spec for ceph_insights (#<I>)
|
diff --git a/lib/polisher/git/pkg.rb b/lib/polisher/git/pkg.rb
index <HASH>..<HASH> 100644
--- a/lib/polisher/git/pkg.rb
+++ b/lib/polisher/git/pkg.rb
@@ -105,15 +105,10 @@ module Polisher
end
# Update the local spec to the specified gem version
- #
- # FIXME this should be removed and calls replaced with self.spec.update_to(gem)
def update_spec_to(gem)
in_repo do
- replace_version = "s/Version.*/Version: #{gem.version}/"
- replace_release = "s/Release:.*/Release: 1%{?dist}/"
- [replace_version, replace_release].each do |replace|
- AwesomeSpawn.run "#{sed_cmd} -i '#{replace}' #{spec_file}"
- end
+ spec.update_to(gem)
+ File.write(spec_file, spec.to_string)
end
end
|
Use RPM::Spec#update to in git pkg update process
Resolves a long standing FIXME in the Git::Pkg module and removes
the dependency on the 'sed' cmd
|
diff --git a/PyFunceble/cli/continuous_integration/base.py b/PyFunceble/cli/continuous_integration/base.py
index <HASH>..<HASH> 100644
--- a/PyFunceble/cli/continuous_integration/base.py
+++ b/PyFunceble/cli/continuous_integration/base.py
@@ -1065,8 +1065,10 @@ class ContinuousIntegrationBase:
("git config --local push.default simple", False),
("git config --local pull.rebase false", False),
(f'git checkout "{self.git_branch}"', False),
+ ("git fetch origin", False),
(
- f'git pull origin "{self.git_distribution_branch}"',
+ f"git merge --strategy-option theirs "
+ f"origin/{self.git_distribution_branch}",
False,
),
]
@@ -1117,7 +1119,8 @@ class ContinuousIntegrationBase:
f'git checkout "{branch}"',
True,
),
- (f"git pull origin {branch}", True),
+ ("git fetch origin", True),
+ (f"git merge --strategy-option theirs origin/{branch}", True),
(f"git push origin {branch}", True),
]
)
|
Fix merging strategy.
This patch fixes #<I>.
Indeed, before this patch, the merging strategy was not explicit enough.
From now on, we explicitly merge every incoming changes.
Contributors:
* @spirillen
|
diff --git a/test/edge_collection_test.go b/test/edge_collection_test.go
index <HASH>..<HASH> 100644
--- a/test/edge_collection_test.go
+++ b/test/edge_collection_test.go
@@ -108,7 +108,7 @@ func TestRemoveEdgeCollection(t *testing.T) {
// Now create an edge collection
ec, err := g.CreateEdgeCollection(nil, "friends", []string{"person"}, []string{"person"})
if err != nil {
- t.Errorf("CreateEdgeCollection failed: %s", describe(err))
+ t.Fatalf("CreateEdgeCollection failed: %s", describe(err))
} else if ec.Name() != "friends" {
t.Errorf("Invalid name, expected 'friends', got '%s'", ec.Name())
}
|
Prevent panic incase an earlier test fails
|
diff --git a/lib/ruote/storage/composite_storage.rb b/lib/ruote/storage/composite_storage.rb
index <HASH>..<HASH> 100644
--- a/lib/ruote/storage/composite_storage.rb
+++ b/lib/ruote/storage/composite_storage.rb
@@ -62,16 +62,16 @@ module Ruote
if type == nil
define_method(method_name) do |*args|
- storage(args.first['type']).send(method_name, *args)
+ storage_for(args.first['type']).send(method_name, *args)
end
elsif type.is_a?(Fixnum)
define_method(method_name) do |*args|
- storage(args[type]).send(method_name, *args)
+ storage_for(args[type]).send(method_name, *args)
end
else
type = type.to_s
define_method(method_name) do |*args|
- storage(type).send(method_name, *args)
+ storage_for(type).send(method_name, *args)
end
end
end
@@ -102,7 +102,7 @@ module Ruote
#
def get_msgs(worker_name='worker')
- sto = storage('msgs')
+ sto = storage_for('msgs')
if sto.method(:get_msgs).arity == 0
sto.get_msgs
@@ -129,7 +129,7 @@ module Ruote
protected
- def storage(type)
+ def storage_for(type)
@storages[type] || @default_storage
end
|
The composite storage didn't actually seem to work in real life - when passed into a Worker, the worker always called 'storage' on it (because respond_to? will return true for protected methods even though it won't dispatch to them) which was failing. I renamed the protected method in the CompositeStorage to storage_for to avoid the conflict.
|
diff --git a/Integration/ClientIntegration.php b/Integration/ClientIntegration.php
index <HASH>..<HASH> 100644
--- a/Integration/ClientIntegration.php
+++ b/Integration/ClientIntegration.php
@@ -455,7 +455,7 @@ class ClientIntegration extends AbstractIntegration
$properties['_token'] === $config['_token']
&& $properties['campaignId'] === $config['campaignId']
) {
- $campaign = $leadEventLog->getCampaign();
+ $this->campaign = $leadEventLog->getCampaign();
break;
}
}
|
[ENG-<I>] Correct campaign finder.
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -37,6 +37,8 @@ release = '0.3.5'
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
+ 'matplotlib.sphinxext.only_directives',
+ 'matplotlib.sphinxext.plot_directive'
'sphinx.ext.autodoc',
'sphinx.ext.autosummary',
'sphinx.ext.doctest',
|
adding matplotlib to conf
|
diff --git a/examples/ebola.py b/examples/ebola.py
index <HASH>..<HASH> 100644
--- a/examples/ebola.py
+++ b/examples/ebola.py
@@ -33,7 +33,7 @@ if __name__ == '__main__':
aln = base_name+'.fasta', verbose = 4, dates = dates)
# infer an ebola time tree while rerooting and resolving polytomies
- ebola.run(root='best', relaxed_clock=False, max_iter=2,
+ ebola.run(root='best', relaxed_clock=False, max_iter=2, long_branch_mode=False,
resolve_polytomies=True, Tc='skyline', time_marginal="assign")
# scatter root to tip divergence vs sampling date
diff --git a/treetime/gtr.py b/treetime/gtr.py
index <HASH>..<HASH> 100644
--- a/treetime/gtr.py
+++ b/treetime/gtr.py
@@ -1,4 +1,3 @@
-
#!/usr/local/bin/python
# -*- coding: utf-8 -*-
from __future__ import division, print_function
|
disable long branch mode for ebola
|
diff --git a/src/Codeception/Lib/Driver/MongoDb.php b/src/Codeception/Lib/Driver/MongoDb.php
index <HASH>..<HASH> 100644
--- a/src/Codeception/Lib/Driver/MongoDb.php
+++ b/src/Codeception/Lib/Driver/MongoDb.php
@@ -95,7 +95,7 @@ class MongoDb
*/
public function __construct($dsn, $user, $password)
{
- $this->legacy = class_exists('\\MongoClient');
+ $this->legacy = class_exists('\\MongoClient') && strpos(\MongoClient::VERSION, 'mongofill') === false;
/* defining DB name */
$this->dbName = substr($dsn, strrpos($dsn, '/') + 1);
|
Mongofill support (#<I>)
|
diff --git a/lib/yard/registry.rb b/lib/yard/registry.rb
index <HASH>..<HASH> 100644
--- a/lib/yard/registry.rb
+++ b/lib/yard/registry.rb
@@ -20,7 +20,7 @@ module YARD
end
end
- def at(path) namespace[path] end
+ def at(path) path.to_s.empty? ? root : namespace[path] end
def root; namespace[:root] end
def delete(object) namespace.delete(object.path) end
def clear; initialize end
|
If #at() receives empty string, it belongs to root
|
diff --git a/a10_neutron_lbaas/etc/config.py b/a10_neutron_lbaas/etc/config.py
index <HASH>..<HASH> 100644
--- a/a10_neutron_lbaas/etc/config.py
+++ b/a10_neutron_lbaas/etc/config.py
@@ -35,6 +35,17 @@
# database_connection = None
+# Should only be set to true if projects have been created with
+# parent-child relationships within openstack.
+
+# use_parent_project = False
+
+#
+# Used to persist partitions upon deletion of lb objects
+#
+
+# disable_partition_delete = False
+
# Sometimes we need things from neutron. We will look in the usual places,
# but this is here if you need to override the location.
@@ -50,7 +61,9 @@
# keystone_auth_url = None
+#
# Which version of the keystone protocol to use
+#
# keystone_version = 2
|
Added config choice summaries
|
diff --git a/lib/socket.js b/lib/socket.js
index <HASH>..<HASH> 100644
--- a/lib/socket.js
+++ b/lib/socket.js
@@ -283,6 +283,8 @@ Socket.prototype.leaveAll = function(){
/**
* Called by `Namespace` upon successful
* middleware execution (ie: authorization).
+ * Socket is added to namespace array before
+ * call to join, so adapters can access it.
*
* @api private
*/
|
[docs] Comment connected socket availability for adapters (#<I>)
|
diff --git a/lib/jsduck/accessors.rb b/lib/jsduck/accessors.rb
index <HASH>..<HASH> 100644
--- a/lib/jsduck/accessors.rb
+++ b/lib/jsduck/accessors.rb
@@ -42,6 +42,7 @@ module JsDuck
:doc => "",
},
:owner => cfg[:owner],
+ :files => cfg[:files],
}
end
@@ -60,6 +61,7 @@ module JsDuck
:doc => "",
},
:owner => cfg[:owner],
+ :files => cfg[:files],
}
end
|
Fix files lists of @accessor created methods.
|
diff --git a/Command/ImportMappingDoctrineCommand.php b/Command/ImportMappingDoctrineCommand.php
index <HASH>..<HASH> 100644
--- a/Command/ImportMappingDoctrineCommand.php
+++ b/Command/ImportMappingDoctrineCommand.php
@@ -38,7 +38,7 @@ from an existing database:
Generate annotation mappings into the src/ directory using App as the namespace:
<info>php %command.full_name% App\\\Entity annotation --path=src/Entity</info>
-Generate annotation mappings into the config/doctrine/ directory using App as the namespace:
+Generate xml mappings into the config/doctrine/ directory using App as the namespace:
<info>php %command.full_name% App\\\Entity xml --path=config/doctrine</info>
Generate XML mappings into a bundle:
|
Describe the actual command
This is probably a copy/paste/adapt mistake.
|
diff --git a/lib/pairwise.rb b/lib/pairwise.rb
index <HASH>..<HASH> 100644
--- a/lib/pairwise.rb
+++ b/lib/pairwise.rb
@@ -10,7 +10,9 @@ require 'pairwise/input_file'
require 'pairwise/cli'
require 'yaml'
-YAML::ENGINE.yamler = 'syck'
+if RUBY_VERSION != '1.8.7'
+ YAML::ENGINE.yamler = 'syck'
+end
module Pairwise
class InvalidInputData < Exception; end
|
Exclude <I> from using the nicer yaml parser. Its breaks the build as it does not know what the parser is
|
diff --git a/app/models/devise_token_auth/concerns/user.rb b/app/models/devise_token_auth/concerns/user.rb
index <HASH>..<HASH> 100644
--- a/app/models/devise_token_auth/concerns/user.rb
+++ b/app/models/devise_token_auth/concerns/user.rb
@@ -165,6 +165,6 @@ module DeviseTokenAuth::Concerns::User
end
def set_empty_token_hash
- self.tokens ||= {}
+ self.tokens ||= {} if has_attribute?(:tokens)
end
end
|
guard against MissingAttributeError during common ActiveRecord operations
|
diff --git a/src/streamlink/stream/ffmpegmux.py b/src/streamlink/stream/ffmpegmux.py
index <HASH>..<HASH> 100644
--- a/src/streamlink/stream/ffmpegmux.py
+++ b/src/streamlink/stream/ffmpegmux.py
@@ -126,7 +126,7 @@ class FFMPEGMuxer(StreamIO):
for t in self.pipe_threads:
t.daemon = True
t.start()
- self.process = subprocess.Popen(self._cmd, stdout=subprocess.PIPE, stderr=self.errorlog)
+ self.process = subprocess.Popen(self._cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=self.errorlog)
return self
|
[ffmpegmux] Fixed bug of an invisible terminal
if a ffmpeg stream gets closed with ctrl + c the terminal will get
invisible,
this patch will fix it.
|
diff --git a/js/acx.js b/js/acx.js
index <HASH>..<HASH> 100644
--- a/js/acx.js
+++ b/js/acx.js
@@ -302,6 +302,7 @@ module.exports = class acx extends Exchange {
if (Object.keys (query).length)
url += '?' + this.urlencode (query);
} else {
+ this.checkRequiredCredentials ();
let nonce = this.nonce ().toString ();
let query = this.urlencode (this.keysort (this.extend ({
'access_key': this.apiKey,
|
acx checkRequiredCredentials #<I>
|
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
@@ -158,7 +158,7 @@ class RemoteFilesystem
$ctx = StreamContextFactory::getContext($fileUrl, $options, array('notification' => array($this, 'callbackGet')));
if ($this->progress) {
- $this->io->writeError(" Downloading: <comment>connection...</comment>", !$this->io->isDecorated());
+ $this->io->writeError(" Downloading: <comment>Connecting...</comment>", !$this->io->isDecorated());
}
$errorMessage = '';
|
Improved wording
All other verbs use are in the form of "doing something", ie Installing, Downloading. "connection" is the odd one out.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,11 +2,7 @@
# -*- coding: utf-8 -*-
# setup.py
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup
-
+from setuptools import setup
# Use a consistent encoding
from codecs import open
|
setup.py: Don't try to import `distutils`
|
diff --git a/resources/lang/pt-br/menu.php b/resources/lang/pt-br/menu.php
index <HASH>..<HASH> 100644
--- a/resources/lang/pt-br/menu.php
+++ b/resources/lang/pt-br/menu.php
@@ -16,4 +16,4 @@ return [
'Important' => 'Importante',
'Warning' => 'Aviso',
'Information' => 'Informação',
-]
+];
|
; at te end of file
|
diff --git a/src/prebid.js b/src/prebid.js
index <HASH>..<HASH> 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -467,6 +467,12 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
}
const auction = auctionManager.createAuction({adUnits, adUnitCodes, callback: bidsBackHandler, cbTimeout, labels});
+
+ let adUnitsLen = adUnits.length;
+ if (adUnitsLen > 15) {
+ utils.logInfo(`Current auction ${auction.getAuctionId()} contains ${adUnitsLen} adUnits.`, adUnits);
+ }
+
adUnitCodes.forEach(code => targeting.setLatestAuctionForAdUnit(code, auction.getAuctionId()));
auction.callBids();
return auction;
|
add console message when number of adunits exceeds point (#<I>)
* add console message when number of adunits exceeds point
* include additional information in log message
|
diff --git a/src/Behaviours/CamelCasing.php b/src/Behaviours/CamelCasing.php
index <HASH>..<HASH> 100644
--- a/src/Behaviours/CamelCasing.php
+++ b/src/Behaviours/CamelCasing.php
@@ -14,6 +14,18 @@ trait CamelCasing
public $enforceCamelCase = true;
/**
+ * Overloads the eloquent isGuardableColumn method to ensure that we are checking for the existence of
+ * the snake_cased column name.
+ *
+ * @param string $key
+ * @return bool
+ */
+ protected function isGuardableColumn($key)
+ {
+ return parent::isGuardableColumn($this->getSnakeKey($key));
+ }
+
+ /**
* Overloads the eloquent setAttribute method to ensure that fields accessed
* in any case are converted to snake_case, which is the defacto standard
* for field names in databases.
|
allow mass assignment of camelCased fields
|
diff --git a/examples/clear-space.py b/examples/clear-space.py
index <HASH>..<HASH> 100755
--- a/examples/clear-space.py
+++ b/examples/clear-space.py
@@ -26,6 +26,9 @@ import sys
import gphoto2 as gp
+# my Canon dSLR raises an error on every deletion, but still does it OK
+gp.error_severity[gp.GP_ERROR] = logging.WARNING
+
def list_files(camera, context, path='/'):
result = []
gp_list = gp.check_result(gp.gp_list_new())
|
Adjust error handling to work with my dSLR.
|
diff --git a/lib/error/serviceError.js b/lib/error/serviceError.js
index <HASH>..<HASH> 100644
--- a/lib/error/serviceError.js
+++ b/lib/error/serviceError.js
@@ -22,7 +22,7 @@ function ServiceError(context) {
ServiceError.buildFrom = function(err) {
var error = new ServiceError({
- info: err.message
+ message: err.message
});
error.stack = err.stack;
|
rename ServiceError "info" context property to "message" to preserve consistent API
|
diff --git a/wpull/version.py b/wpull/version.py
index <HASH>..<HASH> 100644
--- a/wpull/version.py
+++ b/wpull/version.py
@@ -6,4 +6,4 @@
A string conforming to `Semantic Versioning
Guidelines <http://semver.org/>`_
'''
-__version__ = '0.22.4'
+__version__ = '0.22.5'
|
Bumps version to <I>.
|
diff --git a/openxc/src/com/openxc/DataPipeline.java b/openxc/src/com/openxc/DataPipeline.java
index <HASH>..<HASH> 100644
--- a/openxc/src/com/openxc/DataPipeline.java
+++ b/openxc/src/com/openxc/DataPipeline.java
@@ -197,20 +197,30 @@ public class DataPipeline implements SourceCallback {
return mMessagesReceived;
}
+ public boolean isActive() {
+ return isActive(null);
+ }
+
+ /**
+ * Return true if at least one source is active.
+ */
+ public boolean isActive(VehicleDataSource skipSource) {
+ boolean connected = false;
+ for(VehicleDataSource s : mSources) {
+ if(s != skipSource) {
+ connected = connected || s.isConnected();
+ }
+ }
+ return connected;
+ }
+
/**
* At least one source is not active - if all sources are inactive, notify
* the operator.
*/
public void sourceDisconnected(VehicleDataSource source) {
if(mOperator != null) {
- boolean connected = false;
- for(VehicleDataSource s : mSources) {
- if(s != source) {
- connected = connected || s.isConnected();
- }
- }
-
- if(!connected) {
+ if(!isActive(source)) {
mOperator.onPipelineDeactivated();
}
}
|
Pull pipeline activity check up to a function.
|
diff --git a/src/hamster/widgets/activityentry.py b/src/hamster/widgets/activityentry.py
index <HASH>..<HASH> 100644
--- a/src/hamster/widgets/activityentry.py
+++ b/src/hamster/widgets/activityentry.py
@@ -209,6 +209,7 @@ class CmdLineEntry(gtk.Entry):
self.original_fact = None
self.popup = gtk.Window(type = gtk.WindowType.POPUP)
+ self.popup.set_type_hint(gdk.WindowTypeHint.COMBO)
self.popup.set_transient_for(self.get_ancestor(gtk.Window)) # position
self.popup.set_attached_to(self) # attributes
|
set cmdline popup type_hint
|
diff --git a/packages/orbit-components/src/InputStepper/InputStepperStateless/index.js b/packages/orbit-components/src/InputStepper/InputStepperStateless/index.js
index <HASH>..<HASH> 100644
--- a/packages/orbit-components/src/InputStepper/InputStepperStateless/index.js
+++ b/packages/orbit-components/src/InputStepper/InputStepperStateless/index.js
@@ -14,6 +14,7 @@ import type { StateLessProps } from "./index.js.flow";
const StyledInputStepper = styled.div`
width: 100%;
margin-bottom: ${getSpacingToken};
+ font-family: ${({ theme }) => theme.orbit.fontFamily};
${Input} {
text-align: center;
|
fix(InputStepper): missing font-family (#<I>)
|
diff --git a/autoload.php b/autoload.php
index <HASH>..<HASH> 100644
--- a/autoload.php
+++ b/autoload.php
@@ -7,10 +7,11 @@
*/
function odata_query_autoload($class) {
- $file = __DIR__.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, str_replace('-', '_', $class)).'.php';
+ $file = __DIR__.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.
+ str_replace('\\', DIRECTORY_SEPARATOR, str_replace('-', '_', $class)).'.php';
if (file_exists($file)) {
require_once $file;
}
}
-# Enable if composer autoload isn't available
-#spl_autoload_register('odata_query_autoload');
\ No newline at end of file
+
+spl_autoload_register('odata_query_autoload');
\ No newline at end of file
|
Updated autoload to use correct directory structure
|
diff --git a/lib/compiler/underscored.js b/lib/compiler/underscored.js
index <HASH>..<HASH> 100644
--- a/lib/compiler/underscored.js
+++ b/lib/compiler/underscored.js
@@ -33,7 +33,7 @@ function run(options) {
var streamliners = {
node: function (module, filename, code) {
var cachedTransform = require("streamline/lib/compiler/compile").cachedTransformSync;
- streamlined = cachedTransform(code, filename, streamline, options);
+ streamlined = options.cache ? cachedTransform(code, filename, streamline, options) : streamline(code, options);
module._compile(streamlined, filename)
},
coffee: function (module, filename, code) {
|
introduced cache option to control caching of transformed files
|
diff --git a/DataTables.php b/DataTables.php
index <HASH>..<HASH> 100644
--- a/DataTables.php
+++ b/DataTables.php
@@ -74,7 +74,9 @@ class DataTables extends \yii\grid\GridView
}
/**
- * Initializes the datatables widget
+ * Initializes the datatables widget disabling some GridView options like
+ * search, sort and pagination and using DataTables JS functionalities
+ * instead.
*/
public function init()
{
@@ -83,12 +85,15 @@ class DataTables extends \yii\grid\GridView
//disable filter model by grid view
$this->filterModel = null;
+ //disable sort by grid view
+ $this->dataProvider->sort = false;
+
+ //disable pagination by grid view
+ $this->dataProvider->pagination = false;
+
//layout showing only items
$this->layout = "{items}";
- //no grid view sort
- $this->dataProvider->sort = false;
-
//the table id must be set
if (!isset($this->tableOptions['id'])) {
$this->tableOptions['id'] = 'datatables_'.$this->getId();
|
Disabling GridView pagination by default
|
diff --git a/generators/service/templates/hooks.js b/generators/service/templates/hooks.js
index <HASH>..<HASH> 100644
--- a/generators/service/templates/hooks.js
+++ b/generators/service/templates/hooks.js
@@ -1,6 +1,7 @@
'use strict';
const globalHooks = require('../../../hooks');
+const hooks = require('feathers-hooks').hooks;
<% if (authentication) { %>const auth = require('feathers-authentication').hooks;<% } %>
exports.before = {
@@ -40,7 +41,7 @@ exports.before = {
};
exports.after = {
- all: [],
+ all: [<% if (name === 'user') { %>hooks.remove('password')<% } %>],
find: [],
get: [],
create: [],
|
adding remove password hook by default to user service
|
diff --git a/pnc_cli/makemead.py b/pnc_cli/makemead.py
index <HASH>..<HASH> 100644
--- a/pnc_cli/makemead.py
+++ b/pnc_cli/makemead.py
@@ -6,7 +6,7 @@ import time
from ConfigParser import Error
from ConfigParser import NoSectionError
-from argh import arg, aliases
+from argh import arg
import pnc_cli.utils as utils
from pnc_cli import bpmbuildconfigurations
|
[NCL-<I>] cleanup
|
diff --git a/anndata/tests/test_readwrite.py b/anndata/tests/test_readwrite.py
index <HASH>..<HASH> 100644
--- a/anndata/tests/test_readwrite.py
+++ b/anndata/tests/test_readwrite.py
@@ -1,5 +1,6 @@
+import sys
from importlib.util import find_spec
-from pathlib import Path
+from pathlib import Path, PurePath
import numpy as np
import pandas as pd
@@ -11,6 +12,15 @@ import anndata as ad
HERE = Path(__file__).parent
+if sys.version_info < (3, 6):
+ from _pytest.tmpdir import _mk_tmp # noqa
+
+ # On 3.5 this is pathlib2, which won’t work.
+ @pytest.fixture
+ def tmp_path(request, tmp_path_factory):
+ return Path(str(_mk_tmp(request, tmp_path_factory)))
+
+
# -------------------------------------------------------------------------------
# Some test data
# -------------------------------------------------------------------------------
|
Try fixing tests for <I>
|
diff --git a/src/main/java/com/hp/autonomy/hod/client/api/resource/ResourceFlavour.java b/src/main/java/com/hp/autonomy/hod/client/api/resource/ResourceFlavour.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/hp/autonomy/hod/client/api/resource/ResourceFlavour.java
+++ b/src/main/java/com/hp/autonomy/hod/client/api/resource/ResourceFlavour.java
@@ -79,6 +79,7 @@ public class ResourceFlavour implements Serializable {
CATEGORIZATION,
CUSTOM_FIELDS,
QUERY_MANIPULATION,
+ JUMBO,
WEB_CLOUD,
FILESYSTEM_ONSITE
));
|
[CCUK-<I>] Add Jumbo to set of all flavours
|
diff --git a/openquake/calculators/tests/gmf_ebrisk_test.py b/openquake/calculators/tests/gmf_ebrisk_test.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/tests/gmf_ebrisk_test.py
+++ b/openquake/calculators/tests/gmf_ebrisk_test.py
@@ -127,6 +127,6 @@ class GmfEbRiskTestCase(CalculatorTestCase):
# compare the event loss table generated by an event_based_risk
# case_master calculation with an equivalent gmf_ebrisk calculation
f0 = writetmp(view('elt', calc0))
- self.assertEqualFiles('expected/elt.txt', f0)
+ self.assertEqualFiles('expected/elt.txt', f0, delta=1E-5)
f2 = writetmp(view('elt', calc2))
- self.assertEqualFiles('expected/elt.txt', f2)
+ self.assertEqualFiles('expected/elt.txt', f2, delta=1E-5)
|
Added tolerance [skip hazardlib]
|
diff --git a/api/app/app.go b/api/app/app.go
index <HASH>..<HASH> 100644
--- a/api/app/app.go
+++ b/api/app/app.go
@@ -48,6 +48,7 @@ type App struct {
State string
Units []Unit
Teams []string
+ ec2Auth authorizer
}
type Log struct {
@@ -270,8 +271,8 @@ func deployHookAbsPath(p string) (string, error) {
}
/*
-* Returns app.conf located at app's git repository
- */
+ Returns app.conf located at app's git repository
+*/
func (a *App) conf() (conf, error) {
var c conf
uRepo, err := repository.GetPath()
|
api/app: simplify doc
Who is the java programmer responsible for that? :)
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -12,10 +12,19 @@ fs.readdirSync(__dirname + '/middleware').forEach(function (filename) {
});
exports.defaults = function (app, overrides) {
+ if (typeof app.use !== 'function') {
+ overrides = app;
+ try { // make sub-app, in likeliest framework(s)
+ app = require('express')();
+ } catch (e) {
+ app = require('connect')();
+ }
+ }
overrides = overrides || {csp: false};
middleware.forEach(function _eachMiddleware(m) {
if (overrides[m] !== false) {
app.use(require('./middleware/' + m)());
}
});
+ return app;
};
|
Support helmet.defaults() as middleware, fixes #<I>
Here's a simple way to support both the old and more conventional middleware-like usage of `helmet.defaults()`.
NOTE: there's one caveat in that the user *must* be using (i.e. have installed) either 'express' or 'connect' themselves but that seemed a reasonable enough assumption, eh?
|
diff --git a/dev/LogEmailWriter.php b/dev/LogEmailWriter.php
index <HASH>..<HASH> 100644
--- a/dev/LogEmailWriter.php
+++ b/dev/LogEmailWriter.php
@@ -24,6 +24,10 @@ class SS_LogEmailWriter extends Zend_Log_Writer_Abstract {
$this->emailAddress = $emailAddress;
$this->customSmtpServer = $customSmtpServer;
}
+
+ static function factory($emailAddress, $customSmtpServer = false) {
+ return new SS_LogEmailWriter($emailAddress, $customSmtpServer);
+ }
public static function set_send_from($address) {
self::$send_from = $address;
diff --git a/dev/LogFileWriter.php b/dev/LogFileWriter.php
index <HASH>..<HASH> 100644
--- a/dev/LogFileWriter.php
+++ b/dev/LogFileWriter.php
@@ -43,6 +43,10 @@ class SS_LogFileWriter extends Zend_Log_Writer_Abstract {
$this->messageType = $messageType;
$this->extraHeaders = $extraHeaders;
}
+
+ static function factory($path, $messageType = 3, $extraHeaders = '') {
+ return new SS_LogFileWriter($path, $messageType, $extraHeaders);
+ }
/**
* Write the log message to the file path set
|
MINOR Fixed SS_LogEmailWriter and SS_LogFileWriter to adhere to new Zend interface
|
diff --git a/tests/test_networkmanager.py b/tests/test_networkmanager.py
index <HASH>..<HASH> 100644
--- a/tests/test_networkmanager.py
+++ b/tests/test_networkmanager.py
@@ -538,7 +538,7 @@ class TestNetworkManager(dbusmock.DBusTestCase):
self.assertEqual(self.settings.GetConnectionByUuid(uuid), connectionPath)
fakeuuid = '123123123213213'
- with self.assertRaisesRegexp(dbus.exceptions.DBusException, ".*uuid.*%s$" % fakeuuid):
+ with self.assertRaisesRegex(dbus.exceptions.DBusException, ".*uuid.*%s$" % fakeuuid):
self.settings.GetConnectionByUuid(fakeuuid)
|
test: Fix deprecated assertRaisesRegexp() call
|
diff --git a/lib/SauceBrowser.js b/lib/SauceBrowser.js
index <HASH>..<HASH> 100644
--- a/lib/SauceBrowser.js
+++ b/lib/SauceBrowser.js
@@ -10,6 +10,7 @@ function SauceBrowser(conf, opt) {
};
var self = this;
+ self._retries = 0;
self._conf = conf;
self._opt = opt;
self._opt.tunnel = true;
@@ -122,9 +123,11 @@ SauceBrowser.prototype.shutdown = function(err) {
if (err) {
// if the environment can't be set up, we should retry since Zuul will
// never try to initialize environments that don't exist
- if (~err.message.indexOf('Error response status: 13')
- || ~err.message.indexOf('The environment you requested was unavailable')
- || (err.message == 'Not JSON response' && ~err.data.indexOf('not in progress'))) {
+ if (self._retries < 3
+ && (~err.message.indexOf('Error response status: 13')
+ || ~err.message.indexOf('The environment you requested was unavailable')
+ || (err.message == 'Not JSON response' && ~err.data.indexOf('not in progress')))) {
+ self._retries++;
return self.start();
}
self.emit('error', err);
|
Added a retry threshold of three (3) to retrying on errors indicating that environments can't be instantiated so that we won't end up looping forever by mistake.
|
diff --git a/src/Caouecs/Sirtrevorjs/Controller/SirTrevorJsController.php b/src/Caouecs/Sirtrevorjs/Controller/SirTrevorJsController.php
index <HASH>..<HASH> 100644
--- a/src/Caouecs/Sirtrevorjs/Controller/SirTrevorJsController.php
+++ b/src/Caouecs/Sirtrevorjs/Controller/SirTrevorJsController.php
@@ -9,7 +9,7 @@
namespace Caouecs\Sirtrevorjs\Controller;
use Config;
-use Controller;
+use App\Http\Controllers\Controller;
use Input;
use Thujohn\Twitter\TwitterFacade as Tweet;
|
feature: controller of Laravel 5
|
diff --git a/spec/lib/stellar/key_pair_spec.rb b/spec/lib/stellar/key_pair_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/stellar/key_pair_spec.rb
+++ b/spec/lib/stellar/key_pair_spec.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
require "spec_helper"
describe Stellar::KeyPair do
|
Fix specs for <I> by marking file encoding as utf-8
|
diff --git a/symphony/lib/core/class.exceptionhandler.php b/symphony/lib/core/class.exceptionhandler.php
index <HASH>..<HASH> 100644
--- a/symphony/lib/core/class.exceptionhandler.php
+++ b/symphony/lib/core/class.exceptionhandler.php
@@ -111,6 +111,8 @@ final class ExceptionHandler
$exception_type = get_class($e);
+ // TODO: @deprecated @since Symphony 3.0.0
+ // Use Renderer instead
if (class_exists("{$exception_type}Handler") && method_exists("{$exception_type}Handler", 'render')) {
$class = "{$exception_type}Handler";
} elseif (class_exists("{$exception_type}Renderer") && method_exists("{$exception_type}Renderer", 'render')) {
|
Deprecated {$exception_type}Handler
Picked from <I>be<I>cda6
Picked from <I>a<I>fad
|
diff --git a/dev/Backtrace.php b/dev/Backtrace.php
index <HASH>..<HASH> 100644
--- a/dev/Backtrace.php
+++ b/dev/Backtrace.php
@@ -159,7 +159,7 @@ class SS_Backtrace {
*/
static function get_rendered_backtrace($bt, $plainText = false, $ignoredFunctions = null) {
$bt = self::filter_backtrace($bt, $ignoredFunctions);
- $result = "<ul>";
+ $result = ($plainText) ? '' : '<ul>';
foreach($bt as $item) {
if($plainText) {
$result .= self::full_func_name($item,true) . "\n";
@@ -177,7 +177,7 @@ class SS_Backtrace {
$result .= "</li>\n";
}
}
- $result .= "</ul>";
+ if(!$plainText) $result .= '</ul>';
return $result;
}
|
BUGFIX If SS_Backtrace::get_rendered_backtrace() has $plainText argument
to TRUE, ensure there is no HTML in the output.
|
diff --git a/category_encoders/binary.py b/category_encoders/binary.py
index <HASH>..<HASH> 100644
--- a/category_encoders/binary.py
+++ b/category_encoders/binary.py
@@ -118,6 +118,9 @@ class BinaryEncoder(BaseEstimator, TransformerMixin):
)
self.ordinal_encoder = self.ordinal_encoder.fit(X)
+ for col in self.cols:
+ self.digits_per_col[col] = self.calc_required_digits(X, col)
+
# drop all output columns with 0 variance.
if self.drop_invariant:
self.drop_cols = []
@@ -125,8 +128,6 @@ class BinaryEncoder(BaseEstimator, TransformerMixin):
self.drop_cols = [x for x in X_temp.columns.values if X_temp[x].var() <= 10e-5]
- for col in self.cols:
- self.digits_per_col[col] = self.calc_required_digits(X, col)
return self
|
In binary.py fixed small. The number of required digits must be calculated before dropping invariant columns
|
diff --git a/tests/TestWireless.py b/tests/TestWireless.py
index <HASH>..<HASH> 100644
--- a/tests/TestWireless.py
+++ b/tests/TestWireless.py
@@ -2,7 +2,7 @@
import unittest
from wireless import Wireless
-from wireless import cmd
+from wireless.Wireless import cmd
class TestWireless(unittest.TestCase):
|
I should run my own tests before commiting. This one testing cmd passes now
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -682,7 +682,6 @@ function Device(atemIpAddress){
this.on('InPr', function(d) {
const sourceID = d.readUInt16BE(0);
- const sourceInfo = lookupSourceID(sourceID);
const longName = parseString(d.slice(2,22));
const shortName = parseString(d.slice(22, 26));
@@ -696,13 +695,12 @@ function Device(atemIpAddress){
* @event Device#sourceConfiguration
* @property {SourceID} sourceID the identifier of the source
* @property {SourceConfiguration} sourceConfiguration the new configuration of the source
- * @property {Object} sourceInfo
*/
atem.emit('sourceConfiguration', sourceID, {
name: longName,
abbreviation: shortName,
'videoInterface': videoInterface
- }, sourceInfo);
+ });
});
this.on('TlIn', function(d) {
@@ -1015,5 +1013,6 @@ Command.prototype.serialize = function() {
Device.ConnectionState = ConnectionState;
+Device.getSourceInfo = lookupSourceID;
module.exports = Device;
\ No newline at end of file
|
make lookupSourceID public
lookupSourceID can now be used via Device.getSourceInfo().
|
diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/ORM/QueryTest.php
+++ b/tests/TestCase/ORM/QueryTest.php
@@ -552,7 +552,10 @@ class QueryTest extends TestCase
TableRegistry::get('ArticlesTags', [
'table' => 'articles_tags'
]);
- $table->belongsToMany('Tags', ['strategy' => $strategy]);
+ $table->belongsToMany('Tags', [
+ 'strategy' => $strategy,
+ 'sort' => 'tag_id'
+ ]);
$query = new Query($this->connection, $table);
$results = $query->select()->contain('Tags')->hydrate(false)->toArray();
@@ -3112,6 +3115,7 @@ class QueryTest extends TestCase
$results = $table->find()
->hydrate(false)
->notMatching('articles')
+ ->order(['authors.id'])
->toArray();
$expected = [
@@ -3125,6 +3129,7 @@ class QueryTest extends TestCase
->notMatching('articles', function ($q) {
return $q->where(['articles.author_id' => 1]);
})
+ ->order(['authors.id'])
->toArray();
$expected = [
['id' => 2, 'name' => 'nate'],
|
Fixed undefined dataset ordering in tests.
|
diff --git a/Neos.Flow/Classes/Cli/ConsoleOutput.php b/Neos.Flow/Classes/Cli/ConsoleOutput.php
index <HASH>..<HASH> 100644
--- a/Neos.Flow/Classes/Cli/ConsoleOutput.php
+++ b/Neos.Flow/Classes/Cli/ConsoleOutput.php
@@ -138,13 +138,17 @@ class ConsoleOutput
*
* @param array $rows
* @param array $headers
+ * @param string $headerTitle
*/
- public function outputTable(array $rows, array $headers = null): void
+ public function outputTable(array $rows, array $headers = null, string $headerTitle = null): void
{
$table = $this->getTable();
if ($headers !== null) {
$table->setHeaders($headers);
}
+ if ($headerTitle !== null) {
+ $table->setHeaderTitle($headerTitle);
+ }
$table->setRows($rows);
$table->render();
}
|
TASK: Support header title for table output in console
|
diff --git a/bcbio/srna/umis.py b/bcbio/srna/umis.py
index <HASH>..<HASH> 100644
--- a/bcbio/srna/umis.py
+++ b/bcbio/srna/umis.py
@@ -47,8 +47,8 @@ def umi_transform(data):
return data
else:
logger.error("No UMI transform was specified, but %s does not look "
- "pre-transformed." % fq1)
- sys.exit(1)
+ "pre-transformed. Assuming non-umi data." % fq1)
+ return data
if file_exists(transform):
transform_file = transform
|
sRNA:skip if non-umi assigned.
|
diff --git a/lib/wwtd.rb b/lib/wwtd.rb
index <HASH>..<HASH> 100644
--- a/lib/wwtd.rb
+++ b/lib/wwtd.rb
@@ -119,10 +119,9 @@ module WWTD
rvm = "rvm #{config["rvm"]} do " if config["rvm"]
if wants_bundle
- lock.flock(File::LOCK_EX) do
- default_bundler_args = (File.exist?("#{gemfile || DEFAULT_GEMFILE}.lock") ? "--deployment" : "")
- bundle_command = "#{rvm}bundle install #{config["bundler_args"] || default_bundler_args}"
- return false unless sh "#{bundle_command.strip} --quiet"
+ flock(lock) do
+ bundle_command = "#{rvm}bundle install #{config["bundler_args"] || "--deployment"}"
+ return false unless sh "#{bundle_command.strip} --quiet --path vendor/bundle"
end
end
@@ -134,6 +133,13 @@ module WWTD
end
end
+ def flock(file)
+ file.flock(File::LOCK_EX)
+ yield
+ ensure
+ file.flock(File::LOCK_UN)
+ end
+
# http://grosser.it/2010/12/11/sh-without-rake/
def sh(cmd)
puts cmd
|
proper locking + lock files will always be there since we are local
|
diff --git a/src/ai/backend/common/etcd.py b/src/ai/backend/common/etcd.py
index <HASH>..<HASH> 100644
--- a/src/ai/backend/common/etcd.py
+++ b/src/ai/backend/common/etcd.py
@@ -31,7 +31,11 @@ quote = functools.partial(_quote, safe='')
def make_dict_from_pairs(key_prefix, pairs, path_sep='/'):
result = {}
len_prefix = len(key_prefix)
- for k, v in pairs:
+ if isinstance(pairs, dict):
+ iterator = pairs.items()
+ else:
+ iterator = pairs
+ for k, v in iterator:
if not k.startswith(key_prefix):
continue
subkey = k[len_prefix:]
|
Support dict as input in make_dict_from_pairs
|
diff --git a/models/Model.php b/models/Model.php
index <HASH>..<HASH> 100644
--- a/models/Model.php
+++ b/models/Model.php
@@ -362,7 +362,7 @@ class Model implements ArrayAccess, Iterator
foreach($this->belongsTo as $belongsTo)
{
$description["belongs_to"][] = $belongsTo;
- $fieldName = strtolower(Ntentan::singular($belongsTo)) . "_id";
+ $fieldName = strtolower(Ntentan::singular($this->getBelongsTo($belongsTo))) . "_id";
foreach($description["fields"] as $i => $field)
{
if($field["name"] == $fieldName)
@@ -391,6 +391,7 @@ class Model implements ArrayAccess, Iterator
}
$this->_description = $description;
}
+
return $this->_description;
}
|
Fixed an issue with the belongsTo relationships
|
diff --git a/media/boom/js/boom.chunk.js b/media/boom/js/boom.chunk.js
index <HASH>..<HASH> 100755
--- a/media/boom/js/boom.chunk.js
+++ b/media/boom/js/boom.chunk.js
@@ -683,7 +683,7 @@ $.widget('ui.chunkAsset', $.ui.chunk, {
$.boom.loader.show();
- var data = ( link.url && link.url != '' ) ? { asset_id : rid, link : link.url } : { asset_id : rid };
+ var data = { asset_id : rid, link : link.url } ;
self._preview( data )
.done( function( data ){
|
bugfix – asset chunk broke the chunk controller
|
diff --git a/check.go b/check.go
index <HASH>..<HASH> 100644
--- a/check.go
+++ b/check.go
@@ -91,6 +91,9 @@ func (c Check) String() string {
// Finish ends the check, prints its output (to stdout), and exits with
// the correct status.
func (c *Check) Finish() {
+ if r := recover(); r != nil {
+ c.Exitf(CRITICAL, "check panicked: %v", r)
+ }
if len(c.results) == 0 {
c.AddResult(UNKNOWN, "no check result specified")
}
|
recover() in Check.Finish()
|
diff --git a/src/main/java/net/fortuna/ical4j/model/TimeZoneLoader.java b/src/main/java/net/fortuna/ical4j/model/TimeZoneLoader.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/fortuna/ical4j/model/TimeZoneLoader.java
+++ b/src/main/java/net/fortuna/ical4j/model/TimeZoneLoader.java
@@ -30,7 +30,8 @@ public class TimeZoneLoader {
private static final String TZ_CACHE_IMPL = "net.fortuna.ical4j.timezone.cache.impl";
- private static final String DEFAULT_TZ_CACHE_IMPL = "net.fortuna.ical4j.util.JCacheTimeZoneCache";
+ // Use the Map-based TimeZoneCache by default
+ private static final String DEFAULT_TZ_CACHE_IMPL = "net.fortuna.ical4j.util.MapTimeZoneCache";
private static final String MESSAGE_MISSING_DEFAULT_TZ_CACHE_IMPL = "Error loading default cache implementation. Please ensure the JCache API dependency is included in the classpath, or override the cache implementation (e.g. via configuration: net.fortuna.ical4j.timezone.cache.impl=net.fortuna.ical4j.util.MapTimeZoneCache)";
|
Change default implementation of TimeZoneCache
The Map-based TimeZoneCache-Implementation will be used by default now.
Set SystemProperty net.fortuna.ical4j.timezone.cache.impl to
"net.fortuna.ical4j.util.JCacheTimeZoneCache" and provide a
JCache-Implentation in the classpath to use JCache.
|
diff --git a/fuse.py b/fuse.py
index <HASH>..<HASH> 100644
--- a/fuse.py
+++ b/fuse.py
@@ -17,7 +17,6 @@ try:
except:
pass
-from string import join
import sys
import os
from errno import *
@@ -317,7 +316,6 @@ class FuseOptParse(SubbedOptParse):
def print_help(self, file=sys.stderr):
SubbedOptParse.print_help(self, file)
- print(file=file)
self.fuse_args.setmod('showhelp')
def print_version(self, file=sys.stderr):
|
Remove some <I> incompatibilities
|
diff --git a/userena/contrib/umessages/views.py b/userena/contrib/umessages/views.py
index <HASH>..<HASH> 100644
--- a/userena/contrib/umessages/views.py
+++ b/userena/contrib/umessages/views.py
@@ -47,6 +47,7 @@ class MessageDetailListView(ListView):
def get_context_data(self, **kwargs):
context = super(MessageDetailListView, self).get_context_data(**kwargs)
context['recipient'] = self.recipient
+ return context
def get_queryset(self):
username = self.kwargs['username']
|
Fixed small but deadly bug in new class-based views.
|
diff --git a/classes/PodsInit.php b/classes/PodsInit.php
index <HASH>..<HASH> 100644
--- a/classes/PodsInit.php
+++ b/classes/PodsInit.php
@@ -275,13 +275,16 @@ class PodsInit {
);
// WP needs something, if this was empty and none were enabled, it would show title+editor :(
- $cpt_supports = array( '_bug_fix_for_wp' );
+ $cpt_supports = array();
foreach ( $cpt_supported as $cpt_support => $supported ) {
if ( true === $supported )
$cpt_supports[] = $cpt_support;
}
+ if ( empty( $cpt_supports ) )
+ $cpt_supports = false;
+
// Rewrite
$cpt_rewrite = pods_var( 'rewrite', $post_type, true );
$cpt_rewrite_array = array(
|
Update Post Type 'supports' to support the new false check I patched in WP <I> :)
<URL>
|
diff --git a/FlowCytometryTools/GUI/gui.py b/FlowCytometryTools/GUI/gui.py
index <HASH>..<HASH> 100755
--- a/FlowCytometryTools/GUI/gui.py
+++ b/FlowCytometryTools/GUI/gui.py
@@ -99,8 +99,9 @@ class FCGUI(object):
if filepath is not None and measurement is not None:
raise ValueError('You can only specify either filepath or measurement, but not both.')
- self.app = wx.PySimpleApp(0)
- wx.InitAllImageHandlers()
+ #self.app = wx.PySimpleApp(0)
+ self.app = wx.App(False)
+ #wx.InitAllImageHandlers()
self.main = GUIEmbedded(None, -1, "")
self.app.SetTopWindow(self.main)
if filepath is not None:
|
Removing deprecated wx calls
|
diff --git a/Changelog.md b/Changelog.md
index <HASH>..<HASH> 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,7 @@
-## master
+## 0.5.2
+- Fix bug with query logging
+
+## 0.5.1
- Fix whitespace around operators
- Add `Relation#from` method to redefine series
- Handle nil values for tags in #where clause
diff --git a/lib/influxer/rails/client.rb b/lib/influxer/rails/client.rb
index <HASH>..<HASH> 100644
--- a/lib/influxer/rails/client.rb
+++ b/lib/influxer/rails/client.rb
@@ -3,7 +3,7 @@ module Influxer
# - Add cache support for queries
class Client
def query(sql, options = {})
- log(sql) do
+ log_sql(sql) do
if !options.fetch(:cache, true) || Influxer.config.cache == false
super(sql, options)
else
@@ -12,7 +12,7 @@ module Influxer
end
end
- def log(sql)
+ def log_sql(sql)
return yield unless logger.debug?
start_ts = Time.now
diff --git a/lib/influxer/version.rb b/lib/influxer/version.rb
index <HASH>..<HASH> 100644
--- a/lib/influxer/version.rb
+++ b/lib/influxer/version.rb
@@ -1,3 +1,3 @@
module Influxer # :nodoc:
- VERSION = "0.5.1".freeze
+ VERSION = "0.5.2".freeze
end
|
Fix query logging (use separate log function); use Rails.logger as InfluxDB logger
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,8 @@ info = textwrap.dedent(
"""
)
-IS_PYTHON2 = sys.version_info < (3, 0)
+if sys.version_info < (3, 4):
+ sys.exit("Shoebot requires python 3.4 or higher.")
# the following libraries will not be installed
EXCLUDE_LIBS = ["lib/sbopencv", "lib/sbopencv/blobs"]
@@ -119,12 +120,8 @@ datafiles.extend(
]
)
-if IS_PYTHON2:
- PYCAIRO = "pycairo>=1.17.0"
- PYGOBJECT = "pygobject>=3.32"
-else:
- PYCAIRO = "pycairo>=1.18.1"
- PYGOBJECT = "pygobject>=3.32.1"
+PYCAIRO = "pycairo>=1.18.1"
+PYGOBJECT = "pygobject>=3.32.1"
# Also requires one of 'vext.gi' or 'pgi' to run in GUI
BASE_REQUIREMENTS = [
"setuptools>=18.8",
|
Update setup.py (#<I>)
Remove python 2 support from setup.py.
Specify python <I> so that pathlib can be used.
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -100,6 +100,7 @@ html_theme = 'nature-mod'
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
+sys.path.append(os.path.abspath('_themes'))
html_theme_path = ['_themes']
# The name for this set of Sphinx documents. If None, it defaults to
|
Add _themes to path.
|
diff --git a/ryu/tests/unit/ofproto/test_parser_v10.py b/ryu/tests/unit/ofproto/test_parser_v10.py
index <HASH>..<HASH> 100644
--- a/ryu/tests/unit/ofproto/test_parser_v10.py
+++ b/ryu/tests/unit/ofproto/test_parser_v10.py
@@ -46,7 +46,7 @@ class TestOFPPhyPort(unittest.TestCase):
buf = port_no['buf'] \
+ addrconv.mac.text_to_bin(hw_addr) \
- + str.encode(name, 'ascii') \
+ + name \
+ config['buf'] \
+ state['buf'] \
+ curr['buf'] \
@@ -2304,7 +2304,7 @@ class TestOFPTableStats(unittest.TestCase):
buf = table_id['buf'] \
+ zfill \
- + str.encode(name, 'ascii') \
+ + name \
+ wildcards['buf'] \
+ max_entries['buf'] \
+ active_count['buf'] \
|
python3: Don't use str.encode
This commit partially reverts b<I>fedc<I>cb0c9c3fe<I>fc2d2f<I>b7fc<I>f8.
This kind of change complicates assertion checks below.
|
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/strategy/LazyFromSourcesSchedulingStrategy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/strategy/LazyFromSourcesSchedulingStrategy.java
index <HASH>..<HASH> 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/strategy/LazyFromSourcesSchedulingStrategy.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/strategy/LazyFromSourcesSchedulingStrategy.java
@@ -102,6 +102,7 @@ public class LazyFromSourcesSchedulingStrategy implements SchedulingStrategy {
final Set<SchedulingExecutionVertex> verticesToSchedule = schedulingTopology.getVertexOrThrow(executionVertexId)
.getProducedResultPartitions()
.stream()
+ .filter(partition -> partition.getPartitionType().isBlocking())
.flatMap(partition -> inputConstraintChecker.markSchedulingResultPartitionFinished(partition).stream())
.flatMap(partition -> partition.getConsumers().stream())
.collect(Collectors.toSet());
|
[hotfix][runtime] Pipelined partition consumers should not be scheduled in LazyFromSourcesSchedulingStrategy#onExecutionStateChange
The pipelined partition consumers should be already scheduled in
LazyFromSourcesSchedulingStrategy#onPartitionConsumable.
|
diff --git a/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go b/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go
index <HASH>..<HASH> 100644
--- a/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go
+++ b/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go
@@ -52,6 +52,7 @@ func runControlPlane() func(c workflow.RunData) error {
// if this is not a control-plande node, this phase should not be executed
if !data.IsControlPlaneNode() {
fmt.Printf("[upgrade] Skipping phase. Not a control plane node")
+ return nil
}
// otherwise, retrieve all the info required for control plane upgrade
|
kubeadm: fix conditional control-plane upgrade
When a node is not a control-plane properly skip "control-plane"
upgrade phase.
|
diff --git a/test/median_test.rb b/test/median_test.rb
index <HASH>..<HASH> 100644
--- a/test/median_test.rb
+++ b/test/median_test.rb
@@ -55,6 +55,24 @@ class MedianTest < Minitest::Test
assert_equal expected, User.group(:name).group(:visits_count).median(:rating)
end
+ def test_order
+ skip if mongoid?
+
+ User.create!(visits_count: 2)
+ assert 2, User.order(:created_at).average(:visits_count)
+ # assert 2, User.order(:created_at).median(:visits_count)
+ end
+
+ def test_group_order
+ skip if mongoid?
+
+ [1, 2, 3, 4, 5, 6].each { |n| User.create!(visits_count: n, name: n < 4 ? "A" : "B") }
+ assert_equal "A", User.group(:name).order(:name).average(:visits_count).keys.first
+ assert_equal "B", User.group(:name).order("average_visits_count desc").average(:visits_count).keys.first
+ # assert_equal "A", User.group(:name).order(:name).median(:visits_count).keys.first
+ # assert_equal "B", User.group(:name).order("median_visits_count desc").median(:visits_count).keys.first
+ end
+
def test_expression
skip if mongoid?
|
Added order tests - #<I>
|
diff --git a/plugins/init/Backdrop.civi-setup.php b/plugins/init/Backdrop.civi-setup.php
index <HASH>..<HASH> 100644
--- a/plugins/init/Backdrop.civi-setup.php
+++ b/plugins/init/Backdrop.civi-setup.php
@@ -33,7 +33,7 @@ if (!defined('CIVI_SETUP')) {
$cmsPath = $object->cmsRootPath();
// Compute settingsPath.
- $model->settingsPath = $cmsPath . DIRECTORY_SEPARATOR . 'civicrm.settings.php';
+ $model->settingsPath = $cmsPath . DIRECTORY_SEPARATOR . 'civicrm.settings.php';
$model->templateCompilePath = 'FIXME';
|
(NFC) Update to current style guidelines (plugins/init/Backdrop.civi-setup.php)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.