diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/config/config.php b/config/config.php index <HASH>..<HASH> 100644 --- a/config/config.php +++ b/config/config.php @@ -69,6 +69,11 @@ return [ 'tinymce' => '//tinymce.cachefly.net/4.2/tinymce.min.js', ] ], + + // Checkable + 'checkable' => [ + 'span' => true + ], // TinyMCE configuration 'tinymce' => [ diff --git a/src/Controls/Checkable.php b/src/Controls/Checkable.php index <HASH>..<HASH> 100644 --- a/src/Controls/Checkable.php +++ b/src/Controls/Checkable.php @@ -110,6 +110,8 @@ class Checkable extends Field 'checked' => $this->binder()->checked($this->key($this->name), $this->value, $this->checked) ])); } + + $content .= config('fluentform.checkable.span') ? $this->html()->tag('span') : ''; if (!empty($this->getLabel())) {
Added configurable span element for checkables.
diff --git a/test/unit/Reflection/Exception/InvalidConstantNodeTest.php b/test/unit/Reflection/Exception/InvalidConstantNodeTest.php index <HASH>..<HASH> 100644 --- a/test/unit/Reflection/Exception/InvalidConstantNodeTest.php +++ b/test/unit/Reflection/Exception/InvalidConstantNodeTest.php @@ -15,9 +15,9 @@ class InvalidConstantNodeTest extends TestCase { public function testCreate(): void { - $exception = InvalidConstantNode::create(new Node\Name('Whatever')); + $exception = InvalidConstantNode::create(new Node\UnionType([new Node\Name('Whatever\Something\Anything'), new Node\Name('\Very\Long\Name\That\Will\Be\Truncated')])); self::assertInstanceOf(InvalidConstantNode::class, $exception); - self::assertSame('Invalid constant node (first 50 characters: Whatever)', $exception->getMessage()); + self::assertSame('Invalid constant node (first 50 characters: Whatever\Something\Anything|\Very\Long\Name\That\W)', $exception->getMessage()); } }
Improved test for InvalidConstantNode
diff --git a/tabula/wrapper.py b/tabula/wrapper.py index <HASH>..<HASH> 100644 --- a/tabula/wrapper.py +++ b/tabula/wrapper.py @@ -76,7 +76,7 @@ def read_pdf(input_path, java_options = [] elif isinstance(java_options, str): - java_options = [java_options] + java_options = shlex.split(java_options) options = build_options(kwargs) @@ -148,7 +148,7 @@ def convert_into(input_path, output_path, output_format='csv', java_options=None java_options = [] elif isinstance(java_options, str): - java_options = [java_options] + java_options = shlex.split(java_options) options = build_options(kwargs) path, is_url = localize_file(input_path) @@ -197,7 +197,7 @@ def convert_into_by_batch(input_dir, output_format='csv', java_options=None, **k java_options = [] elif isinstance(java_options, str): - java_options = [java_options] + java_options = shlex.split(java_options) # Option for batch kwargs['batch'] = input_dir
Use shlex.split() instad of just building a list for java_options
diff --git a/multiqc/modules/seqyclean/seqyclean.py b/multiqc/modules/seqyclean/seqyclean.py index <HASH>..<HASH> 100644 --- a/multiqc/modules/seqyclean/seqyclean.py +++ b/multiqc/modules/seqyclean/seqyclean.py @@ -11,7 +11,6 @@ from multiqc.modules.base_module import BaseMultiqcModule # Initialise the logger log = logging.getLogger(__name__) -import traceback class MultiqcModule(BaseMultiqcModule): def __init__(self):
Update multiqc/modules/seqyclean/seqyclean.py
diff --git a/apigpio/utils.py b/apigpio/utils.py index <HASH>..<HASH> 100644 --- a/apigpio/utils.py +++ b/apigpio/utils.py @@ -20,6 +20,7 @@ def Debounce(threshold=100): call if your callback is called twice with that interval. """ threshold *= 1000 + max_tick = 0xFFFFFFFF class _decorated(object): @@ -33,9 +34,18 @@ def Debounce(threshold=100): tick = args[3] else: tick = args[2] - if tick - self.last > threshold: + if self.last > tick: + delay = max_tick-self.last + tick + else: + delay = tick - self.last + if delay > threshold: self._fn(*args, **kwargs) + print('call passed by debouncer {} {} {}' + .format(tick, self.last, threshold)) self.last = tick + else: + print('call filtered out by debouncer {} {} {}' + .format(tick, self.last, threshold)) def __get__(self, instance, type=None): # with is called when an instance of `_decorated` is used as a class
Fix callback erroneously filtered out The tick from pigpio wraps aroud after xFFFFFFFF, approximately 1h<I>. When it wraps the delay was not computed correctly, causing all following calls to be filtered out.
diff --git a/tests/io/open_append.py b/tests/io/open_append.py index <HASH>..<HASH> 100644 --- a/tests/io/open_append.py +++ b/tests/io/open_append.py @@ -3,13 +3,13 @@ try: except ImportError: import os -if not hasattr(os, "unlink"): +if not hasattr(os, "remove"): print("SKIP") raise SystemExit # cleanup in case testfile exists try: - os.unlink("testfile") + os.remove("testfile") except OSError: pass @@ -32,6 +32,6 @@ f.close() # cleanup try: - os.unlink("testfile") + os.remove("testfile") except OSError: pass diff --git a/tests/io/open_plus.py b/tests/io/open_plus.py index <HASH>..<HASH> 100644 --- a/tests/io/open_plus.py +++ b/tests/io/open_plus.py @@ -3,13 +3,13 @@ try: except ImportError: import os -if not hasattr(os, "unlink"): +if not hasattr(os, "remove"): print("SKIP") raise SystemExit # cleanup in case testfile exists try: - os.unlink("testfile") + os.remove("testfile") except OSError: pass @@ -42,6 +42,6 @@ f.close() # cleanup try: - os.unlink("testfile") + os.remove("testfile") except OSError: pass
tests/io: Update tests to use uos.remove() instead of uos.unlink(). After Unix port switches from one to another, to be consistent with baremetal ports.
diff --git a/src/birding/__init__.py b/src/birding/__init__.py index <HASH>..<HASH> 100644 --- a/src/birding/__init__.py +++ b/src/birding/__init__.py @@ -3,15 +3,11 @@ from __future__ import absolute_import, print_function import logging from . import bolt, config, follow, search, spout, twitter_api -from .search import SearchManager -from .twitter_api import Twitter from .version import VERSION, __version__ from .version import __doc__ as __license__ __all__ = [ - 'SearchManager', - 'Twitter', 'VERSION', '__license__', '__version__',
Remove unnecessary objects from root namespace.
diff --git a/dev/com.ibm.websphere.security/src/com/ibm/websphere/security/audit/AuditEvent.java b/dev/com.ibm.websphere.security/src/com/ibm/websphere/security/audit/AuditEvent.java index <HASH>..<HASH> 100644 --- a/dev/com.ibm.websphere.security/src/com/ibm/websphere/security/audit/AuditEvent.java +++ b/dev/com.ibm.websphere.security/src/com/ibm/websphere/security/audit/AuditEvent.java @@ -236,7 +236,7 @@ public class AuditEvent { */ public String getCurrentTime() { TimeZone tz = TimeZone.getTimeZone("UTC"); - DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"); // Quoted "Z" to indicate UTC, no timezone offset + DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); // Quoted "Z" to indicate UTC, no timezone offset df.setTimeZone(tz); String nowAsISO = df.format(new Date());
Issue<I>-AuditForCloudSequenceConsistency
diff --git a/tests/integration_test.py b/tests/integration_test.py index <HASH>..<HASH> 100644 --- a/tests/integration_test.py +++ b/tests/integration_test.py @@ -28,6 +28,8 @@ import six # FIXME: missing tests for # export; history; import_image; insert; port; push; tag; get; load +DEFAULT_BASE_URL = os.environ.get('DOCKER_HOST') + class BaseTestCase(unittest.TestCase): tmp_imgs = [] @@ -35,7 +37,7 @@ class BaseTestCase(unittest.TestCase): tmp_folders = [] def setUp(self): - self.client = docker.Client(timeout=5) + self.client = docker.Client(base_url=DEFAULT_BASE_URL, timeout=5) self.tmp_imgs = [] self.tmp_containers = [] self.tmp_folders = [] @@ -910,6 +912,6 @@ class TestConnectionTimeout(unittest.TestCase): if __name__ == '__main__': - c = docker.Client() + c = docker.Client(base_url=DEFAULT_BASE_URL) c.pull('busybox') unittest.main()
allow docker client to connect to a remote host to run the tests on a host without using the default unix socket, it's now possible to specify: DOCKER_HOST=tcp://localdocker:<I> env/bin/python setup.py test
diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java index <HASH>..<HASH> 100644 --- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java +++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoop.java @@ -350,6 +350,8 @@ final class EpollEventLoop extends SingleThreadEventLoop { } catch (IOException ignore) { // ignore on close } + // Using the intermediate collection to prevent ConcurrentModificationException. + // In the `close()` method, the channel is deleted from `channels` map. Collection<AbstractEpollChannel> array = new ArrayList<AbstractEpollChannel>(channels.size()); for (AbstractEpollChannel channel: channels.values()) {
Clarify the appointment of the intermediate collection Motivation: An intermediate list is creating in the `EpollEventLoop#closeAll` to prevent ConcurrentModificationException. But this is not the obvious purpose has no comment. Modifications: Add comment to clarify the appointment of the intermediate collection. Result: More clear code.
diff --git a/gspread/models.py b/gspread/models.py index <HASH>..<HASH> 100644 --- a/gspread/models.py +++ b/gspread/models.py @@ -1468,6 +1468,29 @@ class Worksheet(object): } return self.spreadsheet.values_append(self.title, params, body) + + def append_rows(self, values, value_input_option='RAW'): + """Adds rows to the worksheet and populates it with values. + Widens the worksheet if there are more values than columns. + + :param values: Values for new rows. Values must be a list of lists. + :param value_input_option: (optional) Determines how input data should + be interpreted. See `ValueInputOption`_ in + the Sheets API. + :type value_input_option: str + + .. _ValueInputOption: https://developers.google.com/sheets/api/reference/rest/v4/ValueInputOption + + """ + params = { + 'valueInputOption': value_input_option + } + + body = { + 'values': values + } + + return self.spreadsheet.values_append(self.title, params, body) def insert_row( self,
Added append_rows method to simplify the procedure of adding multiple rows (#<I>) Closes #<I>
diff --git a/_pydevd_bundle/pydevd_comm.py b/_pydevd_bundle/pydevd_comm.py index <HASH>..<HASH> 100644 --- a/_pydevd_bundle/pydevd_comm.py +++ b/_pydevd_bundle/pydevd_comm.py @@ -752,7 +752,7 @@ class NetCommandFactory: v = v[0:MAX_IO_MSG_SIZE] v += '...' - v = pydevd_xml.make_valid_xml_value(quote(v, '/>_= \t')) + v = pydevd_xml.make_valid_xml_value(quote(v, '/>_= ')) return NetCommand(str(CMD_WRITE_TO_CONSOLE), 0, '<xml><io s="%s" ctx="%s"/></xml>' % (v, ctx)) except: return self.make_error_message(0, get_exception_traceback_str())
Preserve tab character while parsing XML ptvsd:<I>
diff --git a/docs/src/Tag.doc.js b/docs/src/Tag.doc.js index <HASH>..<HASH> 100644 --- a/docs/src/Tag.doc.js +++ b/docs/src/Tag.doc.js @@ -10,7 +10,7 @@ const card = (c) => cards.push(c); card( <PageHeader name="Tag" - description="Tag is a object that holds text. It also has an x icon to remove it. Tags can appear within a [form field](/TextField#tagsExample) or as standalone components." + description="Tags are objects that hold text and have a delete icon to remove them. They can appear within [TextFields](/TextField#tagsExample), [TextAreas](/TextArea#tagsExample), [Typeaheads](/Typeahead#tagsExample), or as standalone components." /> );
Tag: fix typo in documentation (#<I>) Fixing grammar in the Tag description
diff --git a/src/utils/router.js b/src/utils/router.js index <HASH>..<HASH> 100644 --- a/src/utils/router.js +++ b/src/utils/router.js @@ -146,6 +146,7 @@ export default class Framework7Router { findMatchingRoute(url) { var matchingRoute; if (!url) return matchingRoute; + url = ""+url; //Insures that the url is of type string so url.split does not crash app in weird situations. var routes = this.routes; var query = this.dom7.parseUrlQuery(url);
Fixes edge case Insures that the url is of type string so url.split does not crash app in weird situations.
diff --git a/src/components/Tabs.js b/src/components/Tabs.js index <HASH>..<HASH> 100644 --- a/src/components/Tabs.js +++ b/src/components/Tabs.js @@ -26,7 +26,7 @@ class Tabs extends Component { let firstDefaultLink; const traverse = child => { - if (!child.props || firstDefaultLink) { + if (!child || !child.props || firstDefaultLink) { return; }
don't crash if child is null
diff --git a/docs/source/conf.py b/docs/source/conf.py index <HASH>..<HASH> 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -41,6 +41,10 @@ extensions = [ 'sphinx.ext.viewcode' ] +# Napoleon settings +napoleon_google_docstring = True +napoleon_include_special_with_doc = True + # Show todos todo_include_todos = True
Added few config options for sphinx napoleon ext.
diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java +++ b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java @@ -1334,7 +1334,7 @@ public abstract class AbstractConnectProtocol implements Protocol { } public String getTraces() { - if (options.enablePacketDebug) return traceCache.printStack(); + if (options.enablePacketDebug && traceCache != null) return traceCache.printStack(); return ""; } }
[misc] ensure stability if option "enablePacketDebug" is set and IOException occur in when establishing socket
diff --git a/version.php b/version.php index <HASH>..<HASH> 100644 --- a/version.php +++ b/version.php @@ -26,7 +26,7 @@ defined('MOODLE_INTERNAL') || die; $module->version = 2011110500; // The current module version (Date: YYYYMMDDXX) -$module->requires = 2011070101; // Requires this Moodle version +$module->requires = 2011070100; // Requires this Moodle version $module->cron = 0; // Period for cron to check this module (secs) $module->component = 'mod_book'; // Full name of the plugin (used for diagnostics)
fix requires, originally plugins database did not allow proper version there
diff --git a/packages/vue-inbrowser-compiler-demi/postinstall.js b/packages/vue-inbrowser-compiler-demi/postinstall.js index <HASH>..<HASH> 100644 --- a/packages/vue-inbrowser-compiler-demi/postinstall.js +++ b/packages/vue-inbrowser-compiler-demi/postinstall.js @@ -3,7 +3,7 @@ const fs = require('fs') function getVuePackageVersion() { try { - const pkg = require('vue/package.json') + const pkg = require('vue') return pkg.version } catch { return 'unknown' @@ -39,8 +39,8 @@ function updateIndexForVue3() { }) } -const pkg = getVuePackageVersion() +const version = getVuePackageVersion() -if (pkg.version.startsWith('3.')) { +if (version.startsWith('3.')) { updateIndexForVue3() }
fix: require version instead of pkg
diff --git a/lib/ruff.js b/lib/ruff.js index <HASH>..<HASH> 100644 --- a/lib/ruff.js +++ b/lib/ruff.js @@ -66,8 +66,8 @@ * */ function Emitify() { - this._all = {}; - } + this._all = {}; + } Emitify.prototype._check = function(event, callback) { var isTwo = arguments.length === 2;
chore(ruff) rm " "
diff --git a/admin/index.php b/admin/index.php index <HASH>..<HASH> 100644 --- a/admin/index.php +++ b/admin/index.php @@ -306,8 +306,8 @@ if (during_initial_install()) { } } - // at this stage there can be only one admin - users may change username, so do not rely on that - $adminuser = get_complete_user_data('id', $CFG->siteadmins); + // at this stage there can be only one admin unless more were added by install - users may change username, so do not rely on that + $adminuser = get_complete_user_data('id', reset(explode(',', $CFG->siteadmins))); if ($adminuser->password === 'adminsetuppending') { // prevent installation hijacking
MDL-<I>: admin: allow install to proceed when multiple admins exist already
diff --git a/src/Bandcamp.php b/src/Bandcamp.php index <HASH>..<HASH> 100644 --- a/src/Bandcamp.php +++ b/src/Bandcamp.php @@ -60,7 +60,7 @@ class Bandcamp */ public static function title(Crawler $crawler) { - $crawler = $crawler->filter('meta[name="title"]'); + $crawler = $crawler->filter('meta[property="og:title"]'); return $crawler->count() === 1 ? $crawler->attr('content') : null; } diff --git a/tests/response/Bandcamp.php b/tests/response/Bandcamp.php index <HASH>..<HASH> 100644 --- a/tests/response/Bandcamp.php +++ b/tests/response/Bandcamp.php @@ -4,7 +4,7 @@ return <<<'HTML' <html lang="en"> <head> <meta charset="UTF-8"> - <meta name="title" content="Bandcamp Title"> + <meta property="og:title" content="Bandcamp Title"> <meta property="og:image" content="bandcamp-thumbnail.jpg"> <meta property="og:video" content="https://bandcamp.com/EmbeddedPlayer/v=2/track=1234567890/"> <title></title>
Change the meta property in Bandcamp for the title
diff --git a/spec/lib/pushr/configuration_spec.rb b/spec/lib/pushr/configuration_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lib/pushr/configuration_spec.rb +++ b/spec/lib/pushr/configuration_spec.rb @@ -1,4 +1,5 @@ require 'spec_helper' +require 'pushr/daemon' describe Pushr::Configuration do @@ -6,7 +7,9 @@ describe Pushr::Configuration do Pushr::Core.configure do |config| config.redis = ConnectionPool.new(size: 1, timeout: 1) { MockRedis.new } end + Pushr::Daemon.config = settings end + let(:settings) { Pushr::Daemon::Settings.new } describe 'all' do it 'returns all configurations' do
added settings object to config spec
diff --git a/lib/travis/services/users/update.rb b/lib/travis/services/users/update.rb index <HASH>..<HASH> 100644 --- a/lib/travis/services/users/update.rb +++ b/lib/travis/services/users/update.rb @@ -9,6 +9,7 @@ module Travis def run @result = current_user.update_attributes!(attributes) if valid_locale? + current_user end def messages
Return currnet user after updating it
diff --git a/lib/Thumbor/Url/CommandSet.php b/lib/Thumbor/Url/CommandSet.php index <HASH>..<HASH> 100644 --- a/lib/Thumbor/Url/CommandSet.php +++ b/lib/Thumbor/Url/CommandSet.php @@ -93,7 +93,7 @@ class CommandSet { $args = func_get_args(); $filter = array_shift($args); - $this->filters []= sprintf('%s(%s)', $filter, implode(', ', $args)); + $this->filters []= sprintf('%s(%s)', $filter, implode(',', $args)); } /**
Fixing spaces on multiple filter arguments so that hash works properly
diff --git a/Object/Form/Model/Dummy/Sort.php b/Object/Form/Model/Dummy/Sort.php index <HASH>..<HASH> 100755 --- a/Object/Form/Model/Dummy/Sort.php +++ b/Object/Form/Model/Dummy/Sort.php @@ -25,7 +25,7 @@ class Sort extends \Object\Table { public $options_map = []; public $options_active = []; public $engine = [ - 'mysqli' => 'InnoDB' + 'MySQLi' => 'InnoDB' ]; public $cache = false; diff --git a/System/managers/manager.php b/System/managers/manager.php index <HASH>..<HASH> 100755 --- a/System/managers/manager.php +++ b/System/managers/manager.php @@ -21,6 +21,9 @@ if (file_exists('../libraries/vendor/autoload.php')) { require('../libraries/vendor/Numbers/Framework/Application.php'); Application::run(['__run_only_bootstrap' => 1]); +// disable debug +\Debug::$debug = false; + // increase in memory and unlimited execution time ini_set('memory_limit', '2048M'); set_time_limit(0);
debug, mysql engine
diff --git a/src/DispatchesCommands.php b/src/DispatchesCommands.php index <HASH>..<HASH> 100644 --- a/src/DispatchesCommands.php +++ b/src/DispatchesCommands.php @@ -13,7 +13,7 @@ trait DispatchesCommands * * @return mixed */ - protected function dispatch($command) + protected function dispatchCommand($command) { return app('tactician.dispatcher')->dispatch($command); } @@ -27,7 +27,7 @@ trait DispatchesCommands * * @return mixed */ - protected function dispatchFrom($command, ArrayAccess $source, array $extras = []) + protected function dispatchCommandFrom($command, ArrayAccess $source, array $extras = []) { return app('tactician.dispatcher')->dispatchFrom($command, $source, $extras); } @@ -40,7 +40,7 @@ trait DispatchesCommands * * @return mixed */ - protected function dispatchFromArray($command, array $array) + protected function dispatchCommandFromArray($command, array $array) { return app('tactician.dispatcher')->dispatchFromArray($command, $array); }
Fix name conflicts with Laravel's DispatchesJobs trait
diff --git a/cluster/config.go b/cluster/config.go index <HASH>..<HASH> 100644 --- a/cluster/config.go +++ b/cluster/config.go @@ -123,6 +123,8 @@ func ConfigProcess() { KeepAlive: 30 * time.Second, }).Dial, TLSHandshakeTimeout: time.Second, + MaxIdleConns: 1000, + MaxIdleConnsPerHost: 100, } client = http.Client{ Transport: transport,
increase connection pool usage. Default maxIdleConns is <I>, but default maxIdleConnsPerHost is only 2. MT nodes are very chatty and these low limits will result in lots of requests having to establish new TCP connections.
diff --git a/lib/procodile/cli.rb b/lib/procodile/cli.rb index <HASH>..<HASH> 100644 --- a/lib/procodile/cli.rb +++ b/lib/procodile/cli.rb @@ -45,12 +45,6 @@ module Procodile # Help # - command def proxy - require 'procodile/tcp_proxy' - p = Procodile::TCPProxy.new(Supervisor.new(@config, {})) - p.run - end - desc "Shows this help output" command def help puts "\e[45;37mWelcome to Procodile v#{Procodile::VERSION}\e[0m"
remove proxy command that isn't ever used as the proxy runs within a supervisor
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -168,12 +168,8 @@ setup( 'Intended Audience :: Developers', 'License :: OSI Approved :: ISC License (ISCL)', 'Natural Language :: English', - "Programming Language :: Python :: 2", - 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', ], test_suite='tests', tests_require=test_requirements,
Update classifiers to show that we only support python <I> right now
diff --git a/spec/adhearsion/call_controller/dial_spec.rb b/spec/adhearsion/call_controller/dial_spec.rb index <HASH>..<HASH> 100644 --- a/spec/adhearsion/call_controller/dial_spec.rb +++ b/spec/adhearsion/call_controller/dial_spec.rb @@ -9,11 +9,11 @@ module Adhearsion let(:to) { 'sip:foo@bar.com' } let(:other_call_id) { new_uuid } - let(:other_mock_call) { flexmock OutboundCall.new, :id => other_call_id } + let(:other_mock_call) { flexmock OutboundCall.new, :id => other_call_id, :write_command => true } let(:second_to) { 'sip:baz@bar.com' } let(:second_other_call_id) { new_uuid } - let(:second_other_mock_call) { flexmock OutboundCall.new, :id => second_other_call_id } + let(:second_other_mock_call) { flexmock OutboundCall.new, :id => second_other_call_id, :write_command => true } let(:mock_answered) { Punchblock::Event::Answered.new }
[BUGFIX] Ensure calls never actually execute a command in dial specs
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index <HASH>..<HASH> 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -413,7 +413,7 @@ class SymfonyRequirements extends RequirementCollection if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) { $this->addRequirement( - (in_array(date_default_timezone_get(), \DateTimeZone::listIdentifiers())), + (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())), sprintf('Default timezone is deprecated (%s)', date_default_timezone_get()), 'Fix your <strong>php.ini</strong> file (list of deprecated timezones http://us.php.net/manual/en/timezones.others.php).' );
removed a backslash to avoid problem with PHP <I>
diff --git a/indra/sources/tas/processor.py b/indra/sources/tas/processor.py index <HASH>..<HASH> 100644 --- a/indra/sources/tas/processor.py +++ b/indra/sources/tas/processor.py @@ -40,6 +40,7 @@ class TasProcessor(object): return Agent(name, db_refs=refs) def _extract_protein(self, name, gene_id): + refs = {'EGID': gene_id} hgnc_id = hgnc_client.get_hgnc_from_entrez(gene_id) if hgnc_id is not None: refs['HGNC'] = hgnc_id
Fix constructing protein refs in TAS
diff --git a/pyghmi/ipmi/oem/lenovo/imm.py b/pyghmi/ipmi/oem/lenovo/imm.py index <HASH>..<HASH> 100644 --- a/pyghmi/ipmi/oem/lenovo/imm.py +++ b/pyghmi/ipmi/oem/lenovo/imm.py @@ -888,6 +888,12 @@ class XCCClient(IMMClient): yield self.get_disk_firmware(diskent) elif mode==1: yield self.get_disk_hardware(diskent) + if mode == 1: + bdata = {'Description': 'Unmanaged Disk'} + if adp.get('m2Type', -1) == 2: + yield ('M.2 Disk', bdata) + for umd in adp.get('unmanagedDisks', []): + yield ('Disk {0}'.format(umd['slotNo']), bdata) def get_disk_hardware(self, diskent, prefix=''): bdata = {}
Add detected, but unknown disks SATA attached disks can show presence, provide recognition of detected, but unmanaged disks. Change-Id: I<I>ed2fe9dc9cc0d<I>bfd4e<I>bc<I>b1f5fa
diff --git a/aws/resource_aws_elasticache_cluster_test.go b/aws/resource_aws_elasticache_cluster_test.go index <HASH>..<HASH> 100644 --- a/aws/resource_aws_elasticache_cluster_test.go +++ b/aws/resource_aws_elasticache_cluster_test.go @@ -36,7 +36,10 @@ func testSweepElasticacheClusters(region string) error { } conn := client.(*AWSClient).elasticacheconn - err = conn.DescribeCacheClustersPages(&elasticache.DescribeCacheClustersInput{}, func(page *elasticache.DescribeCacheClustersOutput, isLast bool) bool { + input := &elasticache.DescribeCacheClustersInput{ + ShowCacheClustersNotInReplicationGroups: aws.Bool(true), + } + err = conn.DescribeCacheClustersPages(input, func(page *elasticache.DescribeCacheClustersOutput, isLast bool) bool { if len(page.CacheClusters) == 0 { log.Print("[DEBUG] No ElastiCache Replicaton Groups to sweep") return false
Excludes Clusters in Replication Groups from sweeper
diff --git a/dipper/sources/EOM.py b/dipper/sources/EOM.py index <HASH>..<HASH> 100644 --- a/dipper/sources/EOM.py +++ b/dipper/sources/EOM.py @@ -45,7 +45,7 @@ class EOM(PostgreSQLSource): files = { 'map': { 'file': 'hp-to-eom-mapping.tsv', - 'url': 'https://phenotype-ontologies.googlecode.com/svn/trunk/src/ontology/hp/mappings/hp-to-eom-mapping.tsv' + 'url': 'https://raw.githubusercontent.com/obophenotype/human-phenotype-ontology/master/src/mappings/hp-to-eom-mapping.tsv' } } @@ -162,7 +162,7 @@ class EOM(PostgreSQLSource): subcategory, objective_definition, subjective_definition, comments, synonyms, replaces, small_figure_url, large_figure_url, e_uid, v_uid, v_uuid, - v_last_modified) = line + v_last_modified,v_status, v_lastmodified_epoch) = line # note: # e_uid v_uuid v_last_modified terminology_category_url
change url for mapping file from google code to github, add in two addtional columns in ingest file
diff --git a/util/kube/kube.go b/util/kube/kube.go index <HASH>..<HASH> 100644 --- a/util/kube/kube.go +++ b/util/kube/kube.go @@ -109,7 +109,10 @@ func DeleteResourceWithLabel(config *rest.Config, namespace string, labelSelecto if err != nil { return err } - err = dclient.Resource(&apiResource, namespace).DeleteCollection(&metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: labelSelector}) + propagationPolicy := metav1.DeletePropagationForeground + err = dclient.Resource(&apiResource, namespace).DeleteCollection(&metav1.DeleteOptions{ + PropagationPolicy: &propagationPolicy, + }, metav1.ListOptions{LabelSelector: labelSelector}) if err != nil && !apierr.IsNotFound(err) { return err }
Delete child dependents while deleting app resources (#<I>)
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ license: GNU-GPL2 from setuptools import setup setup(name='arguments', - version='23', + version='24', description='Argument parser based on docopt', url='https://github.com/erikdejonge/arguments', author='Erik de Jonge',
pip Monday <I> March <I> (week:<I> day:<I>), <I>:<I>:<I>
diff --git a/lib/gopher2000/rendering/base.rb b/lib/gopher2000/rendering/base.rb index <HASH>..<HASH> 100644 --- a/lib/gopher2000/rendering/base.rb +++ b/lib/gopher2000/rendering/base.rb @@ -119,6 +119,12 @@ module Gopher underline(@width, under) end + def small_header(str, under = '=') + str = " " + str + " " + text(str) + underline(str.length, under) + end + # # output a centered string in a box # @param [String] str the string to output
add #small_header -- an underlined chunk of text
diff --git a/Entity/Post.php b/Entity/Post.php index <HASH>..<HASH> 100644 --- a/Entity/Post.php +++ b/Entity/Post.php @@ -94,7 +94,7 @@ class Post extends Statusable /** * @var Tag[]|ArrayCollection * - * @ORM\ManyToMany(targetEntity="Icap\BlogBundle\Entity\Tag", inversedBy="posts", cascade={"all"}) + * @ORM\ManyToMany(targetEntity="Icap\BlogBundle\Entity\Tag", inversedBy="posts", cascade={"persist"}) * @ORM\JoinTable(name="icap__blog_post_tag") */ protected $tags; diff --git a/Entity/Tag.php b/Entity/Tag.php index <HASH>..<HASH> 100644 --- a/Entity/Tag.php +++ b/Entity/Tag.php @@ -29,7 +29,7 @@ class Tag protected $name; /** - * @ORM\ManyToMany(targetEntity="Post", mappedBy="tags", cascade={"all"}) + * @ORM\ManyToMany(targetEntity="Post", mappedBy="tags") */ private $posts;
[BlogBundle] Correct cascade for avoiding cascade removing
diff --git a/trump/orm.py b/trump/orm.py index <HASH>..<HASH> 100644 --- a/trump/orm.py +++ b/trump/orm.py @@ -1472,6 +1472,13 @@ class Feed(Base, ReprMixin): if hdlrp: reporter.add_handlepoint(hdlrp) return reporter + def _note_session(self): + self.ses = object_session(self) + +@event.listens_for(Feed, 'load') +def __receive_load(target, context): + """ saves the session upon being queried """ + target._note_session() class FeedTag(Base, ReprMixin): __tablename__ = '_feed_tags'
Give the Feed a session on load
diff --git a/src/view/component.js b/src/view/component.js index <HASH>..<HASH> 100644 --- a/src/view/component.js +++ b/src/view/component.js @@ -291,8 +291,6 @@ function Component(options) { // eslint-disable-line // #[begin] reverse var reverseWalker = options.reverseWalker; if (this.el || reverseWalker) { - this._toPhase('beforeCreate'); - var RootComponentType = this.components[ this.aNode.directives.is ? evalExpr(this.aNode.directives.is.value, this.data) : this.aNode.tagName ]; @@ -324,7 +322,6 @@ function Component(options) { // eslint-disable-line this._toPhase('created'); - this._toPhase('beforeAttach'); this._attached(); this._toPhase('attached'); }
Add component lifecycle in dev for devtools.
diff --git a/syntax/printer_test.go b/syntax/printer_test.go index <HASH>..<HASH> 100644 --- a/syntax/printer_test.go +++ b/syntax/printer_test.go @@ -70,7 +70,10 @@ var printTests = []printCase{ {"foo\n\n", "foo"}, {"\n\nfoo", "foo"}, {"# foo \n # bar\t", "# foo\n# bar"}, - {"#", "#"}, + samePrint("#"), + samePrint("#c1\\\n#c2"), + samePrint("#\\\n#"), + samePrint("foo\\\\\nbar"), samePrint("a=b # inline\nbar"), samePrint("a=$(b) # inline"), samePrint("foo # inline\n# after"),
syntax: add regression tests involving backslashes See the previous commit for context.
diff --git a/lib/collection.js b/lib/collection.js index <HASH>..<HASH> 100644 --- a/lib/collection.js +++ b/lib/collection.js @@ -38,6 +38,7 @@ function Collection(options) { }; +Collection.prototype.forEach = forEach; Collection.prototype.find = find; Collection.prototype.findAll = findAll; Collection.prototype.remove = remove; @@ -369,3 +370,20 @@ function removeAll(filter) { return count; } + + +/** +Same as collection.items.forEach but using a yieldable action +*/ +function * forEach(action) { + var i; + var ilen; + + if (!(action instanceof Function)) { + throw CollectionException('Action must be a function'); + } + + for (i = 0, ilen = this.items.length; i < ilen; ++i) { + yield action(this.items[i], i); + } +} diff --git a/lib/model.js b/lib/model.js index <HASH>..<HASH> 100644 --- a/lib/model.js +++ b/lib/model.js @@ -355,6 +355,7 @@ function Model(data, exists) { } } + this._isDirty = false; // overwrite... } util.inherits(Model, EventEmitter);
Model isDirty set to false on instanciate. Added async collection foreach
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ except ImportError: setup( name='ibmiotf', - version="0.1.3", + version="0.1.5", author='David Parker', author_email='parkerda@uk.ibm.com', package_dir={'': 'src'}, diff --git a/src/ibmiotf/__init__.py b/src/ibmiotf/__init__.py index <HASH>..<HASH> 100644 --- a/src/ibmiotf/__init__.py +++ b/src/ibmiotf/__init__.py @@ -26,7 +26,7 @@ from datetime import datetime from pkg_resources import get_distribution from encodings.base64_codec import base64_encode -__version__ = "0.1.3" +__version__ = "0.1.5" class Message: def __init__(self, data, timestamp=None):
Set version to <I> in master
diff --git a/i3ipc.py b/i3ipc.py index <HASH>..<HASH> 100644 --- a/i3ipc.py +++ b/i3ipc.py @@ -526,6 +526,10 @@ class Con(object): return [c for c in self.descendents() if c.mark and re.search(pattern, c.mark)] + def find_fullscreen(self): + return [c for c in self.descendents() + if c.type == 'con' and c.fullscreen_mode] + def workspace(self): ret = self.parent
Add find_fullscreen() to Con find_fullscreen() finds any descendent containers that are in fullscreen mode. It skips workspaces and outputs.
diff --git a/grimoire_elk/enriched/stackexchange.py b/grimoire_elk/enriched/stackexchange.py index <HASH>..<HASH> 100644 --- a/grimoire_elk/enriched/stackexchange.py +++ b/grimoire_elk/enriched/stackexchange.py @@ -86,19 +86,17 @@ class StackExchangeEnrich(Enrich): def get_identities(self, item): """ Return the identities from an item """ - identities = [] item = item['data'] for identity in ['owner']: if identity in item and item[identity]: user = self.get_sh_identity(item[identity]) - identities.append(user) + yield user if 'answers' in item: for answer in item['answers']: user = self.get_sh_identity(answer[identity]) - identities.append(user) - return identities + yield user @metadata def get_rich_item(self, item, kind='question', question_tags=None):
[enrich-stackexchange] Replace list with yield This code replaces the list used in the method get_identities with a yield, thus reducing the memory footprint.
diff --git a/metric_tank/dataprocessor.go b/metric_tank/dataprocessor.go index <HASH>..<HASH> 100644 --- a/metric_tank/dataprocessor.go +++ b/metric_tank/dataprocessor.go @@ -6,7 +6,9 @@ import ( "github.com/grafana/grafana/pkg/log" "github.com/raintank/raintank-metric/metric_tank/consolidation" "math" + "math/rand" "runtime" + "time" ) // doRecover is the handler that turns panics into returns from the top level of getTarget. @@ -254,6 +256,9 @@ func getSeries(store Store, key string, consolidator consolidation.Consolidator, } } if oldest > fromUnix { + if rand.Uint32()%50 == 0 { + log.Info("cassandra needed for %s %d - %d span=%ds now=%d oldest=%d", key, fromUnix, toUnix, toUnix-fromUnix-1, time.Now().Unix(), oldest) + } reqSpanBoth.Value(int64(toUnix - fromUnix)) if consolidator != consolidation.None { key = aggMetricKey(key, consolidator.Archive(), aggSpan)
sampled justifications why cassandra is needed
diff --git a/telethon/utils.py b/telethon/utils.py index <HASH>..<HASH> 100644 --- a/telethon/utils.py +++ b/telethon/utils.py @@ -321,7 +321,11 @@ def get_peer_id(peer, add_mark=False): i = peer.channel_id # IDs will be strictly positive -> log works return -(i + pow(10, math.floor(math.log10(i) + 3))) - _raise_cast_fail(peer, 'int') + # Maybe a full entity was given and we just need its ID + try: + return get_peer_id(get_input_peer(peer), add_mark=add_mark) + except ValueError: + _raise_cast_fail(peer, 'int') def resolve_id(marked_id):
Fix .get_peer_id not working with full entities
diff --git a/lib/aclosure.js b/lib/aclosure.js index <HASH>..<HASH> 100644 --- a/lib/aclosure.js +++ b/lib/aclosure.js @@ -38,8 +38,7 @@ function aclosure (src, dest, options = {}) { ) let compiled = yield new Promise((resolve, reject) => { compiler.run((exitCode, stdOut, stdErr) => { - console.error(stdErr) - exitCode === 0 ? resolve(stdOut) : reject(stdErr) + exitCode === 0 ? resolve(stdOut) : reject(new Error(stdErr)) }) }) let result = yield writeout(dest, compiled.toString(), { diff --git a/lib/index.js b/lib/index.js index <HASH>..<HASH> 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,7 +1,7 @@ /** * Closure compiler wrapper * @module aclosure - * @version 2.0.2 + * @version 2.0.3 */ 'use strict' diff --git a/package.json b/package.json index <HASH>..<HASH> 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aclosure", - "version": "2.0.3", + "version": "2.0.4", "description": "Closure compiler wrapper", "main": "lib", "browser": false,
Version incremented to <I>
diff --git a/lib/zold/node/front.rb b/lib/zold/node/front.rb index <HASH>..<HASH> 100755 --- a/lib/zold/node/front.rb +++ b/lib/zold/node/front.rb @@ -183,7 +183,7 @@ while #{settings.address} is in '#{settings.network}'" platform: RUBY_PLATFORM, load: Usagewatch.uw_load.to_f, threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}", - wallets: Cachy.cache(:a_key, expires_in: 5 * 60) { settings.wallets.all.count }, + wallets: Cachy.cache(:a_wallets, expires_in: 5 * 60) { settings.wallets.all.count }, remotes: settings.remotes.all.count, nscore: settings.remotes.all.map { |r| r[:score] }.inject(&:+) || 0, farm: settings.farm.to_json, @@ -425,7 +425,7 @@ while #{settings.address} is in '#{settings.network}'" end def score - best = settings.farm.best + best = Cachy.cache(:a_score, expires_in: 60) { settings.farm.best } raise 'Score is empty, there is something wrong with the Farm!' if best.empty? best[0] end
#<I> cache score in front
diff --git a/tonnikala/languages/python/generator.py b/tonnikala/languages/python/generator.py index <HASH>..<HASH> 100644 --- a/tonnikala/languages/python/generator.py +++ b/tonnikala/languages/python/generator.py @@ -435,6 +435,9 @@ class PyComplexExprNode(PyComplexNode): class PyBlockNode(PyComplexNode): def __init__(self, name): super(PyBlockNode, self).__init__() + if not isinstance(name, str): + name = name.encode('UTF-8') # python 2 + self.name = name
fixed the name: needs to be utf8 for python 2
diff --git a/jsonschema/validators.py b/jsonschema/validators.py index <HASH>..<HASH> 100644 --- a/jsonschema/validators.py +++ b/jsonschema/validators.py @@ -149,8 +149,11 @@ def create(meta_schema, validators=(), version=None, default_types=None): raise UnknownType(type, instance, self.schema) pytypes = self._types[type] + # FIXME: draft < 6 + if isinstance(instance, float) and type == "integer": + return instance.is_integer() # bool inherits from int, so ensure bools aren't reported as ints - if isinstance(instance, bool): + elif isinstance(instance, bool): pytypes = _utils.flatten(pytypes) is_number = any( issubclass(pytype, numbers.Number) for pytype in pytypes
zeroTerminatedFloats. That's a really annoying change...
diff --git a/lib/spatial_features/models/feature.rb b/lib/spatial_features/models/feature.rb index <HASH>..<HASH> 100644 --- a/lib/spatial_features/models/feature.rb +++ b/lib/spatial_features/models/feature.rb @@ -45,7 +45,7 @@ class Feature < ActiveRecord::Base end def self.cache_derivatives(options = {}) - options.reverse_merge! :lowres_simplification => 0.0001, :lowres_precision => 5 + options.reverse_merge! :lowres_simplification => 0.00001, :lowres_precision => 5 update_all("area = ST_Area(geog), geom = ST_Transform(geog::geometry, 26910), diff --git a/lib/spatial_features/version.rb b/lib/spatial_features/version.rb index <HASH>..<HASH> 100644 --- a/lib/spatial_features/version.rb +++ b/lib/spatial_features/version.rb @@ -1,3 +1,3 @@ module SpatialFeatures - VERSION = "1.4.5" + VERSION = "1.4.6" end
Decrease default simplification tolerance. It was oversimplifying some shapes that it shouldn't have.
diff --git a/src/helpers.js b/src/helpers.js index <HASH>..<HASH> 100644 --- a/src/helpers.js +++ b/src/helpers.js @@ -259,17 +259,19 @@ function formatValue(pre, value, options, axis) { } } - if (precision !== undefined) { - value = value.toPrecision(precision); - value = parseFloat(value).toString(); // no insignificant zeros - } + if (!axis) { + if (precision !== undefined) { + value = value.toPrecision(precision); + value = parseFloat(value).toString(); // no insignificant zeros + } - if (options.round !== undefined) { - if (options.round < 0) { - let num = Math.pow(10, -1 * options.round); - value = parseInt((1.0 * value / num).toFixed(0)) * num; - } else { - value = parseFloat(value.toFixed(options.round)); + if (options.round !== undefined) { + if (options.round < 0) { + let num = Math.pow(10, -1 * options.round); + value = parseInt((1.0 * value / num).toFixed(0)) * num; + } else { + value = parseFloat(value.toFixed(options.round)); + } } }
No need to apply precision or rounding to axis
diff --git a/lib/input-plugins.js b/lib/input-plugins.js index <HASH>..<HASH> 100644 --- a/lib/input-plugins.js +++ b/lib/input-plugins.js @@ -9,6 +9,14 @@ const nunjucks = require('nunjucks'); */ nunjucks.configure({ autoescape: true }); +/* + * Common tests for input plugins + * + * @param {object} test ava test runner + * @param {object} plugin input plugin + * + * @returns {object} plugin input plugin + */ module.exports = function pluginTests(test, plugin) { let validation = []; let inputs = [];
:unamused: add jsdoc to trigger semantic release
diff --git a/tests/test_sqlalchemy_athena.py b/tests/test_sqlalchemy_athena.py index <HASH>..<HASH> 100644 --- a/tests/test_sqlalchemy_athena.py +++ b/tests/test_sqlalchemy_athena.py @@ -272,6 +272,12 @@ class TestSQLAlchemyAthena(unittest.TestCase): self.assertIsInstance(one_row_complex.c.col_decimal.type, DECIMAL) @with_engine() + def test_select_offset_limit(self, engine, conn): + many_rows = Table("many_rows", MetaData(), autoload_with=conn) + rows = conn.execute(many_rows.select().offset(10).limit(5)).fetchall() + self.assertEqual(rows, [(i,) for i in range(10, 15)]) + + @with_engine() def test_reserved_words(self, engine, conn): """Presto uses double quotes, not backticks""" fake_table = Table(
Add test cases for offset and limit clauses
diff --git a/yModel/mongo.py b/yModel/mongo.py index <HASH>..<HASH> 100644 --- a/yModel/mongo.py +++ b/yModel/mongo.py @@ -175,7 +175,7 @@ class MongoTree(MongoSchema, Tree): else: ValidationError("Unexpected child model: {} vs {}".format(child.__name__, self.children_models[as_])) - async def children(self, member, models, sort = None, exclude = None): + async def children(self, member, models, sort = None): if not self.table: raise InvalidOperation("No table") @@ -197,10 +197,11 @@ class MongoTree(MongoSchema, Tree): aggregation = [{"$match": {"path": self.get_url(), "type": type_}}] if sort: aggregation.append(sort) + docs = await self.table.aggregate(aggregation).to_list(None) model_class = getattr(models, type_) - children = model_class(self.table, many = True, exclude = exclude or ()) + children = model_class(self.table, many = True) children.load(docs, many = True) return children
exclude fields has moved to the rendering of the information of the model
diff --git a/client/lib/post-normalizer/rule-content-make-images-safe.js b/client/lib/post-normalizer/rule-content-make-images-safe.js index <HASH>..<HASH> 100644 --- a/client/lib/post-normalizer/rule-content-make-images-safe.js +++ b/client/lib/post-normalizer/rule-content-make-images-safe.js @@ -60,7 +60,7 @@ function isCandidateForContentImage( imageUrl ) { } ); } -export default function( maxWidth ) { +export default function( maxWidth = false ) { return function makeImagesSafe( post, dom ) { let content_images = [], images; diff --git a/client/state/reader/posts/normalization-rules.js b/client/state/reader/posts/normalization-rules.js index <HASH>..<HASH> 100644 --- a/client/state/reader/posts/normalization-rules.js +++ b/client/state/reader/posts/normalization-rules.js @@ -156,7 +156,7 @@ const fastPostNormalizationRules = flow( [ withContentDom( [ removeStyles, removeElementsBySelector, - makeImagesSafe( READER_CONTENT_WIDTH ), + makeImagesSafe(), discoverFullBleedImages, makeEmbedsSafe, disableAutoPlayOnEmbeds,
Reader: Stop resizing images in content (#<I>) This was a misguided attempt to get bigger images for features, from a long time ago. Sadly, it breaks things that use photon or the wp image api to make images a specific size. We'll revisit this later if necessary.
diff --git a/lib/jenkins_api_client/job.rb b/lib/jenkins_api_client/job.rb index <HASH>..<HASH> 100644 --- a/lib/jenkins_api_client/job.rb +++ b/lib/jenkins_api_client/job.rb @@ -285,7 +285,7 @@ module JenkinsApi is_building = @client.api_get_request( "/job/#{job_name}/#{build_number}" )["building"] - if is_building == "true" + if is_building @client.api_post_request("/job/#{job_name}/#{build_number}/stop") end end
Issue #<I> - [Job] - reverting previous changes as the API does return as true/false
diff --git a/modules/cms/menu/Item.php b/modules/cms/menu/Item.php index <HASH>..<HASH> 100644 --- a/modules/cms/menu/Item.php +++ b/modules/cms/menu/Item.php @@ -247,6 +247,17 @@ class Item extends \yii\base\Object } /** + * Get all sibilings for the current item + * + * @return array An array with all item-object siblings + * @since 1.0.0-beta3 + */ + public function getSiblings() + { + return (new Query())->where(['parent_nav_id' => $this->getParentNavId()])->with($this->_with)->all(); + } + + /** * Return all parent elemtns **with** the current item. * * @return array An array with Item-Objects.
Added ability to get cms menu item siblings. closes #<I>
diff --git a/libsubmit/providers/cobalt/cobalt.py b/libsubmit/providers/cobalt/cobalt.py index <HASH>..<HASH> 100644 --- a/libsubmit/providers/cobalt/cobalt.py +++ b/libsubmit/providers/cobalt/cobalt.py @@ -182,8 +182,7 @@ class Cobalt(ExecutionProvider): raise(ep_error.ScriptPathError(script_filename, e )) try: - submit_script = Template(template_string).substitute(**configs, - jobname=job_name) + submit_script = Template(template_string).substitute(**configs) with open(script_filename, 'w') as f: f.write(submit_script)
Fixing issue with multiple attributes to site template generator
diff --git a/requests.go b/requests.go index <HASH>..<HASH> 100644 --- a/requests.go +++ b/requests.go @@ -91,7 +91,7 @@ func (c *Client) propfind(path string, self bool, body string, resp interface{}, } else { rq.Header.Add("Depth", "1") } - rq.Header.Add("Content-Type", "text/xml;charset=UTF-8") + rq.Header.Add("Content-Type", "application/xml;charset=UTF-8") rq.Header.Add("Accept", "application/xml,text/xml") rq.Header.Add("Accept-Charset", "utf-8") // TODO add support for 'gzip,deflate;q=0.8,q=0.7'
use 'application/xml' instead of 'text/xml'. related with (1) in #<I>
diff --git a/livereload/watcher.py b/livereload/watcher.py index <HASH>..<HASH> 100644 --- a/livereload/watcher.py +++ b/livereload/watcher.py @@ -138,9 +138,17 @@ class Watcher(object): return False def is_glob_changed(self, path, ignore=None): - for f in glob.glob(path): - if self.is_file_changed(f, ignore): - return True + try: + for f in glob.glob(path): + if self.is_file_changed(f, ignore): + return True + except TypeError: + """ + Problem: on every ~10 times for some reason the glob returns Path instead of a string + TODO: Rewrite this block to use the python Path alongside string + aka pathlib introduced in Python 3.4 + """ + return False
Patch for python <I> on GNU/Linux environment aka PosixPath
diff --git a/runtime.go b/runtime.go index <HASH>..<HASH> 100644 --- a/runtime.go +++ b/runtime.go @@ -363,7 +363,7 @@ func (runtime *Runtime) Create(config *runconfig.Config, name string) (*Containe warnings := []string{} if checkDeprecatedExpose(img.Config) || checkDeprecatedExpose(config) { - warnings = append(warnings, "The mapping to public ports on your host has been deprecated. Use -p to publish the ports.") + warnings = append(warnings, "The mapping to public ports on your host via Dockerfile EXPOSE (host:port:port) has been deprecated. Use -p to publish the ports.") } if img.Config != nil {
make the port mapping deprecation error message more obvious see <I> Docker-DCO-<I>-
diff --git a/app/models/alchemy/picture_variant.rb b/app/models/alchemy/picture_variant.rb index <HASH>..<HASH> 100644 --- a/app/models/alchemy/picture_variant.rb +++ b/app/models/alchemy/picture_variant.rb @@ -93,7 +93,7 @@ module Alchemy convert_format = render_format.sub("jpeg", "jpg") != picture.image_file_format.sub("jpeg", "jpg") - if render_format =~ /jpe?g/ && convert_format + if render_format =~ /jpe?g/ && (convert_format || options[:quality]) quality = options[:quality] || Config.get(:output_image_jpg_quality) encoding_options << "-quality #{quality}" end
Fix jpeg quality option for jpeg files The quality option was previously ignored if the image was a JPEG. Now the quality configuration will be added if the file isn't a JPEG or the quality option was set.
diff --git a/troposphere/rds.py b/troposphere/rds.py index <HASH>..<HASH> 100644 --- a/troposphere/rds.py +++ b/troposphere/rds.py @@ -172,6 +172,7 @@ class DBInstance(AWSObject): 'AutoMinorVersionUpgrade': (boolean, False), 'AvailabilityZone': (basestring, False), 'BackupRetentionPeriod': (validate_backup_retention_period, False), + 'CACertificateIdentifier': (basestring, False), 'CharacterSetName': (basestring, False), 'CopyTagsToSnapshot': (boolean, False), 'DBClusterIdentifier': (basestring, False),
Add CACertificateIdentifier to DBInstance (#<I>)
diff --git a/src/Model/Behavior/Version/VersionTrait.php b/src/Model/Behavior/Version/VersionTrait.php index <HASH>..<HASH> 100644 --- a/src/Model/Behavior/Version/VersionTrait.php +++ b/src/Model/Behavior/Version/VersionTrait.php @@ -37,11 +37,16 @@ trait VersionTrait } $table = TableRegistry::get($this->source()); - $primaryKey = $table->primaryKey(); - - $conditions = [$primaryKey => $this->id]; - $entities = $table->find('versions', ['conditions' => $conditions]) - ->all(); + $primaryKey = (array)$table->primaryKey(); + + $query = $table->find('versions'); + $pkValue = $this->extract($primaryKey); + $conditions = []; + foreach ($pkValue as $key => $value) { + $field = current($query->aliasField($key)); + $conditions[$field] = $value; + } + $entities = $query->where($conditions)->all(); if (empty($entities)) { return [];
Fixed bug in VersionTrait where primary key was hardcoded to $entity->id.
diff --git a/lib/drafter/creation.rb b/lib/drafter/creation.rb index <HASH>..<HASH> 100644 --- a/lib/drafter/creation.rb +++ b/lib/drafter/creation.rb @@ -16,6 +16,7 @@ module Drafter attrs = self.attributes serialize_attributes_to_draft unfuck_sti + self.draft.save! build_draft_uploads self.draft end @@ -26,7 +27,6 @@ module Drafter # https://github.com/rails/rails/issues/617 def unfuck_sti draft.draftable_type = self.class.to_s - self.draft.save! end # Set up the draft object, setting its :data attribute to the serialized
Saving is actually not part of the STI hack.
diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php index <HASH>..<HASH> 100755 --- a/tests/Support/SupportStrTest.php +++ b/tests/Support/SupportStrTest.php @@ -42,6 +42,7 @@ class SupportStrTest extends PHPUnit_Framework_TestCase { public function testStartsWith() { $this->assertTrue(Str::startsWith('jason', 'jas')); + $this->assertTrue(Str::startsWith('jason', 'jason')); $this->assertTrue(Str::startsWith('jason', array('jas'))); $this->assertFalse(Str::startsWith('jason', 'day')); $this->assertFalse(Str::startsWith('jason', array('day'))); @@ -52,6 +53,7 @@ class SupportStrTest extends PHPUnit_Framework_TestCase { public function testEndsWith() { $this->assertTrue(Str::endsWith('jason', 'on')); + $this->assertTrue(Str::endsWith('jason', 'jason')); $this->assertTrue(Str::endsWith('jason', array('on'))); $this->assertFalse(Str::endsWith('jason', 'no')); $this->assertFalse(Str::endsWith('jason', array('no')));
Adding another test to string tests.
diff --git a/Security/FacebookAuthenticator.php b/Security/FacebookAuthenticator.php index <HASH>..<HASH> 100755 --- a/Security/FacebookAuthenticator.php +++ b/Security/FacebookAuthenticator.php @@ -27,7 +27,7 @@ use Symfony\Component\Security\Guard\AbstractGuardAuthenticator; use WellCommerce\Bundle\ClientBundle\Entity\ClientInterface; use WellCommerce\Bundle\CoreBundle\Helper\Helper; use WellCommerce\Bundle\CoreBundle\Helper\Router\RouterHelperInterface; -use WellCommerce\Bundle\CoreBundle\Manager\ManagerInterface; +use WellCommerce\Bundle\DoctrineBundle\Manager\ManagerInterface; class FacebookAuthenticator extends AbstractGuardAuthenticator {
New managers, datasets, removed query builders
diff --git a/src/skyTracker.js b/src/skyTracker.js index <HASH>..<HASH> 100644 --- a/src/skyTracker.js +++ b/src/skyTracker.js @@ -25,7 +25,14 @@ sky.getInfo = function (id, callback) { return callback(utils.getError('DOWN')) } - const json = JSON.parse(body) + let json = null + try { + json = JSON.parse(body) + } catch (e) { + console.log(id, error) + return callback(utils.getError('PARSER')) + } + // Not found if (json.message.indexOf('No result found for your query.') != -1) {
:art: Added a catch to sky provider json parser
diff --git a/openfisca_country_template/variables/taxes.py b/openfisca_country_template/variables/taxes.py index <HASH>..<HASH> 100644 --- a/openfisca_country_template/variables/taxes.py +++ b/openfisca_country_template/variables/taxes.py @@ -9,8 +9,6 @@ from openfisca_core.model_api import * # Import the entities specifically defined for this tax and benefit system from openfisca_country_template.entities import * -from housing import HousingOccupancyStatus - class income_tax(Variable): value_type = float @@ -54,9 +52,10 @@ class housing_tax(Variable): january = period.first_month accommodation_size = household('accomodation_size', january) - # `housing_occupancy_status` is an Enum. To access an enum element, we use the . notation. - # Note than HousingOccupancyStatus has been imported on the beginning of this file. + # `housing_occupancy_status` is an Enum variable occupancy_status = household('housing_occupancy_status', january) + HousingOccupancyStatus = occupancy_status.possible_values # Get the enum associated with the variable + # To access an enum element, we use the . notation. tenant = (occupancy_status == HousingOccupancyStatus.tenant) owner = (occupancy_status == HousingOccupancyStatus.owner)
Avoid cross-variables files importation
diff --git a/lib/cleaver.js b/lib/cleaver.js index <HASH>..<HASH> 100644 --- a/lib/cleaver.js +++ b/lib/cleaver.js @@ -48,7 +48,9 @@ Cleaver.prototype._parseDocument = function () { self.slides.push(md(slices[i])); } - self.slides.push(self._renderAuthorSlide(self.metadata.author)); + if (self.metadata.author) { + self.slides.push(self._renderAuthorSlide(self.metadata.author)); + } // maybe load an external stylesheet if (self.metadata.style) {
only insert author slide if we have the info available
diff --git a/api/http_test.go b/api/http_test.go index <HASH>..<HASH> 100644 --- a/api/http_test.go +++ b/api/http_test.go @@ -22,6 +22,16 @@ type httpSuite struct { var _ = gc.Suite(&httpSuite{}) +func (s *httpSuite) SetUpSuite(c *gc.C) { + s.HTTPSuite.SetUpSuite(c) + s.JujuConnSuite.SetUpSuite(c) +} + +func (s *httpSuite) TearDownSuite(c *gc.C) { + s.HTTPSuite.TearDownSuite(c) + s.JujuConnSuite.TearDownSuite(c) +} + func (s *httpSuite) SetUpTest(c *gc.C) { s.HTTPSuite.SetUpTest(c) s.JujuConnSuite.SetUpTest(c) @@ -34,6 +44,11 @@ func (s *httpSuite) SetUpTest(c *gc.C) { ) } +func (s *httpSuite) TearDownTest(c *gc.C) { + s.HTTPSuite.TearDownTest(c) + s.JujuConnSuite.TearDownTest(c) +} + func (s *httpSuite) TestNewHTTPRequestSuccess(c *gc.C) { req, err := s.APIState.NewHTTPRequest("GET", "somefacade") c.Assert(err, jc.ErrorIsNil)
Add missing methods to a test suite.
diff --git a/pyrogram/client/methods/messages/send_sticker.py b/pyrogram/client/methods/messages/send_sticker.py index <HASH>..<HASH> 100644 --- a/pyrogram/client/methods/messages/send_sticker.py +++ b/pyrogram/client/methods/messages/send_sticker.py @@ -134,7 +134,7 @@ class SendSticker(BaseClient): elif hasattr(sticker, "read"): file = self.save_file(sticker, progress=progress, progress_args=progress_args) media = types.InputMediaUploadedDocument( - mime_type=self.guess_mime_type(sticker) or "image/webp", + mime_type=self.guess_mime_type(sticker.name) or "image/webp", file=file, attributes=[ types.DocumentAttributeFilename(file_name=sticker.name)
Fix TypeError in send_sticker
diff --git a/Tests/ArrayHelperTest.php b/Tests/ArrayHelperTest.php index <HASH>..<HASH> 100644 --- a/Tests/ArrayHelperTest.php +++ b/Tests/ArrayHelperTest.php @@ -2518,7 +2518,7 @@ class ArrayHelperTest extends TestCase // Search case sensitive. $this->assertEquals('name', ArrayHelper::arraySearch('Foo', $array)); - // Search case insenitive. + // Search case insensitive. $this->assertEquals('email', ArrayHelper::arraySearch('FOOBAR', $array, false)); // Search non existent value.
s/insenitive/insensitive
diff --git a/tests/test_api.py b/tests/test_api.py index <HASH>..<HASH> 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -169,7 +169,7 @@ class TestDeployGit(unittest.TestCase): with settings( branch="develop", repro_url="git@github.com:Frojd/Frojd-Django-Boilerplate1.git", - source_path="django_boilerplate", + source_path="src", warn_only=True): setup() @@ -183,7 +183,7 @@ class TestDeployGit(unittest.TestCase): with settings( branch="develop", repro_url="git@github.com:Frojd/Frojd-Django-Boilerplate.git", - source_path="django_boilerplate", + source_path="src", warn_only=True): setup()
Updated folder strucutre to sync with latest boilerplate repro
diff --git a/symphony/content/content.publish.php b/symphony/content/content.publish.php index <HASH>..<HASH> 100644 --- a/symphony/content/content.publish.php +++ b/symphony/content/content.publish.php @@ -494,13 +494,13 @@ class contentPublish extends AdministrationPage } // Flag filtering + $filter_stats = null; if (isset($_REQUEST['filter'])) { $filter_stats = new XMLElement('p', '<span>– ' . __('%d of %d entries (filtered)', array($entries['total-entries'], EntryManager::fetchCount($section_id))) . '</span>', array('class' => 'inactive')); - $this->Breadcrumbs->appendChild($filter_stats); } else { $filter_stats = new XMLElement('p', '<span>– ' . __('%d entries', array($entries['total-entries'])) . '</span>', array('class' => 'inactive')); - $this->Breadcrumbs->appendChild($filter_stats); } + $this->Breadcrumbs->appendChild($filter_stats); // Build table $visible_columns = $section->fetchVisibleColumns();
Simplify entry count (filter stats).
diff --git a/pydle/features/rfc1459/client.py b/pydle/features/rfc1459/client.py index <HASH>..<HASH> 100644 --- a/pydle/features/rfc1459/client.py +++ b/pydle/features/rfc1459/client.py @@ -688,7 +688,7 @@ class RFC1459Support(BasicClient): def on_raw_318(self, message): """ End of /WHOIS list. """ - target, nickname = message.params[0] + target, nickname = message.params[:2] # Mark future as done. if nickname in self._requests['whois']:
Parse end of WHOIS list properly.
diff --git a/packages/vaex-core/vaex/dataframe.py b/packages/vaex-core/vaex/dataframe.py index <HASH>..<HASH> 100644 --- a/packages/vaex-core/vaex/dataframe.py +++ b/packages/vaex-core/vaex/dataframe.py @@ -3348,10 +3348,10 @@ class DataFrame(object): parts += ["<td>%s</td>" % name] virtual = name not in self.column_names if name in self.column_names: - type = self.dtype(name) + dtype = str(self.dtype(name)) if self.dtype(name) != str else 'str' else: - type = "</i>virtual column</i>" - parts += ["<td>%s</td>" % type] + dtype = "</i>virtual column</i>" + parts += ["<td>%s</td>" % dtype] units = self.unit(name) units = units.to_string("latex_inline") if units else "" parts += ["<td>%s</td>" % units]
Fixes the info panel where the string types were not being displayed (#<I>)
diff --git a/test/minitest_helper.rb b/test/minitest_helper.rb index <HASH>..<HASH> 100644 --- a/test/minitest_helper.rb +++ b/test/minitest_helper.rb @@ -194,3 +194,10 @@ class CustomMiniTestRunner end MiniTest::Unit.runner = CustomMiniTestRunner::Unit.new + +begin # load reporters for RubyMine if available + require 'minitest/reporters' + MiniTest::Reporters.use! +rescue LoadError + # ignored +end if ENV['RUBYMINE']
support for running mini tests in RubyMine add `gem 'minitest-reporters', require: false` to your `bundle.d/local.rb` and set ENV['RUBYMINE'] in Run/Debug configuration defaults
diff --git a/aesh/src/main/java/org/aesh/command/container/DefaultCommandContainer.java b/aesh/src/main/java/org/aesh/command/container/DefaultCommandContainer.java index <HASH>..<HASH> 100644 --- a/aesh/src/main/java/org/aesh/command/container/DefaultCommandContainer.java +++ b/aesh/src/main/java/org/aesh/command/container/DefaultCommandContainer.java @@ -71,6 +71,10 @@ public abstract class DefaultCommandContainer<CI extends CommandInvocation> impl if (getParser().getProcessedCommand().parserExceptions().size() > 0) { throw getParser().getProcessedCommand().parserExceptions().get(0); } + + if (getParser().parsedCommand() == null) { + throw new CommandLineParserException("Command and/or sub-command is not valid!"); + } getParser().parsedCommand().getCommandPopulator().populateObject(getParser().parsedCommand().getProcessedCommand(), invocationProviders, aeshContext, CommandLineParser.Mode.VALIDATE); return getParser().parsedCommand().getProcessedCommand();
Warn user of wrong command In case the user is invoking a wrong command and/or sub-command, a NPE is thrown. This PR attempts to throw a more meaningful exception (CommandLineparserException) and the reason for the stacktrace.
diff --git a/visidata/vdtui.py b/visidata/vdtui.py index <HASH>..<HASH> 100755 --- a/visidata/vdtui.py +++ b/visidata/vdtui.py @@ -2154,7 +2154,7 @@ class Column: try: return self.setValue(row, value) except Exception as e: - pass # exceptionCaught(e) + exceptionCaught(e) def setValues(self, rows, *values): 'Set our column value for given list of rows to `value`.'
[setValueSafe] show exceptions during setter
diff --git a/ui/admin/src/main/java/org/openengsb/ui/admin/testClient/TestClient.java b/ui/admin/src/main/java/org/openengsb/ui/admin/testClient/TestClient.java index <HASH>..<HASH> 100644 --- a/ui/admin/src/main/java/org/openengsb/ui/admin/testClient/TestClient.java +++ b/ui/admin/src/main/java/org/openengsb/ui/admin/testClient/TestClient.java @@ -74,11 +74,8 @@ import org.openengsb.ui.admin.model.Argument; import org.openengsb.ui.admin.model.MethodCall; import org.openengsb.ui.admin.model.MethodId; import org.openengsb.ui.admin.model.ServiceId; -<<<<<<< HEAD import org.openengsb.ui.admin.organizeGlobalsPage.OrganizeGlobalsPage; -======= import org.openengsb.ui.admin.organizeImportsPage.OrganizeImportsPage; ->>>>>>> 70181519016c268a4bbe96e831f5062120b3ff7e import org.openengsb.ui.common.model.LocalizableStringModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
[OPENENGSB-<I>] Corrected merge problem
diff --git a/lib/weblib.php b/lib/weblib.php index <HASH>..<HASH> 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -3432,7 +3432,7 @@ function build_navigation($extranavlinks, $cm = null) { debugging('The field $cm->name should be set if you call build_navigation with '. 'a $cm parameter. If you get $cm using get_coursemodule_from_instance or ', 'get_coursemodule_from_id, this will be done automatically.', DEBUG_DEVELOPER); - if (!$cm->modname = get_field($cm->modname, 'name', 'id', $cm->instance)) { + if (!$cm->name = get_field($cm->modname, 'name', 'id', $cm->instance)) { error('Cannot get the module name in build navigation.'); } }
MDL-<I> - Addendum - fix typo in fixup code. Sorry.
diff --git a/core/analyzer.go b/core/analyzer.go index <HASH>..<HASH> 100644 --- a/core/analyzer.go +++ b/core/analyzer.go @@ -16,7 +16,6 @@ package core import ( - "fmt" "go/ast" "go/importer" "go/parser" @@ -126,7 +125,10 @@ func (gas *Analyzer) process(filename string, source interface{}) error { conf := types.Config{Importer: importer.Default()} gas.context.Pkg, err = conf.Check("pkg", gas.context.FileSet, []*ast.File{root}, gas.context.Info) if err != nil { - return fmt.Errorf(`Error during type checking: "%s"`, err) + // TODO(gm) Type checker not currently considering all files within a package + // see: issue #113 + gas.logger.Printf(`Error during type checking: "%s"`, err) + err = nil } gas.context.Imports = NewImportInfo()
Temporarily disable typechecker fatal error It seems that the typechecker isn't considering the entire package fileset in the current way that gas is processing projects. This leads to cases where types that are defined in one file aren't known about when gas is processing other files within that module. A redesign is needed, this is a temporary fix to return to old behaviour. Related to #<I>
diff --git a/stdeb/util.py b/stdeb/util.py index <HASH>..<HASH> 100644 --- a/stdeb/util.py +++ b/stdeb/util.py @@ -209,11 +209,7 @@ def get_deb_depends_from_setuptools_requires(requirements): if not gooddebs: log.warn("I found no Debian package which provides the required " "Python package \"%s\" with version requirements " - "\"%s\". Guessing blindly that the name \"python-%s\" " - "will be it, and that the Python package version number " - "requirements will apply to the Debian package." - % (req.project_name, req.specs, reqname)) - gooddebs.add("python-" + reqname) + "\"%s\"."% (req.project_name, req.specs)) elif len(gooddebs) == 1: log.info("I found a Debian package which provides the require " "Python package. Python package: \"%s\", " @@ -242,7 +238,8 @@ def get_deb_depends_from_setuptools_requires(requirements): # good package. alts.append("%s"%deb) - depends.append(' | '.join(alts)) + if len(alts): + depends.append(' | '.join(alts)) return depends
don't include packages in Depends: that aren't known to be Debian packages
diff --git a/public/js/content.js b/public/js/content.js index <HASH>..<HASH> 100644 --- a/public/js/content.js +++ b/public/js/content.js @@ -567,7 +567,7 @@ apos.modal = function(sel, options) { // If we don't have a select element first - focus the first input. // We also have to check for a select element within an array as the first field. if ($el.find("form:not(.apos-filter) .apos-fieldset:first.apos-fieldset-selectize, form:not(.apos-filter) .apos-fieldset:first.apos-fieldset-array .apos-fieldset:first.apos-fieldset-selectize").length === 0 ) { - $el.find("form:not(.apos-filter) :input:visible:enabled:first").focus(); + $el.find("form:not(.apos-filter) .apos-fieldset:not([data-extra-fields-link]):first :input:visible:enabled:first").focus(); } }); });
fixed #<I> 'First select field in SlideshowEditor opens with focus when limit:1 is set'
diff --git a/service/service.go b/service/service.go index <HASH>..<HASH> 100644 --- a/service/service.go +++ b/service/service.go @@ -161,6 +161,9 @@ func ListServices(initDir string) ([]string, error) { } var linuxExecutables = map[string]string{ + // Note that some systems link /sbin/init to whatever init system + // is supported, so in the future we may need some other way to + // identify upstart uniquely. "/sbin/init": InitSystemUpstart, "/sbin/upstart": InitSystemUpstart, "/sbin/systemd": InitSystemSystemd,
Add a note about the use of /sbin/init.
diff --git a/gandi/cli/commands/ip.py b/gandi/cli/commands/ip.py index <HASH>..<HASH> 100644 --- a/gandi/cli/commands/ip.py +++ b/gandi/cli/commands/ip.py @@ -3,7 +3,7 @@ import click from gandi.cli.core.cli import cli -from gandi.cli.core.utils import output_ip, output_generic +from gandi.cli.core.utils import output_ip from gandi.cli.core.params import (option, pass_gandi, DATACENTER, IP_TYPE, option, IntChoice)
ip: remove unused import output_generic `output_generic` was never used in this file
diff --git a/packages/create/src/generators/wc-lit-element/templates/_MyEl.js b/packages/create/src/generators/wc-lit-element/templates/_MyEl.js index <HASH>..<HASH> 100644 --- a/packages/create/src/generators/wc-lit-element/templates/_MyEl.js +++ b/packages/create/src/generators/wc-lit-element/templates/_MyEl.js @@ -4,11 +4,9 @@ export class <%= className %> extends LitElement { static get styles() { return css` :host { - --<%= tagName %>-text-color: #000; - display: block; padding: 25px; - color: var(--<%= tagName %>-text-color); + color: var(--<%= tagName %>-text-color, #000); } `; }
fix(create): set default value for variable Previous code set a specific variable value on `:host`, which does not make sense for variables since we probably want to allow overrides from ancestors.
diff --git a/src/constants.js b/src/constants.js index <HASH>..<HASH> 100644 --- a/src/constants.js +++ b/src/constants.js @@ -2,5 +2,8 @@ export const socketOptions = { protocol: 'http', hostname: 'remotedev.io', port: 80, - autoReconnect: true + autoReconnect: true, + autoReconnectOptions: { + randomness: 60000 + } };
Add randomness to the reconnect delay not to flood the server after a worker crash
diff --git a/lib/opal/sprockets/source_map_header_patch.rb b/lib/opal/sprockets/source_map_header_patch.rb index <HASH>..<HASH> 100644 --- a/lib/opal/sprockets/source_map_header_patch.rb +++ b/lib/opal/sprockets/source_map_header_patch.rb @@ -22,7 +22,9 @@ module Opal def self.inject!(prefix) self.prefix = prefix - ::Sprockets::Server.send :include, self + unless ::Sprockets::Server.ancestors.include?(self) + ::Sprockets::Server.send :include, self + end end def self.prefix
Guard against multiple calls to the .included hook
diff --git a/lib/Cake/Database/Connection.php b/lib/Cake/Database/Connection.php index <HASH>..<HASH> 100644 --- a/lib/Cake/Database/Connection.php +++ b/lib/Cake/Database/Connection.php @@ -140,8 +140,8 @@ class Connection { * * @param string|Driver $driver * @param array|null $config Either config for a new driver or null. - * @throws Cake\Database\MissingDriverException When a driver class is missing. - * @throws Cake\Database\MissingExtensionException When a driver's PHP extension is missing. + * @throws Cake\Database\Exception\MissingDriverException When a driver class is missing. + * @throws Cake\Database\Exception\MissingExtensionException When a driver's PHP extension is missing. * @return Driver */ public function driver($driver = null, $config = null) { diff --git a/lib/Cake/Test/TestCase/Database/QueryTest.php b/lib/Cake/Test/TestCase/Database/QueryTest.php index <HASH>..<HASH> 100644 --- a/lib/Cake/Test/TestCase/Database/QueryTest.php +++ b/lib/Cake/Test/TestCase/Database/QueryTest.php @@ -17,8 +17,8 @@ namespace Cake\Test\TestCase\Database; use Cake\Core\Configure; -use Cake\Database\Query; use Cake\Database\ConnectionManager; +use Cake\Database\Query; use Cake\TestSuite\TestCase; /**
Resolving a couple coding standard errors
diff --git a/lib/trello/basic_data.rb b/lib/trello/basic_data.rb index <HASH>..<HASH> 100644 --- a/lib/trello/basic_data.rb +++ b/lib/trello/basic_data.rb @@ -55,7 +55,7 @@ module Trello resource = options.delete(:in) || self.class.to_s.split("::").last.downcase.pluralize klass = options.delete(:via) || Trello.const_get(name.to_s.singularize.camelize) params = options.merge(args[0] || {}) - resources = Client.get("/#{resource}/#{id}/#{name}", options).json_into(klass) + resources = Client.get("/#{resource}/#{id}/#{name}", params).json_into(klass) MultiAssociation.new(self, resources).proxy end end
Update lib/trello/basic_data.rb Use the processed options as a parameter so that filtering of trello objects works
diff --git a/c_level_db.go b/c_level_db.go index <HASH>..<HASH> 100644 --- a/c_level_db.go +++ b/c_level_db.go @@ -107,6 +107,7 @@ func (db *CLevelDB) Print() { } func (db *CLevelDB) Stats() map[string]string { + // TODO: Find the available properties for the C LevelDB implementation keys := []string{} stats := make(map[string]string) diff --git a/mem_db.go b/mem_db.go index <HASH>..<HASH> 100644 --- a/mem_db.go +++ b/mem_db.go @@ -94,10 +94,7 @@ func (it *memDBIterator) Key() []byte { } func (it *memDBIterator) Value() []byte { - it.db.mtx.Lock() - defer it.db.mtx.Unlock() - - return it.db.db[it.keys[it.last]] + return it.db.Get(it.Key()) } func (db *MemDB) Iterator() Iterator {
Commented the empty table in c_level_db, and cleaned up the mem_db Value call.
diff --git a/modules/tags/editsynonym.php b/modules/tags/editsynonym.php index <HASH>..<HASH> 100644 --- a/modules/tags/editsynonym.php +++ b/modules/tags/editsynonym.php @@ -41,7 +41,7 @@ if ( $locale === false ) return $Module->handleError( eZError::KERNEL_NOT_FOUND, 'kernel' ); if ( count( $languages ) == 1 ) - return $Module->redirectToView( 'editsynonym', array( $tag->attribute( 'id' ), $languages[0]->attribute( 'locale' ) ) ); + return $Module->redirectToView( 'editsynonym', array( $tag->attribute( 'id' ), current( $languages )->attribute( 'locale' ) ) ); $tpl = eZTemplate::factory();
also applied the language fix to editsynonym.php
diff --git a/tasks/ssh_deploy.js b/tasks/ssh_deploy.js index <HASH>..<HASH> 100644 --- a/tasks/ssh_deploy.js +++ b/tasks/ssh_deploy.js @@ -11,7 +11,7 @@ module.exports = function(grunt) { grunt.registerTask('ssh_deploy', 'Begin Deployment', function() { - this.async(); + var done = this.async(); var Connection = require('ssh2'); var client = require('scp2'); var moment = require('moment'); @@ -174,7 +174,9 @@ module.exports = function(grunt) { updateSymlink, onAfterDeploy, closeConnection - ]); + ], function () { + done(); + }); }; }); }; \ No newline at end of file
Fixed ssh-deploy task hangs on finish #3
diff --git a/server_metrics/postgresql.py b/server_metrics/postgresql.py index <HASH>..<HASH> 100644 --- a/server_metrics/postgresql.py +++ b/server_metrics/postgresql.py @@ -14,3 +14,4 @@ def get_database_size(db_user, db_name): db_user, db_name) total = commands.getoutput(cmd).split()[2] total = int(total) + return total
Bugfix: get_postgresql_size did not return anything