diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/src/test/locale/pa-in.js b/src/test/locale/pa-in.js index <HASH>..<HASH> 100644 --- a/src/test/locale/pa-in.js +++ b/src/test/locale/pa-in.js @@ -311,18 +311,6 @@ test('lenient ordinal parsing of number', function (assert) { } }); -test('meridiem', function (assert) { - var h, m, t1, t2; - for (h = 0; h < 24; ++h) { - for (m = 0; m < 60; m += 15) { - t1 = moment.utc([2000, 0, 1, h, m]); - t2 = moment(t1.format('A h:mm'), 'A h:mm'); - assert.equal(t2.format('HH:mm'), t1.format('HH:mm'), - 'meridiem at ' + t1.format('HH:mm')); - } - } -}); - test('strict ordinal parsing', function (assert) { var i, ordinalStr, testMoment; for (i = 1; i <= 31; ++i) {
Remove duplicate unit test This is already in common-locale.js and runs for all locales
diff --git a/.eslintrc.js b/.eslintrc.js index <HASH>..<HASH> 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -38,6 +38,9 @@ module.exports = { // I don't know how to get this to work with peerDependencies 'import/no-extraneous-dependencies': 0, + // going to try this going forward since I normally want to do export * from "./file" + 'import/prefer-default-export': 0, + // This doesn't play well with hooks and it doesn't mean much with Typescript to me 'consistent-return': 0,
chore(eslint): disabled prefer-default-export rule Going to play with this disabled for a bit since I normally need to do: ```ts export * from "./file"; ``` Right now I have to do multiple exports because of this rule: ```ts export { default as THING } from "./file" export * from "./file" ```
diff --git a/javascript/CMSMain.AddForm.js b/javascript/CMSMain.AddForm.js index <HASH>..<HASH> 100644 --- a/javascript/CMSMain.AddForm.js +++ b/javascript/CMSMain.AddForm.js @@ -69,10 +69,11 @@ this.setSelected(true); }, setSelected: function(bool) { + var input = this.find('input'); this.toggleClass('selected', bool); - if(bool) { + if(bool && !input.is(':disabled')) { this.siblings().setSelected(false); - this.find('input').attr('checked', 'checked'); + input.attr('checked', 'checked'); } }, setEnabled: function(bool) {
MINOR Don't allow page type selection in add form when radio button is disabled
diff --git a/lib/controls/document.js b/lib/controls/document.js index <HASH>..<HASH> 100644 --- a/lib/controls/document.js +++ b/lib/controls/document.js @@ -21,3 +21,24 @@ function Document(container) { Document.prototype = Object.create(UIElement.prototype); Document.prototype.constructor = Document; + +Document.prototype.addDef = function (defsMarkup) { + if (!defsMarkup) throw new Error('DefsMarkup is required argument for Document.addDef() method'); + + var defs = getDefsElement(this._dom); + var defContent = require('../utils/domParser')(defsMarkup); + for (var i = 0; i < defContent.length; ++i) { + defs.appendChild(defContent[i]); + } +}; + +function getDefsElement(svgRoot) { + var children = svgRoot.childNodes; + for (var i = 0; children.length; ++i) { + if (children[i].localName === 'defs') return children[i]; + } + + var defs = require('../utils/svg')('defs'); + svgRoot.appendChild(defs); + return defs; +}
Added `addDef` method
diff --git a/src/Test/WebTest/WebTestBase.php b/src/Test/WebTest/WebTestBase.php index <HASH>..<HASH> 100644 --- a/src/Test/WebTest/WebTestBase.php +++ b/src/Test/WebTest/WebTestBase.php @@ -205,7 +205,8 @@ class WebTestBase extends WebTestCase $doCheck = self::$client && !self::$conditionsChecked && $this->usesClient && self::$probablyWorking < 24 && !getenv('TestCaseDisableCheck') && ('PHPUnit_Framework_ExpectationFailedException' !== get_class($e) || - false === strpos($e->getMessage(), 'local problem ') + false === strpos($e->getMessage(), 'local problem ') && + false === strpos($e->getMessage(), '_routes.yml') ); if ($doCheck) { fwrite(STDOUT, " checking local problems - after a failure\n");
[Test] no failureCheck when SmokeTests reports "failure" of outdated _routes.yml
diff --git a/lib/muster/version.rb b/lib/muster/version.rb index <HASH>..<HASH> 100644 --- a/lib/muster/version.rb +++ b/lib/muster/version.rb @@ -1,5 +1,5 @@ # Muster module Muster # Current version of Muster - VERSION = '0.0.11' + VERSION = '0.0.12' end
Updated version to <I>
diff --git a/src/structures/Message.js b/src/structures/Message.js index <HASH>..<HASH> 100644 --- a/src/structures/Message.js +++ b/src/structures/Message.js @@ -386,10 +386,10 @@ class Message extends Base { * @readonly */ get deletable() { - return ( + return Boolean( !this.deleted && - (this.author.id === this.client.user.id || - (this.guild && this.channel.permissionsFor(this.client.user).has(Permissions.FLAGS.MANAGE_MESSAGES, false))) + (this.author.id === this.client.user.id || + this.channel.permissionsFor?.(this.client.user)?.has(Permissions.FLAGS.MANAGE_MESSAGES)), ); }
fix(Message): update getters to take null permissions into account (#<I>) * fix(Message): update message#delete * refactor(Message): message#deletable avoid duplicate call * Update Message.js * fix(message): resolve syntax errors * chore(message): resolve linting issues (death to the gh web panel) * Update Message.js * death to the github web panel * Update src/structures/Message.js
diff --git a/lib/Core/Service/Mapper/ConfigMapper.php b/lib/Core/Service/Mapper/ConfigMapper.php index <HASH>..<HASH> 100644 --- a/lib/Core/Service/Mapper/ConfigMapper.php +++ b/lib/Core/Service/Mapper/ConfigMapper.php @@ -7,7 +7,7 @@ use Netgen\BlockManager\Config\Registry\ConfigDefinitionRegistryInterface; use Netgen\BlockManager\Core\Values\Config\Config; use Netgen\BlockManager\Core\Values\Config\ConfigCollection; -class ConfigMapper extends Mapper +class ConfigMapper { /** * @var \Netgen\BlockManager\Core\Service\Mapper\ParameterMapper
Remove unused extending of abstract Mapper class in ConfigMapper
diff --git a/Collection.php b/Collection.php index <HASH>..<HASH> 100644 --- a/Collection.php +++ b/Collection.php @@ -224,25 +224,13 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate if (func_num_args() == 2) { $value = $operator; - $operator = '==='; + $operator = '='; } return $this->filter($this->operatorForWhere($key, $operator, $value)); } /** - * Filter items by the given key value pair using loose comparison. - * - * @param string $key - * @param mixed $value - * @return static - */ - public function whereLoose($key, $value) - { - return $this->where($key, '=', $value); - } - - /** * Get an operator checker callback. * * @param string $key
Make Collection@where use loose comparison by default
diff --git a/spec/kamerling/server/tcp_spec.rb b/spec/kamerling/server/tcp_spec.rb index <HASH>..<HASH> 100644 --- a/spec/kamerling/server/tcp_spec.rb +++ b/spec/kamerling/server/tcp_spec.rb @@ -25,9 +25,7 @@ module Kamerling describe Server::TCP do describe '#stop' do it 'stops the server' do - tcp = Server::TCP.new(addr: addr).start - addr = tcp.addr - tcp.stop + Server::TCP.new(addr: addr).start.stop run_all_threads -> { TCPSocket.open(*addr) }.must_raise Errno::ECONNREFUSED end
simplify Server::TCP#stop spec
diff --git a/lib/sitemap.rb b/lib/sitemap.rb index <HASH>..<HASH> 100644 --- a/lib/sitemap.rb +++ b/lib/sitemap.rb @@ -160,7 +160,7 @@ module Sitemap private def get_data(object, data) - data.respond_to?(:call) ? data.call(object) : data + data.is_a?(Proc) ? data.call(object) : data end end
Using a more reliable way of determining if received data is a block.
diff --git a/intercom/__init__.py b/intercom/__init__.py index <HASH>..<HASH> 100644 --- a/intercom/__init__.py +++ b/intercom/__init__.py @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. __author__ = 'OKso http://okso.me' -__version__ = '0.2' +__version__ = '0.2.1' from .relay import Relay from .controller import Controller diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ from setuptools import setup setup(name='Intercom', - version='0.2', + version='0.2.1', description='Messaging system for Home automation', author='OKso.me', author_email='@okso.me',
[enh] New bugfixes release
diff --git a/buildAll_config.py b/buildAll_config.py index <HASH>..<HASH> 100755 --- a/buildAll_config.py +++ b/buildAll_config.py @@ -9,7 +9,7 @@ import subprocess # The build scripts expect the OpenSSL and Zlib src packages # to be in nassl's root folder -OPENSSL_DIR = join(getcwd(), 'openssl-1.0.2d') +OPENSSL_DIR = join(getcwd(), 'openssl-1.0.2e') # Warning: use a fresh Zlib src tree on Windows or build will fail # ie. do not use the same Zlib src folder for Windows and Unix build ZLIB_DIR = join(getcwd(), 'zlib-1.2.8')
Switched to OpenSSL <I>e in build config
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index <HASH>..<HASH> 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,6 +5,7 @@ require "navigator/action_view/instance_methods" require "pry" RSpec.configure do |config| - config.filter_run focus: true config.run_all_when_everything_filtered = true + config.treat_symbols_as_metadata_keys_with_true_values = true + config.filter_run focus: true end
Treat symbols and true values by default when running RSpec specs. [ci skip]
diff --git a/impl/src/main/java/com/groupon/lex/metrics/timeseries/expression/RateExpression.java b/impl/src/main/java/com/groupon/lex/metrics/timeseries/expression/RateExpression.java index <HASH>..<HASH> 100644 --- a/impl/src/main/java/com/groupon/lex/metrics/timeseries/expression/RateExpression.java +++ b/impl/src/main/java/com/groupon/lex/metrics/timeseries/expression/RateExpression.java @@ -116,9 +116,9 @@ public class RateExpression implements TimeSeriesMetricExpression { @Override public TimeSeriesMetricDeltaSet apply(Context ctx) { - final Context previous = new PreviousContextWrapper(ctx, interval_ - .map(intv -> ctx.getTSData().getPreviousCollectionPairAt(intv)) - .orElseGet(() -> ctx.getTSData().getPreviousCollectionPair(1))); + final Context previous = new PreviousContextWrapper( + ctx, + ctx.getTSData().getPreviousCollectionPairAt(interval_.orElseGet(() -> ctx.getTSData().getCollectionInterval()))); final Duration collection_interval = new Duration( previous.getTSData().getCurrentCollection().getTimestamp(), ctx.getTSData().getCurrentCollection().getTimestamp());
Change how rate expression finds the previous collection.
diff --git a/pyPodcastParser/Podcast.py b/pyPodcastParser/Podcast.py index <HASH>..<HASH> 100644 --- a/pyPodcastParser/Podcast.py +++ b/pyPodcastParser/Podcast.py @@ -254,10 +254,7 @@ class Podcast(): def set_owner(self): """Parses owner name and email then sets value""" - try: - owner = self.soup.find('itunes:owner') - except AttributeError: - owner = None + owner = self.soup.find('itunes:owner') try: self.owner_name = owner.find('itunes:name').string except AttributeError:
fixed unneeded try block in set_owner()
diff --git a/out_request.js b/out_request.js index <HASH>..<HASH> 100644 --- a/out_request.js +++ b/out_request.js @@ -515,12 +515,12 @@ TChannelOutRequest.prototype.onTimeout = function onTimeout(now) { } if (!self.res || self.res.state === States.Initial) { - self.end = now; self.timedOut = true; if (self.operations) { self.operations.checkLastTimeoutTime(now); self.operations.popOutReq(self.id); } + process.nextTick(deferOutReqTimeoutErrorEmit); }
out_request: set self.end in emitError() only
diff --git a/src/com/caverock/androidsvg/SVGParser.java b/src/com/caverock/androidsvg/SVGParser.java index <HASH>..<HASH> 100644 --- a/src/com/caverock/androidsvg/SVGParser.java +++ b/src/com/caverock/androidsvg/SVGParser.java @@ -590,6 +590,8 @@ public class SVGParser extends DefaultHandler radialGradient(attributes); } else if (localName.equalsIgnoreCase(TAG_STOP)) { stop(attributes); + } else if (localName.equalsIgnoreCase(TAG_A)) { + // do nothing } else { ignoring = true; ignoreDepth = 1;
Added nominal support for <a> so that its contents can be rendered.
diff --git a/src/main/java/net/openhft/chronicle/network/internal/lookuptable/FileBasedHostnamePortLookupTable.java b/src/main/java/net/openhft/chronicle/network/internal/lookuptable/FileBasedHostnamePortLookupTable.java index <HASH>..<HASH> 100644 --- a/src/main/java/net/openhft/chronicle/network/internal/lookuptable/FileBasedHostnamePortLookupTable.java +++ b/src/main/java/net/openhft/chronicle/network/internal/lookuptable/FileBasedHostnamePortLookupTable.java @@ -294,5 +294,15 @@ public class FileBasedHostnamePortLookupTable implements HostnamePortLookupTable public int hashCode() { return Objects.hash(pid, hostname, port); } + + @Override + public String toString() { + return "ProcessScopedMapping{" + + "pid=" + pid + + ", hostname='" + hostname + '\'' + + ", port=" + port + + ", hasInetSocketAddress=" + (address != null) + + '}'; + } } }
Add toString method to ProcessScopedMapping
diff --git a/src/Drupal/DrupalExtension/Context/DrupalContext.php b/src/Drupal/DrupalExtension/Context/DrupalContext.php index <HASH>..<HASH> 100644 --- a/src/Drupal/DrupalExtension/Context/DrupalContext.php +++ b/src/Drupal/DrupalExtension/Context/DrupalContext.php @@ -147,7 +147,7 @@ class DrupalContext extends MinkContext implements DrupalAwareInterface { * Override MinkContext::locatePath() to work around Selenium not supporting * basic auth. */ - protected function locatePath($path) { + public function locatePath($path) { $driver = $this->getSession()->getDriver(); if ($driver instanceof Selenium2Driver && isset($this->basic_auth)) { // Add the basic auth parameters to the base url. This only works for
Issue #<I> by langworthy: Fixed locatePath() should be public.
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ def read(fname): setup( name='unleash', - version='0.4.3.dev1', + version='0.5.1.dev1', description=('Creates release commits directly in git, unleashes them on ' 'PyPI and pushes tags to github.'), long_description=read('README.rst'), diff --git a/unleash/__init__.py b/unleash/__init__.py index <HASH>..<HASH> 100644 --- a/unleash/__init__.py +++ b/unleash/__init__.py @@ -1 +1 @@ -__version__ = '0.4.3.dev1' +__version__ = '0.5.1.dev1'
Increased version to <I>.dev1 after release of <I>. (commit by unleash <I>.dev1)
diff --git a/carrot/backends/pyamqplib.py b/carrot/backends/pyamqplib.py index <HASH>..<HASH> 100644 --- a/carrot/backends/pyamqplib.py +++ b/carrot/backends/pyamqplib.py @@ -172,6 +172,8 @@ class Backend(BaseBackend): def establish_connection(self): """Establish connection to the AMQP broker.""" conninfo = self.connection + if not conninfo.hostname: + raise KeyError("Missing hostname for AMQP connection.") if not conninfo.port: conninfo.port = self.default_port return Connection(host=conninfo.host,
amqplib: Raise KeyError if hostname isn't set, for a more friendly error message.
diff --git a/peewee_migrate/auto.py b/peewee_migrate/auto.py index <HASH>..<HASH> 100644 --- a/peewee_migrate/auto.py +++ b/peewee_migrate/auto.py @@ -143,14 +143,17 @@ def diff_many(models1, models2, migrator=None, reverse=False): def model_to_code(Model, **kwargs): template = """class {classname}(pw.Model): {fields} +{meta} """ fields = INDENT + NEWLINE.join([ field_to_code(field, **kwargs) for field in Model._meta.sorted_fields if not (isinstance(field, pw.PrimaryKeyField) and field.name == 'id') ]) + meta = INDENT + NEWLINE.join(['class Meta:', + INDENT + 'db_table = "%s"' % Model._meta.db_table]) return template.format( classname=Model.__name__, - fields=fields + fields=fields, meta=meta ) diff --git a/tests/test_auto.py b/tests/test_auto.py index <HASH>..<HASH> 100644 --- a/tests/test_auto.py +++ b/tests/test_auto.py @@ -14,6 +14,7 @@ def test_auto(): code = model_to_code(Person_) assert code + assert 'db_table = "person"' in code changes = diff_many(models, [], migrator=migrator) assert len(changes) == 2
Support db_table in auto migrations.
diff --git a/lib/dbf/record.rb b/lib/dbf/record.rb index <HASH>..<HASH> 100644 --- a/lib/dbf/record.rb +++ b/lib/dbf/record.rb @@ -42,7 +42,7 @@ module DBF key = key.to_s if attributes.has_key?(key) attributes[key] - elsif index = column_names.index(key) + elsif index = underscored_column_names.index(key) attributes[@columns[index].name] end end @@ -60,7 +60,7 @@ module DBF # @param [String, Symbol] method # @return [Boolean] def respond_to?(method, *args) - if column_names.include?(method.to_s) + if underscored_column_names.include?(method.to_s) true else super @@ -70,14 +70,15 @@ module DBF private def method_missing(method, *args) #nodoc + if index = underscored_column_names.index(method.to_s) attributes[@columns[index].name] else super end end - def column_names - @column_names ||= @columns.map {|column| column.underscored_name} + def underscored_column_names # nodoc + @underscored_column_names ||= @columns.map {|column| column.underscored_name} end def init_attribute(column) #nodoc
rename private column_names method
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php index <HASH>..<HASH> 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php @@ -76,8 +76,7 @@ class DataCollectorListener implements EventSubscriberInterface $this->dataCollector->collectSubmittedData($event->getForm()); // Assemble a form tree - // This is done again in collectViewVariables(), but that method - // is not guaranteed to be called (i.e. when no view is created) + // This is done again after the view is built, but we need it here as the view is not always created. $this->dataCollector->buildPreliminaryFormTree($event->getForm()); } }
Clarify a comment. The previous comment was lying since collectViewVariables() doesn't really call the buildPreliminaryFormTree() nor the buildFinalFormTree().
diff --git a/test/renderer/epics/github-publish-spec.js b/test/renderer/epics/github-publish-spec.js index <HASH>..<HASH> 100644 --- a/test/renderer/epics/github-publish-spec.js +++ b/test/renderer/epics/github-publish-spec.js @@ -156,7 +156,7 @@ describe('handleGistError', () => { }); describe('publishEpic', () => { - const input$ = Observable.of(PUBLISH_USER_GIST); + const input$ = Observable.of({ type: PUBLISH_USER_GIST }); const action$ = new ActionsObservable(input$); const store = { getState: function() { return this.state; }, state: { @@ -175,7 +175,7 @@ describe('publishEpic', () => { const responseActions = publishEpic(action$, store); const subscription = responseActions.subscribe( actionBuffer.push, // Every action that goes through should get stuck on an array - (err) => expect.fail(err, null), // It should not error in the stream + (err) => {}, // It should not error in the stream () => { expect(actionBuffer).to.deep.equal([]); // ; },
chore(EpicsTesting): Actually test epic.
diff --git a/lib/sfn/command/destroy.rb b/lib/sfn/command/destroy.rb index <HASH>..<HASH> 100644 --- a/lib/sfn/command/destroy.rb +++ b/lib/sfn/command/destroy.rb @@ -53,7 +53,7 @@ module Sfn nested_stack_cleanup!(n_stack) end nest_stacks = stack.template.fetch('Resources', {}).values.find_all do |resource| - resource['Type'] == stack.api.const_get(:RESOURCE_MAPPING).key(stack.class).to_s + resource['Type'] == stack.api.class.const_get(:RESOURCE_MAPPING).key(stack.class).to_s end.each do |resource| url = resource['Properties']['TemplateURL'] if(url)
Fix constant fetching for stack type comparison
diff --git a/lib/search_engine.py b/lib/search_engine.py index <HASH>..<HASH> 100644 --- a/lib/search_engine.py +++ b/lib/search_engine.py @@ -3241,7 +3241,8 @@ def perform_request_search(req=None, cc=cdsname, c=None, p="", f="", rg="10", sf search_unit_in_bibrec(day1, day2), ap, aptext= _("No match within your time limits, " - "discarding this condition...")) + "discarding this condition..."), + of=of) except: if of.startswith("h"): req.write(create_error_box(req, verbose=verbose, ln=ln)) @@ -3261,7 +3262,8 @@ def perform_request_search(req=None, cc=cdsname, c=None, p="", f="", rg="10", sf search_pattern(req, pl, ap=0, ln=ln), ap, aptext=_("No match within your search limits, " - "discarding this condition...")) + "discarding this condition..."), + of=of) except: if of.startswith("h"): req.write(create_error_box(req, verbose=verbose, ln=ln))
removed another source of noise in the XML stream
diff --git a/src/org/jgroups/blocks/TCPConnectionMap.java b/src/org/jgroups/blocks/TCPConnectionMap.java index <HASH>..<HASH> 100644 --- a/src/org/jgroups/blocks/TCPConnectionMap.java +++ b/src/org/jgroups/blocks/TCPConnectionMap.java @@ -84,7 +84,7 @@ public class TCPConnectionMap{ this.conn_expire_time = conn_expire_time; if(socket_factory != null) this.socket_factory=socket_factory; - this.srv_sock=Util.createServerSocket(socket_factory, service_name, bind_addr, srv_port, max_port); + this.srv_sock=Util.createServerSocket(this.socket_factory, service_name, bind_addr, srv_port, max_port); if(external_addr != null) local_addr=new IpAddress(external_addr, srv_sock.getLocalPort());
passed in incorrect SocketFactory
diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/services/task/commands/GetTaskContentCommand.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/services/task/commands/GetTaskContentCommand.java index <HASH>..<HASH> 100644 --- a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/services/task/commands/GetTaskContentCommand.java +++ b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/services/task/commands/GetTaskContentCommand.java @@ -30,7 +30,10 @@ public class GetTaskContentCommand extends TaskCommand<Map<String, Object>> { @SuppressWarnings("unchecked") public Map<String, Object> execute(Context cntxt) { TaskContext context = (TaskContext) cntxt; - Task taskById =context.getTaskQueryService().getTaskInstanceById(taskId); + Task taskById = context.getTaskQueryService().getTaskInstanceById(taskId); + if (taskById == null) { + throw new IllegalStateException("Unable to find task with id " + taskId); + } TaskContentService contentService = context.getTaskContentService();
BZ-<I> - NPE in GetTaskContentCommand.java:<I> when trying to get task content for second human task in own web app
diff --git a/tests/test_flow.py b/tests/test_flow.py index <HASH>..<HASH> 100644 --- a/tests/test_flow.py +++ b/tests/test_flow.py @@ -13,6 +13,7 @@ # limitations under the License. import concurrent.futures +from functools import partial import json import os @@ -165,11 +166,12 @@ class TestInstalledAppFlow(object): def test_run_local_server( self, webbrowser_mock, instance, mock_fetch_token): auth_redirect_url = urllib.parse.urljoin( - 'http://localhost:8080', + 'http://localhost:60452', self.REDIRECT_REQUEST_PATH) with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool: - future = pool.submit(instance.run_local_server) + future = pool.submit(partial( + instance.run_local_server, port=60452)) while not future.done(): try:
Uses a test port that is less likely to be taken (#<I>) After running this in a different CI environment, I had issues with the test being unable to open port <I> as it was already in use. This doesn't fix the problem perfectly but is less likely to encounter a collision.
diff --git a/internal/pixels/pixels.go b/internal/pixels/pixels.go index <HASH>..<HASH> 100644 --- a/internal/pixels/pixels.go +++ b/internal/pixels/pixels.go @@ -15,6 +15,7 @@ package pixels import ( + "errors" "image" "image/color" @@ -148,6 +149,9 @@ func (p *Pixels) HasDependency() bool { // // Restore is the only function that the pixel data is not present on GPU when this is called. func (p *Pixels) Restore(context *opengl.Context, width, height int, filter opengl.Filter) (*graphics.Image, error) { + if p.stale { + return nil, errors.New("pixels: pixels must not be stale when restoring") + } img := image.NewRGBA(image.Rect(0, 0, width, height)) if p.basePixels != nil { for j := 0; j < height; j++ {
pixels: Ensure pixels is not stale when restoring
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js index <HASH>..<HASH> 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -1008,7 +1008,10 @@ OpenLayers.Map.prototype = { var dY = -parseInt(this.layerContainerDiv.style.top); layerPx = viewPortPx.add(dX, dY); } - return layerPx; + if (!isNaN(layerPx.x) && !isNaN(layerPx.y)) { + return layerPx; + } + return null; }, //
Don't ever return NaN from getLayerContainerPxFromViewPortPx, since that can cause problems in multiple different layers -- instead, just return null, which is handled more gracefully. git-svn-id: <URL>
diff --git a/modules/social_features/social_topic/src/Controller/SocialTopicController.php b/modules/social_features/social_topic/src/Controller/SocialTopicController.php index <HASH>..<HASH> 100644 --- a/modules/social_features/social_topic/src/Controller/SocialTopicController.php +++ b/modules/social_features/social_topic/src/Controller/SocialTopicController.php @@ -76,7 +76,7 @@ class SocialTopicController extends ControllerBase { if ($topic_type_id !== NULL) { // Topic type can be "All" will crash overview on /newest-topics. if (is_numeric($topic_type_id)) { - $term = $this->entityTypeManager->getStorage('topic')->load($topic_type_id); + $term = $this->entityTypeManager->getStorage('taxonomy_term')->load($topic_type_id); if ($term->access('view') && $term->getVocabularyId() === 'topic_types') { $term_title = $term->getName();
Issue #<I> by frankgraave: fixed the filter for the topic types
diff --git a/lib/runner/run.js b/lib/runner/run.js index <HASH>..<HASH> 100644 --- a/lib/runner/run.js +++ b/lib/runner/run.js @@ -67,10 +67,13 @@ _.extend(Run.prototype, { return callback(new Error('run: already running')); } - _.isFinite(_.get(this.options, 'timeout.global')) && - backpack.timeback(callback, this.options.timeout.global, this, function () { + var timeback = callback; + + if (_.isFinite(_.get(this.options, 'timeout.global'))) { + timeback = backpack.timeback(callback, this.options.timeout.global, this, function () { this.pool.clear(); }); + } // invoke all the initialiser functions one after another and if it has any error then abort with callback. async.series(_.map(Run.initialisers, function (initializer) { @@ -81,7 +84,7 @@ _.extend(Run.prototype, { // save the normalised callbacks as triggers this.triggers = callback; this.triggers.start(null, this.state.cursor.current()); // @todo may throw error if cursor absent - this._process(callback); + this._process(timeback); }.bind(this)); },
ensure that the timeout is respected and used
diff --git a/lib/active_fulfillment/version.rb b/lib/active_fulfillment/version.rb index <HASH>..<HASH> 100644 --- a/lib/active_fulfillment/version.rb +++ b/lib/active_fulfillment/version.rb @@ -1,4 +1,4 @@ # encoding: utf-8 module ActiveFulfillment - VERSION = "3.0.0.pre5" + VERSION = "3.0.0.pre6" end
Bump to <I>.pre6
diff --git a/test/collection.js b/test/collection.js index <HASH>..<HASH> 100644 --- a/test/collection.js +++ b/test/collection.js @@ -178,7 +178,7 @@ test('find > should project only specified fields using fields options', t => { { a: 1, b: 2 }, { a: 1, b: 1 } ]).then(() => { - return users.find({ sort: true }, { fields: { a: 1 } }) + return users.find({}, { sort: true, fields: { a: 1 } }) }).then((docs) => { t.is(docs[0].a, 1) t.is(docs[0].b, undefined)
Fixed find test. According to the prototype, first argument must be a query: (query, opts, fn)
diff --git a/lib/twofishes/client.rb b/lib/twofishes/client.rb index <HASH>..<HASH> 100644 --- a/lib/twofishes/client.rb +++ b/lib/twofishes/client.rb @@ -11,9 +11,10 @@ module Twofishes # @example # Twofishes::Client.geocode('Zurich, Switzerland') # - def self.geocode(location, response_includes = []) + def self.geocode(location, includes = []) handle_response do - thrift_client.geocode(GeocodeRequest.new(query: location, responseIncludes: response_includes)) + request = GeocodeRequest.new(query: location, responseIncludes: includes) + thrift_client.geocode() end end @@ -24,10 +25,11 @@ module Twofishes # @example # Twofishes::Client.reverse_geocode([47.3787733, 8.5273363]) # - def self.reverse_geocode(coords) + def self.reverse_geocode(coordinates, includes = []) handle_response do - point = GeocodePoint.new(lat: coords[0], lng: coords[1]) - thrift_client.reverseGeocode(GeocodeRequest.new(ll: point)) + point = GeocodePoint.new(lat: coordinates[0], lng: coordinates[1]) + request = GeocodeRequest.new(ll: point, responseIncludes: includes) + thrift_client.reverseGeocode(request) end end
reverse_geocode should accept responseIncludes too
diff --git a/test/conftest.py b/test/conftest.py index <HASH>..<HASH> 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -25,5 +25,6 @@ def app(): SCRIPTDIR, "testdata/dem_to_hillshade.mapchete") args = Namespace( port=5000, mapchete_file=example_process, zoom=None, bounds=None, - input_file=None, memory=None, readonly=False, overwrite=True) + input_file=None, memory=None, readonly=False, overwrite=True, + debug=False) return create_app(args)
fixed serve tests with new debug flag
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -21,6 +21,7 @@ module.exports = function (_cb) { handshake: { read: reader.read, abort: function (err) { + writer.end(err) reader.abort(err, function (err) { }) _cb(err)
abort source and sink on an error
diff --git a/src/colorMapper.js b/src/colorMapper.js index <HASH>..<HASH> 100644 --- a/src/colorMapper.js +++ b/src/colorMapper.js @@ -109,19 +109,17 @@ export function differentialColorMapper (d, originalColor) { if (delta === value) { // likely a new frame, color orange - r = 190 + Math.round(65 * vector) - g = 90 + Math.round(65 * vector) + r = Math.round(235 * (1 - vector)) + g = Math.round(135 * (1 - vector)) b = 0 } else if (delta > 0) { // an increase, color red - r = 200 + Math.round(55 * vector) - g = 50 + Math.round(80 * vector) - b = g + b = Math.round(235 * (1 - vector)) + g = b } else if (delta < 0) { // a decrease, color blue - r = 50 + Math.round(80 * vector) + r = Math.round(235 * (1 - vector)) g = r - b = 200 + Math.round(55 * vector) } return 'rgb(' + r + ',' + g + ',' + b + ')'
refactor: differential color mapper improvement
diff --git a/src/foremast/utils/find_elb.py b/src/foremast/utils/find_elb.py index <HASH>..<HASH> 100644 --- a/src/foremast/utils/find_elb.py +++ b/src/foremast/utils/find_elb.py @@ -32,4 +32,5 @@ def find_elb(name='', env='', region=''): raise SpinnakerElbNotFound( 'Elb for "{0}" in region {1} not found'.format(name, region)) + LOG.info('Found: %s', elb_dns) return elb_dns
fix: INFO for found ELB See also: PSOBAT-<I>
diff --git a/src/Pdox.php b/src/Pdox.php index <HASH>..<HASH> 100644 --- a/src/Pdox.php +++ b/src/Pdox.php @@ -13,6 +13,7 @@ namespace Buki; use Buki\Cache; +use Exception; use PDO; use PDOException; use Closure; @@ -496,13 +497,11 @@ class Pdox $msg = '<h1>Database Error</h1>'; $msg .= '<h4>Query: <em style="font-weight:normal;">"'.$this->query.'"</em></h4>'; $msg .= '<h4>Error: <em style="font-weight:normal;">'.$this->error.'</em></h4>'; + if($this->debug === true) - { die($msg); - } - else { - throw new \Exception($msg); - } + else + throw new Exception($this->error . ". (" . $this->query . ")"); } public function get($type = false)
Updated error() methods and fixed error messages in Pdox.
diff --git a/lib/ecstatic/opts.js b/lib/ecstatic/opts.js index <HASH>..<HASH> 100644 --- a/lib/ecstatic/opts.js +++ b/lib/ecstatic/opts.js @@ -4,7 +4,7 @@ module.exports = function (opts) { var autoIndex = true, showDir = false, - humanReadable = false, + humanReadable = true, si = false, cache = 'max-age=3600', gzip = false, @@ -34,7 +34,8 @@ module.exports = function (opts) { [ 'humanReadable', - 'humanreadable' + 'humanreadable', + 'human-readable' ].some(function (k) { if (typeof opts[k] !== 'undefined' && opts[k] !== null) { humanReadable = opts[k]; @@ -43,7 +44,8 @@ module.exports = function (opts) { }); [ - 'si' + 'si', + 'index' ].some(function (k) { if (typeof opts[k] !== 'undefined' && opts[k] !== null) { si = opts[k];
Opts for human-readable and si
diff --git a/generators/newapp/new.go b/generators/newapp/new.go index <HASH>..<HASH> 100644 --- a/generators/newapp/new.go +++ b/generators/newapp/new.go @@ -19,7 +19,6 @@ import ( // Run returns a generator to create a new application func (a Generator) Run(root string, data makr.Data) error { g := makr.New() - defer g.Fmt(a.Root) if a.Force { os.RemoveAll(a.Root) @@ -104,6 +103,13 @@ func (a Generator) Run(root string, data makr.Data) error { } g.Add(makr.NewCommand(a.goGet())) + g.Add(makr.Func{ + Runner: func(root string, data makr.Data) error { + g.Fmt(root) + return nil + }, + }) + if _, err := exec.LookPath("git"); err == nil { g.Add(makr.NewCommand(exec.Command("git", "init"))) g.Add(makr.NewCommand(exec.Command("git", "add", ".")))
make sure fmt/imports is run before git init
diff --git a/lib/solargraph/language_server/host.rb b/lib/solargraph/language_server/host.rb index <HASH>..<HASH> 100644 --- a/lib/solargraph/language_server/host.rb +++ b/lib/solargraph/language_server/host.rb @@ -136,7 +136,7 @@ module Solargraph def open? uri result = nil @change_semaphore.synchronize do - result = library.open?(uri_to_file(uri)) + result = unsafe_open?(uri) end result end @@ -503,6 +503,10 @@ module Solargraph @change_queue.any?{|change| change['textDocument']['uri'] == file_uri} end + def unsafe_open? uri + library.open?(uri_to_file(uri)) + end + def requests @requests ||= {} end @@ -546,9 +550,13 @@ module Solargraph @diagnostics_queue.push change['textDocument']['uri'] next true else - # @todo Change is out of order. Save it for later - STDERR.puts "Skipping out of order change to #{change['textDocument']['uri']}" - next false + if unsafe_open?(change['textDocument']['uri']) + STDERR.puts "Skipping out of order change to #{change['textDocument']['uri']}" + next false + else + STDERR.puts "Deleting out of order change to closed file #{change['textDocument']['uri']}" + next true + end end end refreshable = changed and @change_queue.empty?
Host deletes out of order changes to closed files.
diff --git a/Controller/Tool/RolesController.php b/Controller/Tool/RolesController.php index <HASH>..<HASH> 100644 --- a/Controller/Tool/RolesController.php +++ b/Controller/Tool/RolesController.php @@ -406,8 +406,7 @@ class RolesController extends Controller { $this->checkAccess($workspace); $this->roleManager->associateRolesToSubjects($users, $roles, true); - $listCptNodes = $this->cptManager->getCompetenceByWorkspace($workspace); - $this->cptManager->subscribeUserToCompetences($users,$listCptNodes); + return new Response('success'); }
[CoreBundle] Fixes competence bug when registering user to workspace
diff --git a/library/src/pivotal-ui-react/tabs/tabs.js b/library/src/pivotal-ui-react/tabs/tabs.js index <HASH>..<HASH> 100644 --- a/library/src/pivotal-ui-react/tabs/tabs.js +++ b/library/src/pivotal-ui-react/tabs/tabs.js @@ -178,7 +178,6 @@ class Tabs extends mixin(React.Component).with(Animation) { actions, children, className, - defaultActiveKey, id = this.state.id, largeScreenClassName, onSelect, @@ -186,7 +185,6 @@ class Tabs extends mixin(React.Component).with(Animation) { position, tabType, tabWidth, - responsiveBreakpoint, ...props} = this.props; const largeScreenClasses = classnames([`tab-${tabType}`, largeScreenClassName, className]);
chore(Tabs): Remove crufty props [#<I>]
diff --git a/TYPO3.Flow/Classes/Persistence/DataMapper.php b/TYPO3.Flow/Classes/Persistence/DataMapper.php index <HASH>..<HASH> 100644 --- a/TYPO3.Flow/Classes/Persistence/DataMapper.php +++ b/TYPO3.Flow/Classes/Persistence/DataMapper.php @@ -199,9 +199,9 @@ class DataMapper { * @author Karsten Dambekalns <karsten@typo3.org> */ protected function mapDateTime($timestamp) { - if (is_integer($timestamp)) { + if ($timestamp !== NULL) { $datetime = new \DateTime(); - $datetime->setTimestamp($timestamp); + $datetime->setTimestamp((integer) $timestamp); return $datetime; } else { return NULL;
[~TASK] FLOW3 (Persistence): Followup to r<I> regarding timestamp detection in mapDateTime(). Original-Commit-Hash: db<I>c<I>e<I>b4fa<I>af<I>da7f<I>dbd8e
diff --git a/src/Twig/Handler/RecordHandler.php b/src/Twig/Handler/RecordHandler.php index <HASH>..<HASH> 100644 --- a/src/Twig/Handler/RecordHandler.php +++ b/src/Twig/Handler/RecordHandler.php @@ -188,7 +188,7 @@ class RecordHandler ->notPath('node_modules') ->notPath('bower_components') ->notPath('.sass-cache') - ->depth('<2') + ->depth('<4') ->path($name) ->sortByName() ; @@ -200,7 +200,7 @@ class RecordHandler // Get the active themeconfig $themeConfig = $this->app['config']->get('theme/templateselect/templates', false); - + // Check: Have we defined names for any of the matched templates? if ($themeConfig) { foreach ($themeConfig as $templateFile) {
Look for template files in deeper folders. Fixes #<I>
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -51,6 +51,7 @@ export default class Drawer extends Component { onCloseStart: PropTypes.func, onOpen: PropTypes.func, onOpenStart: PropTypes.func, + onDragStart: PropTypes.func, openDrawerOffset: PropTypes.oneOfType([PropTypes.number, PropTypes.func]), panThreshold: PropTypes.number, panCloseMask: PropTypes.number, @@ -244,7 +245,7 @@ export default class Drawer extends Component { this._panning = false this.shouldOpenDrawer(gestureState.dx) ? this.open() : this.close() }; - + onStartShouldSetPanResponderCapture = (e, gestureState) => { if (this.shouldCaptureGestures()) return this.processShouldSet(e, gestureState) return false @@ -278,6 +279,9 @@ export default class Drawer extends Component { this._left = left this.updatePosition() + if (!this._panning) { + this.props.onDragStart && this.props.onDragStart(); + } this._panning = true }; @@ -398,7 +402,7 @@ export default class Drawer extends Component { if(typeof type === 'function') { type() // this is actually a callback } else cb && cb() - + } }) };
Add support for onDragStart
diff --git a/src/main/java/com/google/cloud/genomics/dataflow/utils/GenomicsDatasetOptions.java b/src/main/java/com/google/cloud/genomics/dataflow/utils/GenomicsDatasetOptions.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/google/cloud/genomics/dataflow/utils/GenomicsDatasetOptions.java +++ b/src/main/java/com/google/cloud/genomics/dataflow/utils/GenomicsDatasetOptions.java @@ -104,7 +104,7 @@ public interface GenomicsDatasetOptions extends GenomicsOptions { @Description("The IDs of the Google Genomics transcript sets this pipeline is working with, " + "comma delimited. Defaults to UCSC refGene (hg19).") - @Default.String("CIjfoPXj9LqPlAEQ6Mm91Ya458eqAQ") + @Default.String("CIjfoPXj9LqPlAEQ5vnql4KewYuSAQ") String getTranscriptSetIds(); void setTranscriptSetIds(String transcriptSetIds);
Update UCSC transcript set to reimported version This version of the transcriptset has gene IDs populated.
diff --git a/git.go b/git.go index <HASH>..<HASH> 100644 --- a/git.go +++ b/git.go @@ -11,7 +11,6 @@ import ( "errors" "unsafe" "strings" - "fmt" ) const ( diff --git a/packbuilder.go b/packbuilder.go index <HASH>..<HASH> 100644 --- a/packbuilder.go +++ b/packbuilder.go @@ -121,7 +121,7 @@ func (pb *Packbuilder) forEachWrap(data *packbuilderCbData) { // you want to stop the pack-building process (e.g. there's an error // writing to the output), close or write a value into the "stop" // channel. -func (pb *Packbuilder) ForEach() (data <-chan []byte, stop chan<- bool) { +func (pb *Packbuilder) ForEach() (<-chan []byte, chan<- bool) { ch := make(chan []byte) stop := make(chan bool) data := packbuilderCbData{ch, stop}
Packbuilder: compilation fixes Don't name the return values, as they conflict with the names we want inside and the types don't match what we want to have inside. We need them to be two-way channels in the function, and then pass unidirectional references to the different functions.
diff --git a/src/Testing/RuleTestCase.php b/src/Testing/RuleTestCase.php index <HASH>..<HASH> 100644 --- a/src/Testing/RuleTestCase.php +++ b/src/Testing/RuleTestCase.php @@ -28,9 +28,11 @@ abstract class RuleTestCase extends \PHPUnit_Framework_TestCase $count = count($violations); $expectedCount = count($expectedViolations); + // @codeCoverageIgnoreStart if ($count === 0 && $expectedCount > 0) { $this->fail("{$expectedCount} violations were expected in {$file}, none found"); } + // @codeCoverageIgnoreEnd $stdViolations = array_map(function ($violation) { return $violation->toStdClass(); @@ -44,6 +46,9 @@ abstract class RuleTestCase extends \PHPUnit_Framework_TestCase ); } + /** + * @codeCoverageIgnore (data providers are executed before tests start) + */ public function sampleProvider() { $ruleName = $this->getRule()->name();
Ignore coverage of code unreachable during tests
diff --git a/bin/add_machine.rb b/bin/add_machine.rb index <HASH>..<HASH> 100755 --- a/bin/add_machine.rb +++ b/bin/add_machine.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -require_relative '../lib/boxcutter' +require File.dirname(__FILE__) + '/../lib/boxcutter' require 'trollop' opts = Trollop::options do diff --git a/bin/remove_machine.rb b/bin/remove_machine.rb index <HASH>..<HASH> 100755 --- a/bin/remove_machine.rb +++ b/bin/remove_machine.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -require_relative '../lib/boxcutter' +require File.dirname(__FILE__) + '/../lib/boxcutter' require 'trollop' opts = Trollop::options do
Remove <I> dependency from scripts
diff --git a/model/src/main/java/org/jboss/pnc/model/Base32LongID.java b/model/src/main/java/org/jboss/pnc/model/Base32LongID.java index <HASH>..<HASH> 100644 --- a/model/src/main/java/org/jboss/pnc/model/Base32LongID.java +++ b/model/src/main/java/org/jboss/pnc/model/Base32LongID.java @@ -83,6 +83,7 @@ public class Base32LongID implements Serializable { * @throws IOException */ private void writeObject(java.io.ObjectOutputStream stream) throws IOException { + stream.defaultWriteObject(); stream.writeLong(id); } @@ -94,7 +95,7 @@ public class Base32LongID implements Serializable { * @throws ClassNotFoundException */ private void readObject(java.io.ObjectInputStream stream) throws IOException, ClassNotFoundException { + stream.defaultReadObject(); this.id = stream.readLong(); } - }
[NCLSUP-<I>] add readDefaultObject and writeDefaultObject This is a suggestion from Paul Ferraro to ensure that the requisite class descriptors (as well as any non-transient fields) are written to the stream (which are required by JBoss Marshalling for deserialization).
diff --git a/src/nodes.js b/src/nodes.js index <HASH>..<HASH> 100644 --- a/src/nodes.js +++ b/src/nodes.js @@ -20,7 +20,7 @@ export default function virtualizeNodes(element, options = {}) { function convertNode(element, createdVNodes, context) { // If our node is a text node, then we only want to set the `text` part of // the VNode. - if (element.nodeType === Node.TEXT_NODE) { + if (element.nodeType === context.defaultView.Node.TEXT_NODE) { const newNode = createTextVNode(element.textContent, context); createdVNodes.push(newNode); return newNode
Use the context to access Node constants, instead of relying on global.
diff --git a/src/Client.php b/src/Client.php index <HASH>..<HASH> 100755 --- a/src/Client.php +++ b/src/Client.php @@ -39,7 +39,7 @@ class Client if (isset($options['auth_timeout_seconds'])) { $this->authTimeoutSeconds = $options['auth_timeout_seconds']; } else { - $this->authTimeoutSeconds = 12 * 60 * 60; // 12 hour default + $this->authTimeoutSeconds = 12 * 60 * 60; // 12 hour default } // set reauthorize time to force an authentication to take place
Spacing problem fixed. #scrutinizer-ci
diff --git a/src/Admin/AdminAccount.php b/src/Admin/AdminAccount.php index <HASH>..<HASH> 100644 --- a/src/Admin/AdminAccount.php +++ b/src/Admin/AdminAccount.php @@ -38,7 +38,8 @@ class AdminAccount { } /** - * @return mixed + * [RO] Preia o lista cu informatii generale ale contului de afiliat (https://github.com/celdotro/marketplace/wiki/Listeaza-informatiile-contului) + * [EN] Retrieves a list of general account information (https://github.com/celdotro/marketplace/wiki/List-account-information) */ public function getAccountInformation(){ // Set method and action
Added comments for account information retrieval
diff --git a/test/models/person.rb b/test/models/person.rb index <HASH>..<HASH> 100644 --- a/test/models/person.rb +++ b/test/models/person.rb @@ -14,6 +14,6 @@ class Person end def ==(other_person) - other_person.is_a?(Person) && id = other_person.id + other_person.is_a?(Person) && id == other_person.id end -end \ No newline at end of file +end
Fix `Person#==` method in test.
diff --git a/main/main.go b/main/main.go index <HASH>..<HASH> 100644 --- a/main/main.go +++ b/main/main.go @@ -165,9 +165,13 @@ and this stack trace: %s ` - + stackByteCount := 0 + STACK_SIZE_LIMIT := 1024 * 1024 var bytes []byte - runtime.Stack(bytes, true) + for stackSize := 1024; (stackByteCount == 0 || stackByteCount == stackSize) && stackSize < STACK_SIZE_LIMIT; stackSize = 2 * stackSize { + bytes = make([]byte, stackSize) + stackByteCount = runtime.Stack(bytes, true) + } stackTrace := "\t" + strings.Replace(string(bytes), "\n", "\n\t", -1) println(fmt.Sprintf(formattedString, cf.Name(), strings.Join(os.Args, " "), errorMessage, stackTrace)) }
added code to allocate bytes for runtime.Stack() call
diff --git a/lib/gcli/test/automators/requisition.js b/lib/gcli/test/automators/requisition.js index <HASH>..<HASH> 100644 --- a/lib/gcli/test/automators/requisition.js +++ b/lib/gcli/test/automators/requisition.js @@ -31,8 +31,6 @@ exports.createRequisitionAutomator = function(requisition) { updateCursor(); }; - requisition.onTextChange.add(textChanged); - var updateCursor = function() { cursor.start = typed.length; cursor.end = typed.length; @@ -54,7 +52,6 @@ exports.createRequisitionAutomator = function(requisition) { }, getInputState: function() { - var typed = requisition.toString(); return { typed: typed, cursor: { start: cursor.start, end: cursor.end } @@ -91,11 +88,11 @@ exports.createRequisitionAutomator = function(requisition) { if (keyCode === KeyEvent.DOM_VK_RETURN) { throw new Error('Fake DOM_VK_RETURN not supported'); } + typed = requisition.toString(); updateCursor(); }, destroy: function() { - requisition.onTextChange.remove(textChanged); } };
jsterm-<I>: Remove onTextChange from Requisition Automator For command line testing we don’t need this event either.
diff --git a/lib/heroku/command/pg_backups.rb b/lib/heroku/command/pg_backups.rb index <HASH>..<HASH> 100644 --- a/lib/heroku/command/pg_backups.rb +++ b/lib/heroku/command/pg_backups.rb @@ -112,13 +112,13 @@ class Heroku::Command::Pg < Heroku::Command::Base end def size_pretty(bytes) - suffixes = { - 'B' => 1, - 'kB' => 1_000, - 'MB' => 1_000_000, - 'GB' => 1_000_000_000, - 'TB' => 1_000_000_000_000 # (ohdear) - } + suffixes = [ + ['B', 1], + ['kB', 1_000], + ['MB', 1_000_000], + ['GB', 1_000_000_000], + ['TB', 1_000_000_000_000] # (ohdear) + ] suffix, multiplier = suffixes.find do |k,v| normalized = bytes / v.to_f normalized >= 0 && normalized < 1_000
Fix size_pretty on <I> since it doesn't guarantee hash key order
diff --git a/tests/Environment.php b/tests/Environment.php index <HASH>..<HASH> 100644 --- a/tests/Environment.php +++ b/tests/Environment.php @@ -27,15 +27,11 @@ trait Environment '--all' => true, ]); - $this->artisan('orchid:link'); - - //$this->loadLaravelMigrations('orchid'); - $this->artisan('migrate:fresh', [ '--database' => 'orchid', ]); - $this->artisan('storage:link'); + //$this->artisan('storage:link'); $this->artisan('orchid:link'); $this->withFactories(realpath(DASHBOARD_PATH.'/database/factories'));
ErrorException: symlink(): No such file or directory
diff --git a/spec/request/base/request_attach_spec.rb b/spec/request/base/request_attach_spec.rb index <HASH>..<HASH> 100644 --- a/spec/request/base/request_attach_spec.rb +++ b/spec/request/base/request_attach_spec.rb @@ -11,7 +11,7 @@ describe 'RubyRabbitmqJanus::RRJ -- message type attach' do describe '#start_transaction', type: :request, level: :base, name: :attach do - context 'when queue is exclusive' do + context 'when queue is exclusive', broken: true do include_examples 'transaction should match json schema' end diff --git a/spec/request/peer/request_offer_spec.rb b/spec/request/peer/request_offer_spec.rb index <HASH>..<HASH> 100644 --- a/spec/request/peer/request_offer_spec.rb +++ b/spec/request/peer/request_offer_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -describe 'RubyRabbitmqJanus::RRJ -- message type offer' do +# @todo Create a message reading by janus +describe 'RubyRabbitmqJanus::RRJ -- message type offer', broken: true do before(:example) do clear attach_base
Change spec in broken mode :(
diff --git a/lib/GameWindow.js b/lib/GameWindow.js index <HASH>..<HASH> 100644 --- a/lib/GameWindow.js +++ b/lib/GameWindow.js @@ -898,7 +898,7 @@ oldPos = this.headerPosition; - // Store the new position in a reference variable + // Store the new position in a reference variable // **before** adaptFrame2HeaderPosition is called this.headerPosition = pos; @@ -1344,6 +1344,8 @@ * * Warning: Security policies may block this method if the content is * coming from another domain. + * Notice: If called multiple times within the same stage/step, it will + * the `VisualTimer` widget to reload the timer. * * @param {string} uri The uri to load * @param {function} func Optional. The function to call once the DOM is @@ -1770,7 +1772,7 @@ W.removeClass(W.frameElement, 'ng_mainframe-header-[a-z-]*'); switch(position) { - case 'right': + case 'right': W.addClass(W.frameElement, 'ng_mainframe-header-vertical-r'); break; case 'left':
Added notice to GameWindow.loadFrame about resetting of VisualTimer
diff --git a/salt/pillar/ec2_pillar.py b/salt/pillar/ec2_pillar.py index <HASH>..<HASH> 100644 --- a/salt/pillar/ec2_pillar.py +++ b/salt/pillar/ec2_pillar.py @@ -242,6 +242,10 @@ def ext_pillar( # Get the Master's instance info, primarily the region (_, region) = _get_instance_info() + # If the Minion's region is available, use it instead + if use_grain: + region = __grains__.get('ec2', {}).get('region', region) + try: conn = boto.ec2.connect_to_region(region) except boto.exception.AWSConnectionError as exc:
Use the minion's region if use_grain is enabled This makes it possible for the master to be in a different region than the minion and still fetch ec2 pillars. This requires the use_grain configuration to be set to True and will fall back to the master's region if there is no region grain. Credit to John Nielsen for the code.
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index <HASH>..<HASH> 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -442,7 +442,7 @@ module Rails # the file with the master key. # The master key is either stored in `config/master.key` or `ENV["RAILS_MASTER_KEY"]`. # - # Rails.application.encrypted("config/mystery_man.key").read + # Rails.application.encrypted("config/mystery_man.txt.enc").read # # => "We've met before, haven't we?" # # It's also possible to interpret encrypted YAML files with `config`.
Fixed example of `Rails.application.encrypted` method usage [ci skip]
diff --git a/law/config.py b/law/config.py index <HASH>..<HASH> 100644 --- a/law/config.py +++ b/law/config.py @@ -55,7 +55,7 @@ class Config(ConfigParser): "singularity_volumes": {}, } - _config_files = ["$LAW_CONFIG_FILE", "$HOME/.law/config", "etc/law/config"] + _config_files = ["$LAW_CONFIG_FILE", "law.cfg", "$HOME/.law/config", "etc/law/config"] @classmethod def instance(cls, config_file=""): @@ -109,13 +109,13 @@ class Config(ConfigParser): overwrite_sections = overwrite overwrite_options = overwrite - for section, _data in data.items(): + for section, _data in six.iteritems(data): if not self.has_section(section): self.add_section(section) elif not overwrite_sections: continue - for option, value in _data.items(): + for option, value in six.iteritems(_data): if overwrite_options or not self.has_option(section, option): self.set(section, option, str(value))
Add additional fallback config in current dir.
diff --git a/src/Devture/Bundle/LocalizationBundle/Routing/LocaleAwareUrlGenerator.php b/src/Devture/Bundle/LocalizationBundle/Routing/LocaleAwareUrlGenerator.php index <HASH>..<HASH> 100644 --- a/src/Devture/Bundle/LocalizationBundle/Routing/LocaleAwareUrlGenerator.php +++ b/src/Devture/Bundle/LocalizationBundle/Routing/LocaleAwareUrlGenerator.php @@ -20,7 +20,11 @@ class LocaleAwareUrlGenerator extends UrlGenerator { $route = $this->routes->get($name); if ($route instanceof Route) { if (strpos($route->getPath(), '{locale}') !== false) { - $parameters['locale'] = $this->getRequest()->getLocale(); + try { + $parameters['locale'] = $this->getRequest()->getLocale(); + } catch (\RuntimeException $e) { + //Not running in a request context. + } } } return parent::generate($name, $parameters, $absolute);
Don't break when not running in a request context
diff --git a/thinc/neural/util.py b/thinc/neural/util.py index <HASH>..<HASH> 100644 --- a/thinc/neural/util.py +++ b/thinc/neural/util.py @@ -52,12 +52,14 @@ def copy_array(dst, src, casting='same_kind', where=None): else: numpy.copyto(dst, src) - def ensure_path(path): - if isinstance(path, basestring) or isinstance(path, str): - return Path(path) - else: - return path + try: + if isinstance(path, basestring) or isinstance(path, str): + return Path(path) + except NameError: + if isinstance(path, str): + return Path(path) + return path def to_categorical(y, nb_classes=None):
Try/Except around use of basestring that doesn't exist in python3
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -43,7 +43,6 @@ setup( classifiers=[ "Programming Language :: Python", "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7",
We no longer support Python <I>
diff --git a/views/mdc/assets/js/components/events/posts.js b/views/mdc/assets/js/components/events/posts.js index <HASH>..<HASH> 100644 --- a/views/mdc/assets/js/components/events/posts.js +++ b/views/mdc/assets/js/components/events/posts.js @@ -1,5 +1,6 @@ import {VSnackbar} from '../snackbar'; import {VBase} from './base'; +import Config from '../../utils/config'; // Replaces a given element with the contents of the call to the url. // parameters are appended. @@ -79,7 +80,13 @@ export class VPosts extends VBase { }; // Set up our request httpRequest.open(method, url); - console.log(method + ':' + url); + + const headers = Config.get('request.headers.POST'); + + for (const [key, value] of Object.entries(headers)) { + httpRequest.setRequestHeader(key, value); + } + // Send our FormData object; HTTP headers are set automatically httpRequest.send(FD); }); @@ -96,4 +103,4 @@ export class VPosts extends VBase { } return null; } -} \ No newline at end of file +}
(#<I>) Set POST request headers from configuration
diff --git a/src/Provider/Google.php b/src/Provider/Google.php index <HASH>..<HASH> 100644 --- a/src/Provider/Google.php +++ b/src/Provider/Google.php @@ -43,7 +43,7 @@ class Google extends AbstractProvider { return 'https://www.googleapis.com/plus/v1/people/me?'. - 'fields=name(familyName%2CgivenName)%2CdisplayName%2C'. + 'fields=id%2Cname(familyName%2CgivenName)%2CdisplayName%2C'. 'emails%2Fvalue%2Cimage%2Furl&alt=json&access_token='.$token; }
id was not being returned by Google
diff --git a/pychromecast/__init__.py b/pychromecast/__init__.py index <HASH>..<HASH> 100644 --- a/pychromecast/__init__.py +++ b/pychromecast/__init__.py @@ -363,10 +363,8 @@ class Chromecast: def ignore_cec(self): """ Returns whether the CEC data should be ignored. """ return self.device is not None and any( - [ - fnmatch.fnmatchcase(self.device.friendly_name, pattern) - for pattern in IGNORE_CEC - ] + fnmatch.fnmatchcase(self.device.friendly_name, pattern) + for pattern in IGNORE_CEC ) @property diff --git a/pychromecast/socket_client.py b/pychromecast/socket_client.py index <HASH>..<HASH> 100644 --- a/pychromecast/socket_client.py +++ b/pychromecast/socket_client.py @@ -340,7 +340,8 @@ class SocketClient(threading.Thread): self.port, ) self.socket.connect((self.host, self.port)) - self.socket = ssl.wrap_socket(self.socket) + context = ssl.SSLContext() + self.socket = context.wrap_socket(self.socket) self.connecting = False self._force_recon = False self._report_connection_status(
Adapt to pylint <I> (#<I>)
diff --git a/avakas/avakas.py b/avakas/avakas.py index <HASH>..<HASH> 100644 --- a/avakas/avakas.py +++ b/avakas/avakas.py @@ -49,6 +49,7 @@ class Avakas(): @property def version(self): """Get version""" + tag_prefix = self.options.get('tag_prefix', '') return "%s%s" % (tag_prefix, self._version) diff --git a/avakas/flavors/base.py b/avakas/flavors/base.py index <HASH>..<HASH> 100644 --- a/avakas/flavors/base.py +++ b/avakas/flavors/base.py @@ -124,6 +124,7 @@ class AvakasLegacy(Avakas): def write_versionfile(self): """Write the version file""" + path = os.path.join(self.directory, self.version_filename) version_file = open(path, 'w') version_file.write("%s\n" % self.version)
Whitespace: added a break after docstring
diff --git a/src/grid/GridView.php b/src/grid/GridView.php index <HASH>..<HASH> 100644 --- a/src/grid/GridView.php +++ b/src/grid/GridView.php @@ -78,6 +78,9 @@ class GridView extends \hiqdev\higrid\GridView 'class' => ClientColumn::class, 'attribute' => 'client_id', ], + 'client_like' => [ + 'class' => ClientColumn::class, + ], ]; }
Added search by client_like to default GridView
diff --git a/src/notebook/reducers/document.js b/src/notebook/reducers/document.js index <HASH>..<HASH> 100644 --- a/src/notebook/reducers/document.js +++ b/src/notebook/reducers/document.js @@ -21,9 +21,25 @@ export default { const { notebook } = state; const cellOrder = notebook.get('cellOrder'); const curIndex = cellOrder.findIndex(id => id === action.id); + + const nextIndex = curIndex + 1; + + // When at the end, create a new cell + if (nextIndex >= cellOrder.size) { + const cellID = uuid.v4(); + // TODO: condition on state.defaultCellType (markdown vs. code) + const cell = commutable.emptyCodeCell; + return { + ...state, + focusedCell: cellID, + notebook: commutable.insertCellAt(notebook, cell, cellID, nextIndex), + }; + } + + // When in the middle of the notebook document, move to the next cell return { ...state, - focusedCell: cellOrder.get(curIndex + 1), + focusedCell: cellOrder.get(nextIndex), }; }, [constants.UPDATE_CELL_EXECUTION_COUNT]: function updateExecutionCount(state, action) {
When at end of doc, create new cell after run cell
diff --git a/sirtrevor/views.py b/sirtrevor/views.py index <HASH>..<HASH> 100644 --- a/sirtrevor/views.py +++ b/sirtrevor/views.py @@ -47,6 +47,7 @@ def attachment(request): data['path'] = default_storage.save(name, file_) data['url'] = default_storage.url(data['path']) + data['name'] = os.path.split(data['path'])[1] data['size'] = file_.size return HttpResponse(json.dumps({'file': data}))
Also return the file name for each attachment.
diff --git a/bulbs/indexable/indexable.py b/bulbs/indexable/indexable.py index <HASH>..<HASH> 100644 --- a/bulbs/indexable/indexable.py +++ b/bulbs/indexable/indexable.py @@ -170,9 +170,11 @@ class PolymorphicIndexable(object): return "%s_%s" % (cls._meta.app_label, cls._meta.module_name) @classmethod - def get_mapping_type_names(cls): + def get_mapping_type_names(cls, include_self=True): """Returns the mapping type name of this class and all of its descendants.""" - names = [cls.get_mapping_type_name()] + names = [] + if include_self: + names.append(cls.get_mapping_type_name()) for subclass in cls.__subclasses__(): names.extend(subclass.get_mapping_type_names()) return names
Added option to exclude base type from get_mapping_type_names
diff --git a/packages/@vue/cli/lib/Migrator.js b/packages/@vue/cli/lib/Migrator.js index <HASH>..<HASH> 100644 --- a/packages/@vue/cli/lib/Migrator.js +++ b/packages/@vue/cli/lib/Migrator.js @@ -1,8 +1,6 @@ const Generator = require('./Generator') const MigratorAPI = require('./MigratorAPI') -const inferRootOptions = require('./util/inferRootOptions') - module.exports = class Migrator extends Generator { constructor (context, { plugin, @@ -19,11 +17,25 @@ module.exports = class Migrator extends Generator { files, invoking }) - this.plugins = [plugin] - const rootOptions = inferRootOptions(pkg) + this.migratorPlugin = plugin + this.invoking = invoking + } + + async generate () { + const plugin = this.migratorPlugin + // apply migrators from plugins - const api = new MigratorAPI(plugin.id, plugin.installed, this, plugin.options, rootOptions) - plugin.apply(api, plugin.options, rootOptions, invoking) + const api = new MigratorAPI( + plugin.id, + plugin.installed, + this, + plugin.options, + this.rootOptions + ) + + await plugin.apply(api, plugin.options, this.rootOptions, this.invoking) + + await super.generate() } }
fix: fix Migrator implementation due to Generator internal change
diff --git a/lib/rest-graph.rb b/lib/rest-graph.rb index <HASH>..<HASH> 100644 --- a/lib/rest-graph.rb +++ b/lib/rest-graph.rb @@ -427,7 +427,8 @@ class RestGraph < RestGraphStruct r } EM::MultiRequest.new(rs){ |m| - clients = m.responses.values.flatten + # TODO: how to deal with the failed? + clients = m.responses[:succeeded] results = clients.map{ |client| post_request(client.response, client.uri) }
TODO: how to deal with the failed?
diff --git a/pronto/utils/io.py b/pronto/utils/io.py index <HASH>..<HASH> 100644 --- a/pronto/utils/io.py +++ b/pronto/utils/io.py @@ -124,11 +124,21 @@ def decompress( # Attempt to detect the encoding and decode the stream det: Dict[str, Union[str, float]] = chardet.detect(decompressed.peek()) - if encoding is not None: - det = dict(encoding=encoding, confidence=1.0) - elif det["encoding"] == "ascii": - det["encoding"] = "UTF-8" - if det["confidence"] == 1.0: + confidence: float = 1.0 if encoding is not None else det["confidence"] + encoding = encoding if encoding is not None else det["encoding"] + + if encoding == "ascii": + encoding = "UTF-8" + if confidence < 1.0: + warnings.warn( + f"unsound encoding, assuming {encoding} ({confidence:.0%} confidence)", + UnicodeWarning, + stacklevel=3, + ) + + if encoding == "UTF-8": + return typing.cast(BinaryIO, decompressed) + else: return typing.cast( BinaryIO, BufferedReader( @@ -142,8 +152,3 @@ def decompress( ) ), ) - else: - warnings.warn( - "could not find encoding, assuming UTF-8", UnicodeWarning, stacklevel=3 - ) - return typing.cast(BinaryIO, decompressed)
Change behaviour of `io.decompress` to use chardet encoding
diff --git a/common.go b/common.go index <HASH>..<HASH> 100644 --- a/common.go +++ b/common.go @@ -5,6 +5,7 @@ import ( "archive/zip" "errors" "fmt" + "github.com/dmotylev/goproperties" "io" "io/ioutil" "log" @@ -39,8 +40,6 @@ const ( curl = "curl" appData = "APPDATA" gaugePropertiesFile = "gauge.properties" - GaugeRepositoryUrl = "gauge_repository_url" - ApiRefreshInterval = "gauge_api_refresh_interval" ) const (
Removing config details from common
diff --git a/stdlib/sql.go b/stdlib/sql.go index <HASH>..<HASH> 100644 --- a/stdlib/sql.go +++ b/stdlib/sql.go @@ -126,6 +126,12 @@ var ( fakeTxConns map[*pgx.Conn]*sql.Tx ) +// GetDefaultDriver return the driver initialize in the init function +// and used when register pgx driver +func GetDefaultDriver() *Driver { + return pgxDriver +} + type Driver struct { configMutex sync.Mutex configCount int64
Close issue #<I> : Give access to the registered driver instance Some library use a driver to wrap its behavior and give additional functionality, as the datadog tracing library ("gopkg.in/DataDog/dd-trace-go.v1/contrib/database/sql") This commit aims to give access to this instance which can't be correctly initialized to due private fields without default values (the configuration map inside the driver)
diff --git a/classes/fields/link.php b/classes/fields/link.php index <HASH>..<HASH> 100644 --- a/classes/fields/link.php +++ b/classes/fields/link.php @@ -204,18 +204,7 @@ class PodsField_Link extends PodsField_Website { // Ensure proper format $value = $this->pre_save( $value, $id, $name, $options, null, $pod ); - if ( ! empty( $options['disable_dfv'] ) ) { - return pods_view( PODS_DIR . 'ui/fields/' . $field_type . '.php', compact( array_keys( get_defined_vars() ) ) ); - } - - wp_enqueue_script( 'pods-dfv' ); - - $type = pods_v( 'type', $options, static::$type ); - - $args = compact( array_keys( get_defined_vars() ) ); - $args = (object) $args; - - $this->render_input_script( $args ); + pods_view( PODS_DIR . 'ui/fields/' . $field_type . '.php', compact( array_keys( get_defined_vars() ) ) ); } /**
Update link field type to not use DFV
diff --git a/lib/Subscription.php b/lib/Subscription.php index <HASH>..<HASH> 100644 --- a/lib/Subscription.php +++ b/lib/Subscription.php @@ -10,6 +10,17 @@ namespace Stripe; class Subscription extends ApiResource { /** + * These constants are possible representations of the status field. + * + * @link https://stripe.com/docs/api#subscription_object-status + */ + const STATUS_ACTIVE = 'active'; + const STATUS_CANCELED = 'canceled'; + const STATUS_PAST_DUE = 'past_due'; + const STATUS_TRIALING = 'trialing'; + const STATUS_UNPAID = 'unpaid'; + + /** * @param string $id The ID of the subscription to retrieve. * @param array|string|null $opts *
Add few class' constants corresponding to subscription statuses (#<I>)
diff --git a/lib/pdk/validate/yaml/syntax.rb b/lib/pdk/validate/yaml/syntax.rb index <HASH>..<HASH> 100644 --- a/lib/pdk/validate/yaml/syntax.rb +++ b/lib/pdk/validate/yaml/syntax.rb @@ -62,6 +62,8 @@ module PDK return_val = 0 create_spinner(targets, options) + PDK.logger.debug(_('Validating yaml content of %{parsed_targets}') % { parsed_targets: targets.to_s }) + targets.each do |target| next unless File.file?(target)
(MAINT) Add debug logging of yaml files being validated
diff --git a/lib/jirahelper/misc.rb b/lib/jirahelper/misc.rb index <HASH>..<HASH> 100644 --- a/lib/jirahelper/misc.rb +++ b/lib/jirahelper/misc.rb @@ -8,7 +8,8 @@ module JiraHelper password: config.password, site: config.site, context_path: config.context, - auth_type: :basic + auth_type: :basic, + use_ssl: config.use_ssl, ) end end diff --git a/lib/lita/handlers/jira.rb b/lib/lita/handlers/jira.rb index <HASH>..<HASH> 100644 --- a/lib/lita/handlers/jira.rb +++ b/lib/lita/handlers/jira.rb @@ -15,6 +15,7 @@ module Lita config :ambient, required: false, types: [TrueClass, FalseClass], default: false config :ignore, required: false, type: Array, default: [] config :rooms, required: false, type: Array + config :use_ssl, required: false, types: [TrueClass, FalseClass], default: true include ::JiraHelper::Issue include ::JiraHelper::Misc
Adding options to disable SSL Using correct method
diff --git a/lib/countly.js b/lib/countly.js index <HASH>..<HASH> 100644 --- a/lib/countly.js +++ b/lib/countly.js @@ -418,7 +418,7 @@ log(logLevelEnums.DEBUG, "initialize, enableOrientationTracking:[" + this.enableOrientationTracking + "]"); } if (!useSessionCookie) { - log(logLevelEnums.WARNING, "initialize, use_session_cookie is disabled:[" + useSessionCookie + "]"); + log(logLevelEnums.WARNING, "initialize, use_session_cookie is enabled:[" + useSessionCookie + "]"); } if (offlineMode) { log(logLevelEnums.DEBUG, "initialize, offline_mode:[" + offlineMode + "], user info won't be send to the servers");
log text was wrong, changed disabled to enabled (#<I>)
diff --git a/test/com/google/javascript/jscomp/IntegrationTest.java b/test/com/google/javascript/jscomp/IntegrationTest.java index <HASH>..<HASH> 100644 --- a/test/com/google/javascript/jscomp/IntegrationTest.java +++ b/test/com/google/javascript/jscomp/IntegrationTest.java @@ -1406,8 +1406,6 @@ public final class IntegrationTest extends IntegrationTestCase { options.setClosurePass(true); options.setNewTypeInference(true); options.setRunOTIafterNTI(false); - // TODO(dimvar): remove once cl/172116239 is submitted - options.setCheckTypes(true); options.setDisambiguateProperties(true); this.externs = ImmutableList.of(SourceFile.fromCode( "externs",
Fix TODO in IntegrationTest. ------------- Created by MOE: <URL>
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 @@ -27,7 +27,7 @@ author = "The Font Bakery Authors" # The short X.Y version version = "0.7" # The full version, including alpha/beta/rc tags -release = "0.7.22" +release = "0.7.23" # -- General configuration --------------------------------------------------- @@ -190,7 +190,7 @@ def linkcode_resolve(domain, info): # AND We can link to a tag i.e. a release tag. This is awesome: # tag is: "v0.7.2" # https://github.com/googlefonts/fontbakery/tree/v0.7.2/Lib/fontbakery/profiles - tree = 'v0.7.22' + tree = 'v0.7.23' # It's not planned for us to get the line number :-( # I had to hammer this data into the info. if 'lineno' in info:
update version on docs/source/conf.py
diff --git a/pyghmi/ipmi/oem/lenovo/config.py b/pyghmi/ipmi/oem/lenovo/config.py index <HASH>..<HASH> 100644 --- a/pyghmi/ipmi/oem/lenovo/config.py +++ b/pyghmi/ipmi/oem/lenovo/config.py @@ -265,6 +265,9 @@ class LenovoFirmwareConfig(object): sortid = 0 for config in xml.iter("config"): lenovo_id = config.get("ID") + if lenovo_id == 'iSCSI': + # Do not support iSCSI at this time + continue for group in config.iter("group"): lenovo_group = group.get("ID") for setting in group.iter("setting"):
iSCSI settings aren't viable, mask for now The iSCSI attempts require special consideration that is not currently implemented. Mask it out for now. Change-Id: I<I>de1ddce<I>cd<I>d1d9e7ecf0bcbf<I>f
diff --git a/lib/rackstash/encoder/message.rb b/lib/rackstash/encoder/message.rb index <HASH>..<HASH> 100644 --- a/lib/rackstash/encoder/message.rb +++ b/lib/rackstash/encoder/message.rb @@ -37,7 +37,7 @@ module Rackstash include Rackstash::Encoder::Helper::Timestamp # @param tagged [Array<#to_s>] An array of field names whose values are - # added in front of each message line on encode + # added in front of each message line on {#encode} def initialize(tagged: []) @tagged_fields = Array(tagged).map(&:to_s) end
Add method reference to docs for Message#initialize
diff --git a/lib/bumbleworks/configuration.rb b/lib/bumbleworks/configuration.rb index <HASH>..<HASH> 100644 --- a/lib/bumbleworks/configuration.rb +++ b/lib/bumbleworks/configuration.rb @@ -299,10 +299,10 @@ module Bumbleworks def framework_root case - when defined?(Rails) then Rails.root - when defined?(Rory) then Rory.root - when defined?(Padrino) then Padrino.root - when defined?(Sinatra::Application) then Sinatra::Application.root + when defined?(::Rails) then ::Rails.root + when defined?(::Rory) then ::Rory.root + when defined?(::Padrino) then ::Padrino.root + when defined?(::Sinatra::Application) then ::Sinatra::Application.root end end
Check root-level constants for framework root Don't confuse constants defined within our namespace (such as for the Bumbleworks::Rails engine) with the constant defined on Object.
diff --git a/bokeh/models/annotations.py b/bokeh/models/annotations.py index <HASH>..<HASH> 100644 --- a/bokeh/models/annotations.py +++ b/bokeh/models/annotations.py @@ -236,6 +236,11 @@ class Label(Annotation): The %s values for the text. """) + render_mode = Enum(RenderMode, default="canvas", help=""" + Specifies whether the text is rendered as a canvas element or as an + css element overlaid on the canvas. The default mode is "canvas".""" + + class PolyAnnotation(Annotation): """ Render a shaded polygonal region as an annotation.
Add render_mode var to Label
diff --git a/lib/index.js b/lib/index.js index <HASH>..<HASH> 100644 --- a/lib/index.js +++ b/lib/index.js @@ -25,7 +25,7 @@ function quoteIdent(value) { } else if (value === true) { return '"t"'; } else if (value instanceof Date) { - value = formatDate(value.toISOString()); + return '"' + formatDate(value.toISOString()) + '"'; } else if (Array.isArray(value) === true) { throw new Error('SQL identifier cannot be an array'); } else if (value === Object(value)) { @@ -65,7 +65,7 @@ function quoteLiteral(value) { } else if (value === true) { return "'t'"; } else if (value instanceof Date) { - value = formatDate(value.toISOString()); + return "'" + formatDate(value.toISOString()) + "'"; } else if (Array.isArray(value) === true) { var temp = []; for (var i = 0; i < value.length; i++) { @@ -121,7 +121,7 @@ function quoteString(value) { } return temp.toString(); } else if (value === Object(value)) { - value = JSON.stringify(value); + return JSON.stringify(value); } return value.toString();
For dates, surround ISO string with quotes rather than treat it as an ordinary string.
diff --git a/tests/CalendR/Test/CalendarTest.php b/tests/CalendR/Test/CalendarTest.php index <HASH>..<HASH> 100644 --- a/tests/CalendR/Test/CalendarTest.php +++ b/tests/CalendR/Test/CalendarTest.php @@ -145,4 +145,13 @@ class CalendarTest extends \PHPUnit_Framework_TestCase array(2013, 8, Day::SUNDAY, '2013-02-17'), ); } + + public function testStrictDates() + { + // When we start, the option "strict_dates" should be set to false. + $calendar = new Calendar; + $this->assertSame(false, $calendar->getStrictDates()); + $calendar->setStrictDates(true); + $this->assertSame(true, $calendar->getStrictDates()); + } }
Add Unit Test Add the unit test 'strictDates' to the core calendar test case. Ensure that the 'strict_dates' option can be set and retrieved.
diff --git a/src/nu/validator/servlet/VerifierServletTransaction.java b/src/nu/validator/servlet/VerifierServletTransaction.java index <HASH>..<HASH> 100644 --- a/src/nu/validator/servlet/VerifierServletTransaction.java +++ b/src/nu/validator/servlet/VerifierServletTransaction.java @@ -995,7 +995,6 @@ class VerifierServletTransaction implements DocumentModeHandler, SchemaResolver } } catch (CannotRecoverException e) { } catch (TooManyErrorsException e) { - log4j.debug("TooManyErrorsException", e); errorHandler.fatalError(e); } catch (SAXException e) { log4j.debug("SAXException", e);
Stop dumping TooManyErrorsException to log There are many real-world documents on the Web with a number of errors exceeding the limit (currently <I>) at which TooManyErrorsException is thrown. So the error messages for this case (along with the accompanying stack trace) just generate a lot of unwelcome noise in the logs.
diff --git a/pwkit/cli/imtool.py b/pwkit/cli/imtool.py index <HASH>..<HASH> 100644 --- a/pwkit/cli/imtool.py +++ b/pwkit/cli/imtool.py @@ -268,12 +268,16 @@ class SetrectCommand (multitool.Command): class ShowCommand (multitool.Command): name = 'show' - argspec = '<image> [images...]' + argspec = '[--no-coords] <image> [images...]' summary = 'Show images interactively.' + more_help = """--no-coords - Do not show coordinates even if available + +WCS support isn't fantastic and sometimes causes crashes.""" def invoke (self, args, **kwargs): anyfailures = False ndshow = load_ndshow () + no_coords = pop_option ('no-coords', args) for path in args: try: @@ -294,6 +298,9 @@ class ShowCommand (multitool.Command): data = img.read (flip=True) toworld = img.toworld + if no_coords: + toworld = None + ndshow.view (data, title=path + ' — Array Viewer', toworld=toworld, yflip=True)
pwkit/cli/imtool.py: hacky workaround for my lame WCS code