diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/components/ProcessControlTrait.php b/components/ProcessControlTrait.php
index <HASH>..<HASH> 100644
--- a/components/ProcessControlTrait.php
+++ b/components/ProcessControlTrait.php
@@ -48,6 +48,6 @@ trait ProcessControlTrait
if(!$this->control){
$this->createControl();
}
- return new Pidfile($this->control, $appName, $path);
+ return new Pidfile($this->control, strtolower($appName), $path);
}
}
\ No newline at end of file
|
fix Pid file name to lowercase
|
diff --git a/src/Entity/User.php b/src/Entity/User.php
index <HASH>..<HASH> 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -34,7 +34,7 @@ class User
throw new \OutOfRangeException(sprintf(
'%s does not contain a property by the name of "%s"',
__CLASS__,
- $name
+ $property
));
}
diff --git a/test/src/Entity/UserTest.php b/test/src/Entity/UserTest.php
index <HASH>..<HASH> 100644
--- a/test/src/Entity/UserTest.php
+++ b/test/src/Entity/UserTest.php
@@ -45,8 +45,6 @@ class UserTest extends \PHPUnit_Framework_TestCase
}
/**
- * @expectedException PHPUnit_Framework_Error_Notice
- * Acutal exception expected below but magic testing on phpunit give above
* @expectedException \OutOfRangeException
*/
public function testInvalidMagicSet()
|
User: use `$property` variable instead of (undefined) `$name`, fixes possible notice
|
diff --git a/lib/model/folder_sendrecv.go b/lib/model/folder_sendrecv.go
index <HASH>..<HASH> 100644
--- a/lib/model/folder_sendrecv.go
+++ b/lib/model/folder_sendrecv.go
@@ -307,7 +307,7 @@ func (f *sendReceiveFolder) pullerIteration(scanChan chan<- string) (int, error)
f.queue.Reset()
- return changed, nil
+ return changed, err
}
func (f *sendReceiveFolder) processNeeded(snap *db.Snapshot, dbUpdateChan chan<- dbUpdateJob, copyChan chan<- copyBlocksState, scanChan chan<- string) (int, map[string]protocol.FileInfo, []protocol.FileInfo, error) {
|
lib/model: Return correct error in puller-iteration (ref #<I>) (#<I>)
|
diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
index <HASH>..<HASH> 100644
--- a/packages/ember-testing/tests/acceptance_test.js
+++ b/packages/ember-testing/tests/acceptance_test.js
@@ -88,6 +88,7 @@ if (!jQueryDisabled) {
}
afterEach() {
console.error = originalConsoleError;// eslint-disable-line no-console
+ super.afterEach();
}
teardown() {
|
[CLEANUP beta] Fix tests by adding missing call to super.afterEach
|
diff --git a/src/DataSource/ArrayDataSource.php b/src/DataSource/ArrayDataSource.php
index <HASH>..<HASH> 100644
--- a/src/DataSource/ArrayDataSource.php
+++ b/src/DataSource/ArrayDataSource.php
@@ -30,6 +30,11 @@ class ArrayDataSource implements IDataSource
*/
protected $data = [];
+ /**
+ * @var int
+ */
+ protected $count = 0;
+
/**
* @param array $data_source
@@ -37,6 +42,7 @@ class ArrayDataSource implements IDataSource
public function __construct(array $data_source)
{
$this->data = $data_source;
+ $this->count = sizeof($data_source);
}
@@ -51,7 +57,7 @@ class ArrayDataSource implements IDataSource
*/
public function getCount()
{
- return sizeof($this->data);
+ return $this->count;
}
|
fixed array source (#<I>)
|
diff --git a/src/GitHub_Updater/Settings.php b/src/GitHub_Updater/Settings.php
index <HASH>..<HASH> 100644
--- a/src/GitHub_Updater/Settings.php
+++ b/src/GitHub_Updater/Settings.php
@@ -491,7 +491,7 @@ class Settings extends Base {
public static function sanitize( $input ) {
$new_input = array();
foreach ( (array) $input as $id => $value ) {
- $new_input[ $id ] = sanitize_text_field( $input[ $id ] );
+ $new_input[ sanitize_file_name( $id ) ] = sanitize_text_field( $input[ $id ] );
}
return $new_input;
|
sanitize using `sanitize_file_name` to avoid
strtolower in `sanitize_key`
|
diff --git a/satsearch/scene.py b/satsearch/scene.py
index <HASH>..<HASH> 100644
--- a/satsearch/scene.py
+++ b/satsearch/scene.py
@@ -70,7 +70,11 @@ class Scene(object):
else:
keys = [key]
# loop through keys and get files
- return {k: self.download_file(links[k], path=path, nosubdirs=nosubdirs) for k in keys}
+ filenames = {}
+ for k in keys:
+ if k in links:
+ filenames[k] = self.download_file(links[k], path=path, nosubdirs=nosubdirs)
+ return filenames
def download_file(self, url, path=None, nosubdirs=None):
""" Download a file """
|
do not throw error if key does not exist
|
diff --git a/src/parsita/parsers.py b/src/parsita/parsers.py
index <HASH>..<HASH> 100644
--- a/src/parsita/parsers.py
+++ b/src/parsita/parsers.py
@@ -12,7 +12,7 @@ class Parser(Generic[Input, Output]):
Inheritors of this class must:
1. Implement the ``consume`` method
- 2. Implement the ``__str__`` method
+ 2. Implement the ``__repr__`` method
3. Call super().__init__() in their constructor to get the parse method from
the context.
|
Update docs of Parser concerning __repr__
Fixes #<I>.
|
diff --git a/pysatCDF/cdf.py b/pysatCDF/cdf.py
index <HASH>..<HASH> 100644
--- a/pysatCDF/cdf.py
+++ b/pysatCDF/cdf.py
@@ -56,8 +56,9 @@ class CDF(object):
# load all variable attribute data (zVariables)
self._read_all_z_attribute_data()
else:
- raise ValueError('File does not exist')
-
+ raise IOError(fortran_cdf.statushandler(status))
+ #raise ValueError('File does not exist')
+ #
def inquire(self):
name = copy.deepcopy(self.fname)
@@ -308,7 +309,7 @@ class CDF(object):
var_attrs_info[name] = nug
- self.gloabl_attrs_info = global_attrs_info
+ self.global_attrs_info = global_attrs_info
self.var_attrs_info = var_attrs_info
else:
raise IOError(fortran_cdf.statushandler(status))
|
Fixed attribute typo; cleaned up error reporting in open
|
diff --git a/templates/element/customThemeStyleSheet.php b/templates/element/customThemeStyleSheet.php
index <HASH>..<HASH> 100644
--- a/templates/element/customThemeStyleSheet.php
+++ b/templates/element/customThemeStyleSheet.php
@@ -147,8 +147,8 @@ use Cake\Core\Configure;
:not(.fa-plus-circle) {
color: <?php echo Configure::read('app.customThemeMainColor'); ?> ! important;
}
- body.self_services #responsive-header a.btn,
- body.self_services #responsive-header i.ok {
+ body.self_services #responsive-header a.btn:not(.btn-flash-message),
+ body.self_services #responsive-header a.btn:not(.btn-flash-message) i.ok {
color: #fff ! important;
}
body:not(.admin) .sb-right h3 {
|
mobile readable button after self service order
|
diff --git a/lib/devise_cas_authenticatable/routes.rb b/lib/devise_cas_authenticatable/routes.rb
index <HASH>..<HASH> 100644
--- a/lib/devise_cas_authenticatable/routes.rb
+++ b/lib/devise_cas_authenticatable/routes.rb
@@ -13,7 +13,7 @@ if ActionController::Routing.name =~ /ActionDispatch/
get :new, :path => mapping.path_names[:sign_in], :as => "new"
get :unregistered
post :create, :path => mapping.path_names[:sign_in]
- match :destroy, :path => mapping.path_names[:sign_out], :as => "destroy"
+ match :destroy, :path => mapping.path_names[:sign_out], :as => "destroy", :via => [:get, :post]
end
end
end
|
match needs to have verbs for Rails <I>
|
diff --git a/datawrap/tableloader.py b/datawrap/tableloader.py
index <HASH>..<HASH> 100644
--- a/datawrap/tableloader.py
+++ b/datawrap/tableloader.py
@@ -120,6 +120,12 @@ class SheetYielder(object):
def _build_row(self, i):
return self.row_builder(self.sheet, i)
+ def __str__(self):
+ return self.__repr__()
+
+ def __repr__(self):
+ return "SheetYielder({})".format(list(self).__repr__())
+
def get_data_xls(file_name, file_contents=None, on_demand=False):
'''
Loads the old excel format files. New format files will automatically
|
Added sheet yielder str and repr for easier printing
|
diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php
index <HASH>..<HASH> 100644
--- a/src/Console/ModelsCommand.php
+++ b/src/Console/ModelsCommand.php
@@ -480,7 +480,7 @@ class ModelsCommand extends Command
'morphedByMany' => '\Illuminate\Database\Eloquent\Relations\MorphToMany'
) as $relation => $impl) {
$search = '$this->' . $relation . '(';
- if (stripos($code, $search) || stripos($impl, $type) !== false) {
+ if (stripos($code, $search) || stripos($impl, (string)$type) !== false) {
//Resolve the relation's model to a Relation object.
$methodReflection = new \ReflectionMethod($model, $method);
if ($methodReflection->getNumberOfParameters()) {
|
Fix Bug PHP <I> & L<I> (#<I>)
add cast (string) to disable bug ($type can be null)
|
diff --git a/lib/function_inheritance.js b/lib/function_inheritance.js
index <HASH>..<HASH> 100644
--- a/lib/function_inheritance.js
+++ b/lib/function_inheritance.js
@@ -419,7 +419,8 @@ module.exports = function BlastInheritance(Blast, Collection) {
} else {
config = {
value: getter,
- enumerable: enumerable
+ enumerable: enumerable,
+ writable: true
};
}
|
fix: setProperty values are now writable
Simple setProperty values (not getters) are now writable,
and can be changed in an instance.
|
diff --git a/moar/thumbnailer.py b/moar/thumbnailer.py
index <HASH>..<HASH> 100644
--- a/moar/thumbnailer.py
+++ b/moar/thumbnailer.py
@@ -140,7 +140,8 @@ class Thumbnailer(object):
thumb._engine = self.engine
return thumb
- fullpath = pjoin(self.base_path, path)
+ fullpath = self.get_source_path(path)
+
im = self.engine.open_image(fullpath)
if im is None:
return Thumb('', None)
@@ -224,6 +225,13 @@ class Thumbnailer(object):
seed = ' '.join([str(path), str(geometry), str(filters), str(options)])
return sha1(seed).hexdigest()
+ def get_source_path(self, path):
+ """Returns the absolute path of the source image.
+ Overwrite this to load the image from a place that isn't the filesystem
+ into a temporal file.
+ """
+ return pjoin(self.base_path, path)
+
def process_image(self, im, geometry, filters, options):
eng = self.engine
if options.get('orientation'):
|
Separate getting the source fullpath in a new method so it can be easily overwrited
|
diff --git a/tests/transaction_commands_test.py b/tests/transaction_commands_test.py
index <HASH>..<HASH> 100644
--- a/tests/transaction_commands_test.py
+++ b/tests/transaction_commands_test.py
@@ -158,3 +158,17 @@ class TransactionCommandsTest(RedisTest):
res = yield from self.redis.unwatch()
self.assertTrue(res)
+
+ @run_until_complete
+ def test_encoding(self):
+ res = yield from self.redis.set('key', 'value')
+ self.assertTrue(res)
+
+ tr = self.redis.multi_exec()
+ fut1 = tr.get('key')
+ fut2 = tr.get('key', encoding='utf-8')
+ yield from tr.execute()
+ res = yield from fut1
+ self.assertEqual(res, b'value')
+ res = yield from fut2
+ self.assertEqual(res, 'value')
|
added failing multi/exec encoding test
|
diff --git a/lib/cucumber/formatter/duration_extractor.rb b/lib/cucumber/formatter/duration_extractor.rb
index <HASH>..<HASH> 100644
--- a/lib/cucumber/formatter/duration_extractor.rb
+++ b/lib/cucumber/formatter/duration_extractor.rb
@@ -24,6 +24,8 @@ module Cucumber
def duration(duration, *)
duration.tap { |dur| @result_duration = dur.nanoseconds / 10**9.0 }
end
+
+ def embed(*) end
end
end
end
diff --git a/lib/cucumber/formatter/junit.rb b/lib/cucumber/formatter/junit.rb
index <HASH>..<HASH> 100644
--- a/lib/cucumber/formatter/junit.rb
+++ b/lib/cucumber/formatter/junit.rb
@@ -238,6 +238,8 @@ module Cucumber
def duration(duration, *)
duration.tap { |dur| @test_case_duration = dur.nanoseconds / 10**9.0 }
end
+
+ def embed(*) end
end
end
end
|
Add embed() function to Result visitors
|
diff --git a/lib/cliver/dependency.rb b/lib/cliver/dependency.rb
index <HASH>..<HASH> 100644
--- a/lib/cliver/dependency.rb
+++ b/lib/cliver/dependency.rb
@@ -67,7 +67,7 @@ module Cliver
# @raise [ArgumentError] if incompatibility found
def check_compatibility!
case
- when @executables.any? {|exe| exe[?/] && !exe.start_with?(?/) }
+ when @executables.any? {|exe| exe[%r(\A[^/].*/)] }
raise ArgumentError, "Relative-path executable requirements are not supported."
end
end
|
<I>.x compatibility
|
diff --git a/anndata/readwrite/read.py b/anndata/readwrite/read.py
index <HASH>..<HASH> 100644
--- a/anndata/readwrite/read.py
+++ b/anndata/readwrite/read.py
@@ -144,7 +144,7 @@ def read_loom(filename: PathLike, sparse: bool = True, cleanup: bool = False, X_
cleanup
Whether to collapse all obs/var fields that only store one unique value into `.uns['loom-cleanup']`.
X_name
- Loompy key where the data matrix is stored.
+ Loompy key with which the data matrix `.X` is initialized.
obs_names
Loompy key where the observation/cell names are stored.
var_names
|
clarified read_loom docstring
|
diff --git a/app/helpers/effective_bootstrap_helper.rb b/app/helpers/effective_bootstrap_helper.rb
index <HASH>..<HASH> 100644
--- a/app/helpers/effective_bootstrap_helper.rb
+++ b/app/helpers/effective_bootstrap_helper.rb
@@ -218,7 +218,7 @@ module EffectiveBootstrapHelper
end
end.join.html_safe +
content_tag(:li, class: ['page-item', ('disabled' if page >= last)].compact.join(' ')) do
- link_to(url + params.merge('page' => page + 1).to_query, class: 'page-link', 'aria-label': 'Next', title: 'Next') do
+ link_to((page >= last ? '#' : url + params.merge('page' => page + 1).to_query), class: 'page-link', 'aria-label': 'Next', title: 'Next') do
content_tag(:span, '»'.html_safe, 'aria-hidden': true) + content_tag(:span, 'Next', class: 'sr-only')
end
end
|
don't set a page url on the next button when on last page
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -35,10 +35,10 @@ test_requires = [
install_requires = [
- 'django>=1.5,<2.0',
+ 'django>=1.8,<2.0',
'babel>=1.3',
- 'django-babel>=0.3.9',
- 'markey>=0.8',
+ 'django-babel>=0.5.1',
+ 'markey>=0.8,<0.9',
]
|
Remove support for Django < <I>, upgrade to django-babel <I>.x and markey <I>
|
diff --git a/msm/skill_entry.py b/msm/skill_entry.py
index <HASH>..<HASH> 100644
--- a/msm/skill_entry.py
+++ b/msm/skill_entry.py
@@ -236,9 +236,10 @@ class SkillEntry(object):
def _find_sha_branch(self):
git = Git(self.path)
- sha_branch = git.branch(
+ sha_branches = git.branch(
contains=self.sha, all=True
- ).split('\n')[0]
+ ).split('\n')
+ sha_branch = [b for b in sha_branches if ' -> ' not in b][0]
sha_branch = sha_branch.strip('* \n').replace('remotes/', '')
for remote in git.remote().split('\n'):
sha_branch = sha_branch.replace(remote + '/', '')
|
Remove pointers for things like HEAD
Updating to a reference on master would error out since the first branch found containing the SHA was 'HEAD -> master'
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -131,10 +131,8 @@ var itemTasks = items.reduce((tasks, item) => {
var jsTo = './build/dist/' + packageName.replace(/-/g, '.') + '.js';
var jsPackageTo = './build/npm/' + packageName + '/' + packageName.replace(/-/g, '.') + '.js';
item.name = upperName.replace(/-/g, ' ');
- var makeRollupTask = (to, format) => rollupTask(name, tsFrom, to, item.globals || {}, format);
- //gulp.task('Rollup' + name, () => makeRollupTask(jsTo, 'iife'));
gulp.task('Build' + name, () => buildTask(name, tsFrom, jsTo, item.globals || {}, 'iife', item));
- gulp.task('Package' + name, () => makeRollupTask(jsPackageTo, 'cjs'));
+ gulp.task('Package' + name, () => rollupTask(name, tsFrom, jsPackageTo, item.globals || {}, 'cjs'));
tasks.buildTasks.push('Build' + name);
tasks.packageTasks.push('Package' + name);
return tasks;
|
Called rollup directly from package task
|
diff --git a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
+++ b/core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
@@ -54,7 +54,7 @@ public class ImageFromDockerfile extends LazyFuture<String> implements
private Set<String> dependencyImageNames = Collections.emptySet();
public ImageFromDockerfile() {
- this("testcontainers/" + Base58.randomString(16).toLowerCase());
+ this("localhost/testcontainers/" + Base58.randomString(16).toLowerCase());
}
public ImageFromDockerfile(String dockerImageName) {
|
Fix handling of locally built images when used with `hub.image.name.prefix` (#<I>)
|
diff --git a/.gitignore b/.gitignore
index <HASH>..<HASH> 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ build
/.pydevproject
*.ipynb
/*.html
+tests/*
+/testing.py
+/.coverage
\ No newline at end of file
diff --git a/cdflib/cdfread.py b/cdflib/cdfread.py
index <HASH>..<HASH> 100644
--- a/cdflib/cdfread.py
+++ b/cdflib/cdfread.py
@@ -618,7 +618,7 @@ class CDF(object):
return vdr_info
else:
if (vdr_info['max_records'] < 0):
- print('No data is written for this variable')
+ #print('No data is written for this variable')
return None
return self._read_vardata(vdr_info, epoch=epoch, starttime=starttime, endtime=endtime,
startrec=startrec, endrec=endrec, record_range_only=record_range_only,
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ def readme():
return f.read()
setup(name='cdflib',
- version='0.3.4',
+ version='0.3.5',
description='A python CDF reader toolkit',
url='http://github.com/MAVENSDC/cdflib',
author='MAVEN SDC',
|
Getting rid of a print statement
|
diff --git a/core/src/main/java/com/graphhopper/storage/GraphHopperStorage.java b/core/src/main/java/com/graphhopper/storage/GraphHopperStorage.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/graphhopper/storage/GraphHopperStorage.java
+++ b/core/src/main/java/com/graphhopper/storage/GraphHopperStorage.java
@@ -1383,12 +1383,6 @@ public class GraphHopperStorage implements GraphStorage
// check encoding for compatiblity
acceptStr = properties.get("graph.flagEncoders");
- // remove when 0.4 released
- acceptStr = acceptStr.replace("car:com.graphhopper.routing.util.CarFlagEncoder", "car|speedFactor=5.0|speedBits=5|turnCosts=false");
- acceptStr = acceptStr.replace("foot:com.graphhopper.routing.util.FootFlagEncoder", "foot|speedFactor=1.0|speedBits=4|turnCosts=false");
- acceptStr = acceptStr.replace("bike:com.graphhopper.routing.util.BikeFlagEncoder", "bike|speedFactor=2.0|speedBits=4|turnCosts=false");
- acceptStr = acceptStr.replace("bike2:com.graphhopper.routing.util.Bike2WeightFlagEncoder", "bike2|speedFactor=2.0|speedBits=4|turnCosts=false");
-
} else
throw new IllegalStateException("cannot load properties. corrupt file or directory? " + dir);
|
minor removal of deprecated stuff
|
diff --git a/modules/rpc/thrift.go b/modules/rpc/thrift.go
index <HASH>..<HASH> 100644
--- a/modules/rpc/thrift.go
+++ b/modules/rpc/thrift.go
@@ -38,6 +38,10 @@ type CreateThriftServiceFunc func(svc service.Host) ([]transport.Procedure, erro
// ThriftModule creates a Thrift Module from a service func
func ThriftModule(hookup CreateThriftServiceFunc, options ...modules.Option) service.ModuleCreateFunc {
return func(mi service.ModuleCreateInfo) ([]service.Module, error) {
+ if mi.Name == "" {
+ mi.Name = "rpc"
+ }
+
mod, err := newYARPCThriftModule(mi, hookup, options...)
if err != nil {
return nil, errors.Wrap(err, "unable to instantiate Thrift module")
|
Default rpc name (#<I>)
Right now we'll default to a submodule name(yarpc), which is confusing.
|
diff --git a/adler32/adler32.go b/adler32/adler32.go
index <HASH>..<HASH> 100644
--- a/adler32/adler32.go
+++ b/adler32/adler32.go
@@ -90,7 +90,7 @@ func (d *digest) Sum(b []byte) []byte {
func (d *digest) Roll(b byte) error {
if len(d.window) == 0 {
return errors.New(
- "The window must be initialized with Write() first.")
+ "the rolling window must be initialized with Write() first")
}
// extract the oldest and the newest byte, update the circular buffer.
newest := uint32(b)
|
Applying fix suggested by go lint
|
diff --git a/DrdPlus/Races/EnumTypes/RaceType.php b/DrdPlus/Races/EnumTypes/RaceType.php
index <HASH>..<HASH> 100644
--- a/DrdPlus/Races/EnumTypes/RaceType.php
+++ b/DrdPlus/Races/EnumTypes/RaceType.php
@@ -1,10 +1,10 @@
<?php
namespace DrdPlus\Races\EnumTypes;
-use Doctrineum\Scalar\EnumType;
+use Doctrineum\Scalar\ScalarEnumType;
use DrdPlus\Races\Race;
-class RaceType extends EnumType
+class RaceType extends ScalarEnumType
{
const RACE = 'race';
diff --git a/DrdPlus/Races/Race.php b/DrdPlus/Races/Race.php
index <HASH>..<HASH> 100644
--- a/DrdPlus/Races/Race.php
+++ b/DrdPlus/Races/Race.php
@@ -1,14 +1,14 @@
<?php
namespace DrdPlus\Races;
-use Doctrineum\Scalar\Enum;
+use Doctrineum\Scalar\ScalarEnum;
use Drd\Genders\Gender;
use DrdPlus\Codes\PropertyCodes;
use DrdPlus\Tables\Races\RacesTable;
use DrdPlus\Tables\Tables;
use Granam\Scalar\Tools\ValueDescriber;
-abstract class Race extends Enum
+abstract class Race extends ScalarEnum
{
public function __construct($value)
|
Necessary changed due to library update
|
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index <HASH>..<HASH> 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -330,5 +330,5 @@ func Download(ctx *middleware.Context) {
}
}
- ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+base.ShortSha(commit.ID.String())+ext)
+ ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+refName+ext)
}
|
Update repo.go
Release download file name doesn't include tag number #<I>
Download: Changed to use refName instead of commit.ID for downloaded file name
|
diff --git a/lib/parity/version.rb b/lib/parity/version.rb
index <HASH>..<HASH> 100644
--- a/lib/parity/version.rb
+++ b/lib/parity/version.rb
@@ -1,3 +1,3 @@
module Parity
- VERSION = "2.2.0".freeze
+ VERSION = "2.2.1".freeze
end
|
Version <I>
Heroku Toolbelt has been replaced by / renamed to Heroku CLI.
It is installed with `brew install heroku`. See:
<URL>
|
diff --git a/maven/impl/src/main/java/org/jboss/forge/addon/maven/MavenContainer.java b/maven/impl/src/main/java/org/jboss/forge/addon/maven/MavenContainer.java
index <HASH>..<HASH> 100644
--- a/maven/impl/src/main/java/org/jboss/forge/addon/maven/MavenContainer.java
+++ b/maven/impl/src/main/java/org/jboss/forge/addon/maven/MavenContainer.java
@@ -179,7 +179,7 @@ public class MavenContainer
session.setLocalRepositoryManager(repoSystem.newLocalRepositoryManager(session, localRepo));
session.setChecksumPolicy(RepositoryPolicy.CHECKSUM_POLICY_IGNORE);
session.setCache(new DefaultRepositoryCache());
- session.setResolutionErrorPolicy(new SimpleResolutionErrorPolicy(true, true));
+ session.setResolutionErrorPolicy(new SimpleResolutionErrorPolicy(false, true));
session.setWorkspaceReader(new ClasspathWorkspaceReader());
return session;
}
|
MavenContainer should not cache not-found artifacts
|
diff --git a/src/translations/index.js b/src/translations/index.js
index <HASH>..<HASH> 100644
--- a/src/translations/index.js
+++ b/src/translations/index.js
@@ -229,7 +229,7 @@ const TRANSLATIONS = {
'validate-words-21-hint': 'Was ist das 21. Wort?',
'validate-words-22-hint': 'Was ist das 22. Wort?',
'validate-words-23-hint': 'Was ist das 23. Wort?',
- 'validate-words-24-hint': 'Was ist das 34. Wort?',
+ 'validate-words-24-hint': 'Was ist das 24. Wort?',
'export-file-heading': 'Login File herunterladen',
'export-file-intro-heading': 'Sichere deinen Account',
|
Fix german translation for <I>th word
|
diff --git a/src/parts/events.js b/src/parts/events.js
index <HASH>..<HASH> 100644
--- a/src/parts/events.js
+++ b/src/parts/events.js
@@ -215,8 +215,11 @@ export default {
switch( e.key ){
// remove tag if has focus
case 'Backspace': {
- this.removeTags(focusedElm);
- (nextTag ? nextTag : this.DOM.input).focus()
+ if( !this.settings.readonly ) {
+ this.removeTags(focusedElm);
+ (nextTag ? nextTag : this.DOM.input).focus()
+ }
+
break;
}
|
fixes #<I> - Readonly tags can be deleted by Backspace
|
diff --git a/sumy/utils.py b/sumy/utils.py
index <HASH>..<HASH> 100644
--- a/sumy/utils.py
+++ b/sumy/utils.py
@@ -52,7 +52,8 @@ class ItemsCount(object):
if self._value.endswith("%"):
total_count = len(sequence)
percentage = int(self._value[:-1])
- count = total_count*percentage // 100
+ # at least one sentence should be choosen
+ count = max(1, total_count*percentage // 100)
return sequence[:count]
else:
return sequence[:int(self._value)]
|
Add to summary at least 1 sentence if possible
|
diff --git a/pygccxml/declarations/calldef.py b/pygccxml/declarations/calldef.py
index <HASH>..<HASH> 100644
--- a/pygccxml/declarations/calldef.py
+++ b/pygccxml/declarations/calldef.py
@@ -39,9 +39,25 @@ class argument_t(object):
"""
def __init__( self, name='', type=None, default_value=None ):
+ """Constructor.
+
+ The type can either be a L{type_t} object or a string containing
+ a valid C++ type. In the latter case the string will be wrapped
+ inside an appropriate type_t object, so the L{type} property
+ will always be a type_t object.
+
+ @param name: The name of the argument
+ @type name: str
+ @param type: The type of the argument
+ @type type: L{type_t} or str
+ @param default_value: The optional default value of the argument
+ @tyape default_value: str
+ """
object.__init__(self)
self._name = name
self._default_value = default_value
+ if not isinstance(type, cpptypes.type_t):
+ type = cpptypes.dummy_type_t(str(type))
self._type = type
def __str__(self):
|
Added a doc string to the constructor of argument_t and, for additional convenience, allowed the 'type' argument to also be a string in addition to a type_t object. The constructor will automatically wrap the string inside the appropriate type_t object.
|
diff --git a/pysysinfo/asterisk.py b/pysysinfo/asterisk.py
index <HASH>..<HASH> 100644
--- a/pysysinfo/asterisk.py
+++ b/pysysinfo/asterisk.py
@@ -149,20 +149,20 @@ class AsteriskInfo:
% (self._amihost, self._amiport)
)
- def _sendAction(self, action, keys=None, vars=None):
+ def _sendAction(self, action, attrs=None, chan_vars=None):
"""Send action to Asterisk Manager Interface.
@param action: Action name
- @param keys: Tuple of key-value pairs for action attributes.
- @param vars: Tuple of key-value pairs for channel variables.
+ @param attrs: Tuple of key-value pairs for action attributes.
+ @param chan_vars: Tuple of key-value pairs for channel variables.
"""
self._conn.write("Action: %s\r\n" % action)
- if keys:
- for (key,val) in keys:
+ if attrs:
+ for (key,val) in attrs:
self._conn.write("%s: %s\r\n" % (key, val))
- if vars:
- for (key,val) in vars:
+ if chan_vars:
+ for (key,val) in chan_vars:
self._conn.write("Variable: %s=%s\r\n" % (key, val))
self._conn.write("\r\n")
|
Fix variable name to avoid using reserved name.
|
diff --git a/src/api/layer.js b/src/api/layer.js
index <HASH>..<HASH> 100644
--- a/src/api/layer.js
+++ b/src/api/layer.js
@@ -378,12 +378,14 @@ export default class Layer {
}
_addToMGLMap(map, beforeLayerID) {
- if (map._loaded) {
+ if (map.isStyleLoaded()) {
this._onMapLoaded(map, beforeLayerID);
} else {
- map.on('load', () => {
+ try {
this._onMapLoaded(map, beforeLayerID);
- });
+ } catch (error) {
+ map.on('load', this._onMapLoaded.bind(this));
+ }
}
}
|
Load the map if the styles have been properly loaded
|
diff --git a/src/ossos-pipeline/ossos/downloads/cutouts/source.py b/src/ossos-pipeline/ossos/downloads/cutouts/source.py
index <HASH>..<HASH> 100644
--- a/src/ossos-pipeline/ossos/downloads/cutouts/source.py
+++ b/src/ossos-pipeline/ossos/downloads/cutouts/source.py
@@ -51,11 +51,8 @@ class SourceCutout(object):
self.original_observed_x = self.reading.x
self.original_observed_y = self.reading.y
if self.original_observed_ext is None:
- self.original_observed_ext = 1
+ self.original_observed_ext = len(self.hdulist) - 1
- logger.debug("Setting ext/x/y to {}/{}/{}".format(self.original_observed_ext,
- self.original_observed_x,
- self.original_observed_y))
self.observed_x = self.original_observed_x
self.observed_y = self.original_observed_y
@@ -72,7 +69,6 @@ class SourceCutout(object):
self._comparison_image = None
self._tempfile = None
self._bad_comparison_images = [self.hdulist[-1].header.get('EXPNUM', None)]
- logger.debug("Build of source worked.")
logger.error("type X/Y {}/{}".format(type(self.pixel_x),
type(self.pixel_y)))
|
Changed the logic for default extension (needed for /RA/DEC cutouts) to assume that the last extension of the HDULIST is the interesting one, if can't be computed.
Also removed some excess debug message
|
diff --git a/galpy/potential.py b/galpy/potential.py
index <HASH>..<HASH> 100644
--- a/galpy/potential.py
+++ b/galpy/potential.py
@@ -1,6 +1,4 @@
import warnings
-from galpy.util import galpyWarning
-warnings.warn("A major change in versions > 1.1 is that all galpy.potential functions and methods take the potential as the first argument; previously methods such as evaluatePotentials, evaluateDensities, etc. would be called with (R,z,Pot), now they are called as (Pot,R,z) for greater consistency across the codebase",galpyWarning)
from galpy.potential_src import Potential
from galpy.potential_src import planarPotential
from galpy.potential_src import linearPotential
|
remove warning about changed arguments for potential functions
|
diff --git a/morse_talk/utils.py b/morse_talk/utils.py
index <HASH>..<HASH> 100644
--- a/morse_talk/utils.py
+++ b/morse_talk/utils.py
@@ -372,7 +372,7 @@ def display(message, wpm, element_duration, word_ref, strip=False):
print(_spoken_representation(message))
print("")
print("code speed : %s wpm" % wpm)
- print("element_duration : %s" % element_duration)
+ print("element_duration : %s s" % element_duration)
print("reference word : %r" % word_ref)
print("")
|
Add unit (s) to element duration in display function
|
diff --git a/docs/examples/StyledSingle.js b/docs/examples/StyledSingle.js
index <HASH>..<HASH> 100644
--- a/docs/examples/StyledSingle.js
+++ b/docs/examples/StyledSingle.js
@@ -11,7 +11,7 @@ const dot = (color = '#ccc') => ({
':before': {
backgroundColor: color,
borderRadius: 10,
- content: ' ',
+ content: '" "',
display: 'block',
marginRight: 8,
height: 10,
|
fix content: property error in css
|
diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb
index <HASH>..<HASH> 100644
--- a/test/visitors/test_to_sql.rb
+++ b/test/visitors/test_to_sql.rb
@@ -143,6 +143,15 @@ module Arel
}
end
+ it 'can handle subqueries' do
+ table = Table.new(:users)
+ subquery = table.project(:id).where(table[:name].eq('Aaron'))
+ node = @attr.in subquery
+ @visitor.accept(node).must_be_like %{
+ "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" = 'Aaron')
+ }
+ end
+
it 'uses the same column for escaping values' do
@attr = Table.new(:users)[:name]
visitor = Class.new(ToSql) do
@@ -189,6 +198,15 @@ module Arel
}
end
+ it 'can handle subqueries' do
+ table = Table.new(:users)
+ subquery = table.project(:id).where(table[:name].eq('Aaron'))
+ node = @attr.not_in subquery
+ @visitor.accept(node).must_be_like %{
+ "users"."id" NOT IN (SELECT id FROM "users" WHERE "users"."name" = 'Aaron')
+ }
+ end
+
it 'uses the same column for escaping values' do
@attr = Table.new(:users)[:name]
visitor = Class.new(ToSql) do
|
tests for passing a subquery to #in and #not_in
|
diff --git a/sc/sc.py b/sc/sc.py
index <HASH>..<HASH> 100755
--- a/sc/sc.py
+++ b/sc/sc.py
@@ -76,6 +76,8 @@ parser.add_argument('--bot_data_save_dir', type=str, default=SC_BOT_DATA_SAVE_DI
parser.add_argument('--bot_data_logs_dir', type=str, default=SC_BOT_DATA_LOGS_DIR)
# Settings
+parser.add_argument('--show_all', action="store_true",
+ help="Launch VNC viewers for all containers, not just the server.")
parser.add_argument('--verbosity', type=str, default="DEBUG",
choices=['DEBUG', 'INFO', 'WARN', 'ERROR'],
help="Logging level.")
@@ -135,9 +137,7 @@ if __name__ == '__main__':
if not args.headless:
time.sleep(1)
- for i, player in enumerate(players):
+ for i, player in enumerate(players if args.show_all else players[:1]):
port = 5900 + i
logger.info(f"Launching vnc viewer for {player} on port {port}")
subprocess.call(f"vnc-viewer localhost:{port} &", shell=True)
-
- time.sleep(5)
|
Do not show all container VNCs by default
|
diff --git a/telethon/tl/custom/message.py b/telethon/tl/custom/message.py
index <HASH>..<HASH> 100644
--- a/telethon/tl/custom/message.py
+++ b/telethon/tl/custom/message.py
@@ -984,7 +984,7 @@ class Message(ChatGetter, SenderGetter, TLObject):
options = find_options()
if options is None:
- return
+ options = []
return await self._client(
functions.messages.SendVoteRequest(
peer=self._input_chat,
|
Support retracting poll votes on message click without option (#<I>)
|
diff --git a/generators/connection/templates/sequelize-mssql.js b/generators/connection/templates/sequelize-mssql.js
index <HASH>..<HASH> 100644
--- a/generators/connection/templates/sequelize-mssql.js
+++ b/generators/connection/templates/sequelize-mssql.js
@@ -6,7 +6,8 @@ module.exports = function () {
const connectionString = app.get('mssql');
const connection = url.parse(connectionString);
const database = connection.path.substring(1, connection.path.length);
- const { port, hostname, username, password } = connection;
+ const { port, hostname } = connection;
+ const [ username, password ] = (connection.auth || ':').split(':');
const sequelize = new Sequelize(database, username, password, {
dialect: 'mssql',
host: hostname,
|
Split username and password from URL parsed auth (#<I>)
|
diff --git a/httpcache4j-core/src/main/java/org/codehaus/httpcache4j/cache/FileManager.java b/httpcache4j-core/src/main/java/org/codehaus/httpcache4j/cache/FileManager.java
index <HASH>..<HASH> 100644
--- a/httpcache4j-core/src/main/java/org/codehaus/httpcache4j/cache/FileManager.java
+++ b/httpcache4j-core/src/main/java/org/codehaus/httpcache4j/cache/FileManager.java
@@ -91,9 +91,6 @@ class FileManager implements StoragePolicy {
for (Map.Entry<URI, CacheItem> invalidation : invalidations) {
storage.invalidate(invalidation.getKey(), invalidation.getValue());
}
- File[] files = fileResolver.getBaseDirectory().listFiles(new DeletingFileFilter(knownFiles));
- if (files != null && files.length > 0) {
- System.err.println(String.format("Unable to delete these files %s", Arrays.toString(files)));
- }
+ fileResolver.getBaseDirectory().listFiles(new DeletingFileFilter(knownFiles));
}
}
|
- Removed a message about not able to delete files... We know about these files and they should not be deleted.
git-svn-id: file:///home/projects/httpcache4j/tmp/scm-svn-tmp/trunk@<I> aeef7db8-<I>a-<I>-b<I>-bac<I>ff<I>f6
|
diff --git a/src/harvesters/core.py b/src/harvesters/core.py
index <HASH>..<HASH> 100644
--- a/src/harvesters/core.py
+++ b/src/harvesters/core.py
@@ -2321,15 +2321,14 @@ class ImageAcquirer:
except RuntimeException as e:
if file_dict:
if do_clean_up:
- os.remove(file_path)
- _logger.error(e, exc_info=True)
+ self._remove_intermediate_file(file_path)
+ self._logger.error(e, exc_info=True)
raise
else:
- _logger.warning(e, exc_info=True)
+ self._logger.warning(e, exc_info=True)
if do_clean_up:
- os.remove(file_path)
- _logger.info('{} has been removed'.format(file_path))
+ self._remove_intermediate_file(file_path)
if has_valid_file:
# Instantiate a concrete port object of the remote device's
@@ -2343,6 +2342,10 @@ class ImageAcquirer:
# Then return the node map:
return node_map
+ def _remove_intermediate_file(self, file_path: str):
+ os.remove(file_path)
+ self._logger.info('{} has been removed'.format(file_path))
+
@staticmethod
def _retrieve_file_path(
*,
|
Resolve issue #<I>
|
diff --git a/tests/test_wsaa_crypto.py b/tests/test_wsaa_crypto.py
index <HASH>..<HASH> 100644
--- a/tests/test_wsaa_crypto.py
+++ b/tests/test_wsaa_crypto.py
@@ -1,5 +1,7 @@
import base64, subprocess
+from past.builtins import basestring
+
from pyafipws.wsaa import WSAA
@@ -9,7 +11,7 @@ def test_wsfev1_create_tra():
# TODO: return string
tra = tra.decode("utf8")
# sanity checks:
- assert isinstance(tra, str)
+ assert isinstance(tra, basestring)
assert tra.startswith(
'<?xml version="1.0" encoding="UTF-8"?>'
'<loginTicketRequest version="1.0">'
|
WSAA: fix TRA test expecting unicode in python2
|
diff --git a/lxd/storage_lvm.go b/lxd/storage_lvm.go
index <HASH>..<HASH> 100644
--- a/lxd/storage_lvm.go
+++ b/lxd/storage_lvm.go
@@ -1583,15 +1583,21 @@ func (s *storageLvm) ImageDelete(fingerprint string) error {
logger.Debugf("Deleting LVM storage volume for image \"%s\" on storage pool \"%s\".", fingerprint, s.pool.Name)
if s.useThinpool {
- _, err := s.ImageUmount(fingerprint)
- if err != nil {
- return err
- }
-
poolName := s.getOnDiskPoolName()
- err = s.removeLV(poolName, storagePoolVolumeAPIEndpointImages, fingerprint)
- if err != nil {
- return err
+ imageLvmDevPath := getLvmDevPath(poolName,
+ storagePoolVolumeAPIEndpointImages, fingerprint)
+ lvExists, _ := storageLVExists(imageLvmDevPath)
+
+ if lvExists {
+ _, err := s.ImageUmount(fingerprint)
+ if err != nil {
+ return err
+ }
+
+ err = s.removeLV(poolName, storagePoolVolumeAPIEndpointImages, fingerprint)
+ if err != nil {
+ return err
+ }
}
}
|
lvm: existence check before image delete
Closes #<I>.
|
diff --git a/test/typographer.test.js b/test/typographer.test.js
index <HASH>..<HASH> 100644
--- a/test/typographer.test.js
+++ b/test/typographer.test.js
@@ -85,4 +85,8 @@ module.exports = {
assert.eql( sp.educateDashes( '-- : --- : -- : ---'),
'— : – : — : –');
},
+ 'educateEllipses': function(){
+ assert.eql( sp.educateEllipses( '. ... : . . . .'),
+ '. … : … .');
+ },
};
diff --git a/typographer.js b/typographer.js
index <HASH>..<HASH> 100644
--- a/typographer.js
+++ b/typographer.js
@@ -261,4 +261,14 @@
.replace(/--/g, '—'); // em (yes, backwards)
};
+ /**
+ * Returns input string, with each instance of "..."
+ * translated to an ellipsis HTML entity.
+ *
+ */
+ SmartyPants.prototype.educateEllipses = function(text) {
+ return text.replace(/\.\.\./g, '…')
+ .replace(/\. \. \./g, '…');
+ };
+
}(this));
|
added SmartyPants.educateEllipses function
|
diff --git a/spring-social-client/src/test/java/org/springframework/social/provider/oauth1/OAuth1ClientRequestInterceptorTest.java b/spring-social-client/src/test/java/org/springframework/social/provider/oauth1/OAuth1ClientRequestInterceptorTest.java
index <HASH>..<HASH> 100644
--- a/spring-social-client/src/test/java/org/springframework/social/provider/oauth1/OAuth1ClientRequestInterceptorTest.java
+++ b/spring-social-client/src/test/java/org/springframework/social/provider/oauth1/OAuth1ClientRequestInterceptorTest.java
@@ -27,7 +27,6 @@ public class OAuth1ClientRequestInterceptorTest {
ClientRequest request = new ClientRequest(headers, body, uri, HttpMethod.POST);
interceptor.beforeExecution(request);
String authorizationHeader = headers.getFirst("Authorization");
- System.out.println(authorizationHeader);
// TODO: Figure out how to test this more precisely with a fixed nonce
// and timestamp (and thus a fixed signature)
|
Cleaned out an wayward println() in a test.
|
diff --git a/OpenPNM/GEN/__CustomGenerator__.py b/OpenPNM/GEN/__CustomGenerator__.py
index <HASH>..<HASH> 100644
--- a/OpenPNM/GEN/__CustomGenerator__.py
+++ b/OpenPNM/GEN/__CustomGenerator__.py
@@ -131,6 +131,11 @@ class Custom(GenericGenerator):
#
# def generate_pore_diameter(self,img2):
# generate_pore_prop(img,'diameter')
+ def add_boundares(self):
+ r"""
+ TO DO: Impliment some sort of boundary pore finding
+ """
+ self._logger.debug("add_boundaries: Nothing yet")
def generate_pore_property_from_image(self,img,prop_name):
r"""
|
Added a todo for Custom Generator which needs some sort of boundary pore finder / adder
Former-commit-id: fd<I>c<I>bf4cac<I>e6d<I>cf0dcf<I>f2fb2de
Former-commit-id: <I>a<I>bdb1eaafcd<I>d<I>f<I>aef<I>c
|
diff --git a/bigquery/noxfile.py b/bigquery/noxfile.py
index <HASH>..<HASH> 100644
--- a/bigquery/noxfile.py
+++ b/bigquery/noxfile.py
@@ -150,6 +150,7 @@ def lint(session):
session.install("-e", ".")
session.run("flake8", os.path.join("google", "cloud", "bigquery"))
session.run("flake8", "tests")
+ session.run("flake8", os.path.join("docs", "samples"))
session.run("flake8", os.path.join("docs", "snippets.py"))
session.run("black", "--check", *BLACK_PATHS)
|
style(bigquery): add code samples to lint check (#<I>)
|
diff --git a/lib/puppet/file_serving/base.rb b/lib/puppet/file_serving/base.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/file_serving/base.rb
+++ b/lib/puppet/file_serving/base.rb
@@ -7,6 +7,10 @@ require 'puppet/file_serving'
# The base class for Content and Metadata; provides common
# functionality like the behaviour around links.
class Puppet::FileServing::Base
+ # This is for external consumers to store the source that was used
+ # to retrieve the metadata.
+ attr_accessor :source
+
# Does our file exist?
def exist?
begin
diff --git a/spec/unit/file_serving/base.rb b/spec/unit/file_serving/base.rb
index <HASH>..<HASH> 100755
--- a/spec/unit/file_serving/base.rb
+++ b/spec/unit/file_serving/base.rb
@@ -17,6 +17,12 @@ describe Puppet::FileServing::Base do
Puppet::FileServing::Base.new("/module/dir/file", :links => :manage).links.should == :manage
end
+ it "should have a :source attribute" do
+ file = Puppet::FileServing::Base.new("/module/dir/file")
+ file.should respond_to(:source)
+ file.should respond_to(:source=)
+ end
+
it "should consider :ignore links equivalent to :manage links" do
Puppet::FileServing::Base.new("/module/dir/file", :links => :ignore).links.should == :manage
end
|
Adding a "source" attribute to fileserving instances.
This will be used to cache the source that was used
to retrieve the instance.
|
diff --git a/reef-bridge-project/reef-bridge-java/src/main/java/com/microsoft/reef/javabridge/generic/JobClient.java b/reef-bridge-project/reef-bridge-java/src/main/java/com/microsoft/reef/javabridge/generic/JobClient.java
index <HASH>..<HASH> 100644
--- a/reef-bridge-project/reef-bridge-java/src/main/java/com/microsoft/reef/javabridge/generic/JobClient.java
+++ b/reef-bridge-project/reef-bridge-java/src/main/java/com/microsoft/reef/javabridge/generic/JobClient.java
@@ -80,7 +80,7 @@ public class JobClient {
public static ConfigurationModule getDriverConfiguration() {
return EnvironmentUtils.addClasspath(DriverConfiguration.CONF, DriverConfiguration.GLOBAL_LIBRARIES)
- .set(DriverConfiguration.DRIVER_IDENTIFIER, "clrBridge")
+ .set(DriverConfiguration.DRIVER_IDENTIFIER, "ReefClrBridge")
.set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, JobDriver.AllocatedEvaluatorHandler.class)
.set(DriverConfiguration.ON_EVALUATOR_FAILED, JobDriver.FailedEvaluatorHandler.class)
.set(DriverConfiguration.ON_CONTEXT_ACTIVE, JobDriver.ActiveContextHandler.class)
|
minor fix for clr driver id
|
diff --git a/lib/rails_semantic_logger/extensions/action_cable/tagged_logger_proxy.rb b/lib/rails_semantic_logger/extensions/action_cable/tagged_logger_proxy.rb
index <HASH>..<HASH> 100644
--- a/lib/rails_semantic_logger/extensions/action_cable/tagged_logger_proxy.rb
+++ b/lib/rails_semantic_logger/extensions/action_cable/tagged_logger_proxy.rb
@@ -3,6 +3,12 @@ ActionCable::Connection::TaggedLoggerProxy
module ActionCable
module Connection
class TaggedLoggerProxy
+ # As of Rails 5 Beta 3
+ def tag_logger(*tags, &block)
+ logger.tagged(*tags, &block)
+ end
+
+ # Rails 5 Beta 1,2. TODO: Remove once Rails 5 is GA
def tag(logger, &block)
current_tags = tags - logger.tags
logger.tagged(*current_tags, &block)
|
Rails 5 Beta 3 renamed Active job method #tag to #tag_logger
|
diff --git a/redis_metrics/management/commands/system_metric.py b/redis_metrics/management/commands/system_metric.py
index <HASH>..<HASH> 100644
--- a/redis_metrics/management/commands/system_metric.py
+++ b/redis_metrics/management/commands/system_metric.py
@@ -81,11 +81,12 @@ class Command(BaseCommand):
def _cpu(self):
"""Record CPU usage."""
- metric(int(psutil.cpu_percent()), category=self.category)
+ metric("cpu", int(psutil.cpu_percent()), category=self.category)
def _mem(self):
"""Record Memory usage."""
metric(
+ "memory",
int(psutil.virtual_memory().percent),
category=self.category
)
|
fixed cpu, memory metric keys
|
diff --git a/client-vendor/after-body/jquery.openx/jquery.openx.js b/client-vendor/after-body/jquery.openx/jquery.openx.js
index <HASH>..<HASH> 100755
--- a/client-vendor/after-body/jquery.openx/jquery.openx.js
+++ b/client-vendor/after-body/jquery.openx/jquery.openx.js
@@ -56,7 +56,7 @@
var $element = $(this);
$.getJSON(src + '&callback=?', function(html) {
$element.html(html);
- $element.trigger('openx-loaded', {hasContent: (!!html && $.trim(html).length > 0)});
+ $element.trigger('openx-loaded', {hasContent: $.trim(html).length > 0});
});
});
};
|
jquery.open.x: simplify info check of `openx-loaded` event.
|
diff --git a/tests/test_halo.py b/tests/test_halo.py
index <HASH>..<HASH> 100644
--- a/tests/test_halo.py
+++ b/tests/test_halo.py
@@ -100,7 +100,9 @@ class TestHalo(unittest.TestCase):
"""
text = 'This is a text that it is too long. In fact, it exceeds the eighty column standard ' \
'terminal width, which forces the text frame renderer to add an ellipse at the end of the ' \
- 'text'
+ 'text. Repeating it. This is a text that it is too long. In fact, it exceeds the ' \
+ 'eighty column standard terminal width, which forces the text frame renderer to ' \
+ 'add an ellipse at the end of the text'
spinner = Halo(text=text, spinner='dots', stream=self._stream)
spinner.start()
@@ -124,7 +126,9 @@ class TestHalo(unittest.TestCase):
"""
text = 'This is a text that it is too long. In fact, it exceeds the eighty column standard ' \
'terminal width, which forces the text frame renderer to add an ellipse at the end of the ' \
- 'text'
+ 'text. Repeating it. This is a text that it is too long. In fact, it exceeds the ' \
+ 'eighty column standard terminal width, which forces the text frame renderer to ' \
+ 'add an ellipse at the end of the text'
spinner = Halo(text=text, spinner='dots', stream=self._stream, animation='marquee')
spinner.start()
|
Test Halo animations: Increase length of text to make tests work on full screen terminals
|
diff --git a/src/Model/PickUpOrder.php b/src/Model/PickUpOrder.php
index <HASH>..<HASH> 100644
--- a/src/Model/PickUpOrder.php
+++ b/src/Model/PickUpOrder.php
@@ -54,7 +54,7 @@ class PickUpOrder
$this->setOrderReferenceId($orderReferenceId);
$this->setCustomerReference($customerReference);
$this->setCountPackages($countPackages);
- $this->setMote($note);
+ $this->setNote($note);
$this->setEmail($email);
$this->setSendDate($sendDate);
$this->setSendTimeFrom($sendTimeFrom);
@@ -230,4 +230,4 @@ class PickUpOrder
{
return $this->sender;
}
-}
\ No newline at end of file
+}
|
typo
There is a typo in constructor when using setMote() method. It should be setNote().
|
diff --git a/src/test/org/openscience/cdk/smiles/smarts/parser/SMARTSSearchTest.java b/src/test/org/openscience/cdk/smiles/smarts/parser/SMARTSSearchTest.java
index <HASH>..<HASH> 100644
--- a/src/test/org/openscience/cdk/smiles/smarts/parser/SMARTSSearchTest.java
+++ b/src/test/org/openscience/cdk/smiles/smarts/parser/SMARTSSearchTest.java
@@ -1540,7 +1540,7 @@ public class SMARTSSearchTest extends CDKTestCase {
Assert.assertEquals(0, results[1]);
results = match("c-C", "CCc1ccccc1");
- Assert.assertEquals(1, results[0]);
+ Assert.assertEquals(2, results[0]);
Assert.assertEquals(1, results[1]);
}
|
Updted the test to check whether c-C occurs in CCc1ccccc1 since though it gives 2 non-unique hits, both of them are identical in that the query c matches the target c and so on.
git-svn-id: <URL>
|
diff --git a/bd_metrics/finditem_measure.rb b/bd_metrics/finditem_measure.rb
index <HASH>..<HASH> 100755
--- a/bd_metrics/finditem_measure.rb
+++ b/bd_metrics/finditem_measure.rb
@@ -8,6 +8,13 @@ require 'borrow_direct'
require 'borrow_direct/find_item'
require 'date'
+if ENV["ENV"] == "PRODUCTION"
+ BorrowDirect::Defaults.api_base = BorrowDirect::Defaults::PRODUCTION_API_BASE
+ puts "BD PRODUCTION: #{BorrowDirect::Defaults::PRODUCTION_API_BASE}"
+end
+
+BorrowDirect::Defaults.api_key = ENV['BD_API_KEY']
+
key = "isbn"
sourcefile = ARGV[0] || File.expand_path("../isbn-bd-test-200.txt", __FILE__)
@@ -19,7 +26,7 @@ timeout = 20
# wait one to 7 minutes.
delay = 60..420
-puts "#{ENV['BD_LIBRARY_SYMBOL']}: #{key}: #{sourcefile}: #{Time.now.localtime}"
+puts "#{ENV['BD_LIBRARY_SYMBOL']}: #{key}: #{sourcefile}: #{Time.now.localtime}: Testing at #{BorrowDirect::Defaults.api_base}"
identifiers = File.readlines(sourcefile) #.shuffle
|
finditem_measure changes, including for v2 api
|
diff --git a/layers.go b/layers.go
index <HASH>..<HASH> 100644
--- a/layers.go
+++ b/layers.go
@@ -777,10 +777,10 @@ func (r *layerStore) Mount(id string, options drivers.MountOpts) (string, error)
hasReadOnlyOpt := func(opts []string) bool {
for _, item := range opts {
if item == "ro" {
- return false
+ return true
}
}
- return true
+ return false
}
// You are not allowed to mount layers from readonly stores if they
|
layer mount: fix RO logic
Fix the logic in an anon-func looking for the `ro` option to allow for
mounting images that are set as read-only.
|
diff --git a/test/7 - watch.js b/test/7 - watch.js
index <HASH>..<HASH> 100644
--- a/test/7 - watch.js
+++ b/test/7 - watch.js
@@ -4,6 +4,7 @@
// Includes
//----------
var expect = require('expect.js')
+var fs = require('fs')
var path = require('path')
var shared = require('../code/2 - shared.js')
@@ -32,11 +33,11 @@ var reWriter = function reWriter(goCrazy, filePath, data) {
*/
if (goCrazy) {
data = data || 'changed data'
- functions.writeFile(filePath, data).then(function() {
- reWriteTimer = setTimeout(function() {
- reWriter(goCrazy, filePath, data)
- }, 500)
- })
+ fs.writeFileSync(filePath, data)
+
+ reWriteTimer = setTimeout(function() {
+ reWriter(goCrazy, filePath, data)
+ }, 500)
} else {
clearTimeout(reWriteTimer)
}
|
sync file re-writer
This function should have used a sync file writer from the beginning.
Oops.
|
diff --git a/src/main/org/openscience/cdk/fingerprint/Fingerprinter.java b/src/main/org/openscience/cdk/fingerprint/Fingerprinter.java
index <HASH>..<HASH> 100644
--- a/src/main/org/openscience/cdk/fingerprint/Fingerprinter.java
+++ b/src/main/org/openscience/cdk/fingerprint/Fingerprinter.java
@@ -194,8 +194,7 @@ public class Fingerprinter implements IFingerprinter {
= new HashMap<IAtom, Map<IAtom,IBond>>();
for (IAtom startAtom : container.atoms()) {
- for (int pathLength = 0; pathLength <= searchDepth; pathLength++) {
- List<List<IAtom>> p = PathTools.getPathsOfLength(container, startAtom, pathLength);
+ List<List<IAtom>> p = PathTools.getPathsOfLengthUpto(container, startAtom, searchDepth);
for (List<IAtom> path : p) {
StringBuffer sb = new StringBuffer();
IAtom x = path.get(0);
@@ -225,7 +224,6 @@ public class Fingerprinter implements IFingerprinter {
allPaths.add(sb);
else allPaths.add(revForm);
}
- }
}
// now lets clean stuff up
Set<String> cleanPath = new HashSet<String>();
|
Updated fingerprinter code to get paths from an atom at one go, rather than multiple calls to getPathsOfLength for each path length. Gives a nice speedup
git-svn-id: <URL>
|
diff --git a/lib/affirm/objects/client.rb b/lib/affirm/objects/client.rb
index <HASH>..<HASH> 100644
--- a/lib/affirm/objects/client.rb
+++ b/lib/affirm/objects/client.rb
@@ -3,9 +3,10 @@ module Affirm
class Client
include Virtus.model
- attribute :full, String
- attribute :first, String
- attribute :last, String
+ attribute :full, String
+ attribute :first, String
+ attribute :last, String
+ attribute :middle, String
end
end
end
diff --git a/spec/charge_spec.rb b/spec/charge_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/charge_spec.rb
+++ b/spec/charge_spec.rb
@@ -131,6 +131,7 @@ RSpec.describe Affirm::Charge do
full
first
last
+ middle
).each do |method|
it "details.billing.name.#{method}" do
expect(
@@ -143,6 +144,7 @@ RSpec.describe Affirm::Charge do
full
first
last
+ middle
).each do |method|
it "details.shipping.name.#{method}" do
expect(
|
Add missing (optional) attribute to Client object.
|
diff --git a/pi_results/class.tx_solr_pi_results.php b/pi_results/class.tx_solr_pi_results.php
index <HASH>..<HASH> 100644
--- a/pi_results/class.tx_solr_pi_results.php
+++ b/pi_results/class.tx_solr_pi_results.php
@@ -210,6 +210,9 @@ class tx_solr_pi_results extends tx_solr_pluginbase_CommandPluginBase {
$query = t3lib_div::makeInstance('tx_solr_Query', $rawUserQuery);
/* @var $query tx_solr_Query */
+ $resultsPerPage = $this->getNumberOfResultsPerPage();
+ $query->setResultsPerPage($resultsPerPage);
+
$searchComponents = t3lib_div::makeInstance('tx_solr_search_SearchComponentManager')->getSearchComponents();
foreach ($searchComponents as $searchComponent) {
$searchComponent->setSearchConfiguration($this->conf['search.']);
|
Fix setting of number of results per page through the query object
|
diff --git a/jssrc/renderer.js b/jssrc/renderer.js
index <HASH>..<HASH> 100644
--- a/jssrc/renderer.js
+++ b/jssrc/renderer.js
@@ -26,9 +26,9 @@ var supportedTags = {
"table": true, "tbody": true, "thead": true, "tr": true, "th": true, "td": true,
"form": true, "optgroup": true, "option": true, "select": true, "textarea": true,
"title": true, "meta": true, "link": true,
- "svg": true, "circle": true, "line": true
+ "svg": true, "circle": true, "line": true, "rect": true
};
-var svgs = {"svg": true, "circle": true, "line": true};
+var svgs = {"svg": true, "circle": true, "line": true, "rect": true};
// Map of input entities to a queue of their values which originated from the client and have not been received from the server yet.
var sentInputValues = {};
var lastFocusPath = null;
|
Add rects as svgs
|
diff --git a/lib/memfs/fake/directory.rb b/lib/memfs/fake/directory.rb
index <HASH>..<HASH> 100644
--- a/lib/memfs/fake/directory.rb
+++ b/lib/memfs/fake/directory.rb
@@ -26,7 +26,6 @@ module MemFs
if entry_names.include?(path)
entries[path]
elsif entry_names.include?(parts.first)
- parts = path.split('/', 2)
entries[parts.first].find(parts.last)
end
end
|
Removing a useless line in Directory#find
|
diff --git a/gatt/gatt_linux.py b/gatt/gatt_linux.py
index <HASH>..<HASH> 100644
--- a/gatt/gatt_linux.py
+++ b/gatt/gatt_linux.py
@@ -351,7 +351,16 @@ class Device:
"""
Returns the device's alias (name).
"""
- return self._properties.Get('org.bluez.Device1', 'Alias')
+ try:
+ return self._properties.Get('org.bluez.Device1', 'Alias')
+ except dbus.exceptions.DBusException as e:
+ if e.get_dbus_name() == 'org.freedesktop.DBus.Error.UnknownObject':
+ # BlueZ sometimes doesn't provide an alias, we then simply return `None`.
+ # Might occur when device was deleted as the following issue points out:
+ # https://github.com/blueman-project/blueman/issues/460
+ return None
+ else:
+ raise _error_from_dbus_error(e)
def properties_changed(self, sender, changed_properties, invalidated_properties):
"""
|
Return none if device alias is not available
|
diff --git a/pytodoist/test/test_todoist.py b/pytodoist/test/test_todoist.py
index <HASH>..<HASH> 100644
--- a/pytodoist/test/test_todoist.py
+++ b/pytodoist/test/test_todoist.py
@@ -298,10 +298,6 @@ class ProjectTest(unittest.TestCase):
self.project.share('test@gmail.com')
self.project.delete_collaborator('test@gmail.com')
- def test_take_ownership(self):
- self.project.share('test@gmail.com')
- self.project.take_ownership()
-
class TaskTest(unittest.TestCase):
|
Remove the test_take_ownership test case as the todoist API doesn't recognise the command.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
setup(
name='ezmomi',
- version='0.2.3',
+ version='0.3.0',
author='Jason Ashby',
author_email='jashby2@gmail.com',
packages=['ezmomi'],
|
updated release ver to <I> for pypi
|
diff --git a/lib/punchblock/translator/asterisk.rb b/lib/punchblock/translator/asterisk.rb
index <HASH>..<HASH> 100644
--- a/lib/punchblock/translator/asterisk.rb
+++ b/lib/punchblock/translator/asterisk.rb
@@ -49,7 +49,6 @@ module Punchblock
def handle_ami_event(event)
return unless event.is_a? RubyAMI::Event
- pb_logger.trace "Handling AMI event #{event.inspect}"
if event.name.downcase == "fullybooted"
pb_logger.trace "Counting FullyBooted event"
diff --git a/lib/punchblock/translator/asterisk/call.rb b/lib/punchblock/translator/asterisk/call.rb
index <HASH>..<HASH> 100644
--- a/lib/punchblock/translator/asterisk/call.rb
+++ b/lib/punchblock/translator/asterisk/call.rb
@@ -104,7 +104,6 @@ module Punchblock
end
def process_ami_event(ami_event)
- pb_logger.trace "Processing AMI event #{ami_event.inspect}"
case ami_event.name
when 'Hangup'
pb_logger.debug "Received a Hangup AMI event. Sending End event."
|
[BUGFIX] Don't log every single AMI event received in the translator or calls
|
diff --git a/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java b/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
index <HASH>..<HASH> 100644
--- a/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
+++ b/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
@@ -193,8 +193,6 @@ public class JLanguageTool {
* <li>{@code /resource}</li>
* <li>{@code /rules}</li>
* </ul>
- * This method is thread-safe.
- *
* @return The currently set data broker which allows to obtain
* resources from the mentioned directories above. If no
* data broker was set, a new {@link DefaultResourceDataBroker} will
@@ -215,8 +213,6 @@ public class JLanguageTool {
* <li>{@code /resource}</li>
* <li>{@code /rules}</li>
* </ul>
- * This method is thread-safe.
- *
* @param broker The new resource broker to be used.
* @since 1.0.1
*/
|
javadoc: as the whole class is not thread-safe, there's no need to document single methods as thread-safe
|
diff --git a/core/src/main/java/io/undertow/server/protocol/framed/AbstractFramedChannel.java b/core/src/main/java/io/undertow/server/protocol/framed/AbstractFramedChannel.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/io/undertow/server/protocol/framed/AbstractFramedChannel.java
+++ b/core/src/main/java/io/undertow/server/protocol/framed/AbstractFramedChannel.java
@@ -815,7 +815,7 @@ public abstract class AbstractFramedChannel<C extends AbstractFramedChannel<C, R
* Forcibly closes the {@link io.undertow.server.protocol.framed.AbstractFramedChannel}.
*/
@Override
- public synchronized void close() throws IOException {
+ public void close() throws IOException {
if (UndertowLogger.REQUEST_IO_LOGGER.isTraceEnabled()) {
UndertowLogger.REQUEST_IO_LOGGER.tracef(new ClosedChannelException(), "Channel %s is being closed", this);
}
|
[UNDERTOW-<I>] Remove synchronized block from close, it is not necessary
|
diff --git a/lib/utils.js b/lib/utils.js
index <HASH>..<HASH> 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,5 +1,6 @@
'use strict';
+// var utils = require('lazy-cache')(require);
var utils = require('generator-util');
var fn = require;
require = utils;
@@ -43,6 +44,16 @@ utils.exists = function(fp) {
return fp && (typeof utils.tryOpen(fp, 'r') === 'number');
};
+
+utils.fileKeys = [
+ 'base', 'basename', 'cwd', 'dir',
+ 'dirname', 'ext', 'extname', 'f',
+ 'file', 'filename', 'path', 'root',
+ 'stem'
+];
+
+utils.whitelist = ['emit', 'toc', 'layout'].concat(utils.fileKeys);
+
/**
* Expose `utils`
*/
|
move whitelist and filesKeys to utils
|
diff --git a/src/main/java/com/lowagie/text/pdf/parser/PdfTextExtractor.java b/src/main/java/com/lowagie/text/pdf/parser/PdfTextExtractor.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/lowagie/text/pdf/parser/PdfTextExtractor.java
+++ b/src/main/java/com/lowagie/text/pdf/parser/PdfTextExtractor.java
@@ -101,6 +101,9 @@ public class PdfTextExtractor {
throw new IOException("page number must be postive:" + page);
}
PdfDictionary pageDic = reader.getPageN(page);
+ if (pageDic == null) {
+ return "";
+ }
PdfDictionary resourcesDic = pageDic.getAsDict(PdfName.RESOURCES);
extractionProcessor.processContent(getContentBytesForPage(page), resourcesDic);
return extractionProcessor.getResultantText();
|
If no content, text extracts as empty string
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,9 @@ INSTALL_REQUIRES = [
"wsproto >= 0.14.0",
]
-TESTS_REQUIRE = ["asynctest", "hypothesis", "pytest", "pytest-asyncio"]
+TESTS_REQUIRE = [
+ "asynctest", "hypothesis", "pytest", "pytest-asyncio", "pytest-cov", "pytest-trio", "trio"
+]
setup(
name="Hypercorn",
|
Add missing test requirements
This allows the following to work
pip install -e '.[tests]'
pytest
|
diff --git a/core/edb/src/main/java/org/openengsb/core/edb/internal/JPAObject.java b/core/edb/src/main/java/org/openengsb/core/edb/internal/JPAObject.java
index <HASH>..<HASH> 100644
--- a/core/edb/src/main/java/org/openengsb/core/edb/internal/JPAObject.java
+++ b/core/edb/src/main/java/org/openengsb/core/edb/internal/JPAObject.java
@@ -36,7 +36,7 @@ import org.openengsb.core.api.edb.EDBObject;
* the JPAObject can be converted to an EDBObject.
*/
public class JPAObject {
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<JPAEntry> entries;
@Column(name = "TIME")
private Long timestamp;
|
[OPENENGSB-<I>] now the JPAEntries of a JPAObject are loaded LAZY
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -82,8 +82,7 @@ module.exports = function (grunt) {
src : [
testSpecs,
sourceFiles,
- "Gruntfile.js",
- "tasks/release.js"
+ "Gruntfile.js"
]
}
},
diff --git a/tasks/release.js b/tasks/release.js
index <HASH>..<HASH> 100644
--- a/tasks/release.js
+++ b/tasks/release.js
@@ -70,8 +70,7 @@ module.exports = function (grunt) {
run("git checkout master", "Getting back to master branch");
}
// using Q for promises. Using the grunt-release project"s same idea
- var q = new Q();
- q
+ Q()
.then(checkout)
.then(add)
.then(commit)
|
Rollback Q() and add release.js task on jslint
|
diff --git a/src/txkube/testing/_testcase.py b/src/txkube/testing/_testcase.py
index <HASH>..<HASH> 100644
--- a/src/txkube/testing/_testcase.py
+++ b/src/txkube/testing/_testcase.py
@@ -26,10 +26,19 @@ class TestCase(TesttoolsTestCase):
# recognize.
def setup_example(self):
try:
+ # TesttoolsTestCase starts without this attribute set at all. Get
+ # us back to that state. It won't be set at all on the first
+ # setup_example call, nor if the previous run didn't have a failed
+ # expectation.
del self.force_failure
except AttributeError:
pass
def teardown_example(self, ignored):
if getattr(self, "force_failure", False):
+ # If testtools things it's time to stop, translate this into a
+ # test failure exception that Hypothesis can see. This lets
+ # Hypothesis know when it has found a falsifying example. Without
+ # it, Hypothesis can't see which of its example runs caused
+ # problems.
self.fail("expectation failed")
|
Some comments about the Hypothesis/testtools fix.
|
diff --git a/src/Model/Table/TokensTable.php b/src/Model/Table/TokensTable.php
index <HASH>..<HASH> 100644
--- a/src/Model/Table/TokensTable.php
+++ b/src/Model/Table/TokensTable.php
@@ -21,6 +21,23 @@ class TokensTable extends Table
}
/**
+ * get token by id
+ * @param string $id token id
+ * @return bool|Token false or token entity
+ */
+ public function read($id)
+ {
+ // clean expired tokens first
+ $this->_cleanExpired();
+
+ // clean id
+ $id = preg_replace('/^([a-f0-9]{8}).*/', '$1', $id);
+
+ // Get token for this id
+ return $this->findById($id)->first();
+ }
+
+ /**
* create token with option
* @param string $scope Scope or Model
* @param int $scopeId scope id
@@ -69,4 +86,13 @@ class TokensTable extends Table
{
return substr(hash('sha256', Text::uuid()), 0, 8);
}
+
+ /**
+ * clean expired tokens
+ * @return void
+ */
+ protected function _cleanExpired()
+ {
+ $this->deleteAll(['expire <' => \Cake\I18n\FrozenTime::parse('-7 days')]);
+ }
}
|
TokenTable::read() and clean method
|
diff --git a/staging/src/k8s.io/client-go/tools/cache/shared_informer.go b/staging/src/k8s.io/client-go/tools/cache/shared_informer.go
index <HASH>..<HASH> 100644
--- a/staging/src/k8s.io/client-go/tools/cache/shared_informer.go
+++ b/staging/src/k8s.io/client-go/tools/cache/shared_informer.go
@@ -209,7 +209,7 @@ func WaitForNamedCacheSync(controllerName string, stopCh <-chan struct{}, cacheS
// if the controller should shutdown
// callers should prefer WaitForNamedCacheSync()
func WaitForCacheSync(stopCh <-chan struct{}, cacheSyncs ...InformerSynced) bool {
- err := wait.PollUntil(syncedPollPeriod,
+ err := wait.PollImmediateUntil(syncedPollPeriod,
func() (bool, error) {
for _, syncFunc := range cacheSyncs {
if !syncFunc() {
|
Check cache is synced first before sleeping
If a cache was already synced, cache.WaitForCacheSync would
always take <I>ms to complete because the PollUntil method will
sleep first before checking the condition. Switching to
PollImmediateUntil will ensure already synced caches will return
immediately. For code that has, for example, <I> informers, the time
to check the cache was in sync would take at least 2 seconds, but with
this change it can be as fast as you can actually load the data.
|
diff --git a/pipenv/project.py b/pipenv/project.py
index <HASH>..<HASH> 100644
--- a/pipenv/project.py
+++ b/pipenv/project.py
@@ -654,7 +654,7 @@ class Project(object):
if name:
source = [s for s in sources if s.get('name') == name]
elif url:
- source = [s for s in sources if s.get('url') in url]
+ source = [s for s in sources if url.startswith(s.get('url'))]
if source:
return first(source)
|
Use `startswith` for url comparison in project
|
diff --git a/contribs/gmf/src/directives/layertree.js b/contribs/gmf/src/directives/layertree.js
index <HASH>..<HASH> 100644
--- a/contribs/gmf/src/directives/layertree.js
+++ b/contribs/gmf/src/directives/layertree.js
@@ -274,6 +274,13 @@ gmf.LayertreeController.prototype.getLayer = function(node, parentCtrl, depth) {
}
//depth > 1 && parent is a MIXED group
switch (type) {
+ case gmf.Themes.NodeType.MIXED_GROUP:
+ layer = this.getLayerCaseMixedGroup_(node);
+ break;
+ case gmf.Themes.NodeType.NOT_MIXED_GROUP:
+ layer = this.getLayerCaseNotMixedGroup_(node);
+ this.prepareLayer_(node, layer);
+ break;
case gmf.Themes.NodeType.WMTS:
layer = this.getLayerCaseWMTS_(node);
break;
|
Temporaty fix for mixed with sub groups
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -1,3 +1,5 @@
+var undefined
+
exports.FallbackMap = function FallbackMap (fallback) {
var map = new Map()
var mapGet = map.get
@@ -10,10 +12,15 @@ exports.FallbackMap = function FallbackMap (fallback) {
}
map.get = function get (key) {
+ var result = mapGet.call(map, key)
+ if (result !== undefined) {
+ return result
+ }
if (map.has(key)) {
- return mapGet.call(map, key)
+ return result
}
- var result = fallback(key, map)
+
+ result = fallback(key, map)
map.set(key, result)
return result
}
|
bypass map.has call when not really needed
|
diff --git a/keystore/v2/keystore/storage_zone.go b/keystore/v2/keystore/storage_zone.go
index <HASH>..<HASH> 100644
--- a/keystore/v2/keystore/storage_zone.go
+++ b/keystore/v2/keystore/storage_zone.go
@@ -95,7 +95,7 @@ func (s *ServerKeyStore) HasZonePrivateKey(zoneID []byte) bool {
// StorageKeyCreation interface (zones)
//
-const zonePrefix = "client"
+const zonePrefix = "zone"
func (s *ServerKeyStore) zoneStorageKeyPairPath(zoneID []byte) string {
return filepath.Join(zonePrefix, string(zoneID), storageSuffix)
|
Use correct zone prefix for key store v2 (#<I>)
The prefix for zone storage keys is incorrect, it should be "zone".
That way the keys will be placed into correct subdirectory.
|
diff --git a/speech/setup.py b/speech/setup.py
index <HASH>..<HASH> 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -27,7 +27,7 @@ version = '0.36.3'
# 'Development Status :: 3 - Alpha'
# 'Development Status :: 4 - Beta'
# 'Development Status :: 5 - Production/Stable'
-release_status = 'Development Status :: 4 - Beta'
+release_status = 'Development Status :: 5 - Production/Stable'
dependencies = [
'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
]
|
Promote google-cloud-speech to GA (#<I>)
|
diff --git a/tests/system/providers/zendesk/example_zendesk_custom_get.py b/tests/system/providers/zendesk/example_zendesk_custom_get.py
index <HASH>..<HASH> 100644
--- a/tests/system/providers/zendesk/example_zendesk_custom_get.py
+++ b/tests/system/providers/zendesk/example_zendesk_custom_get.py
@@ -44,6 +44,7 @@ with DAG(
) as dag:
fetch_organizations()
+
from tests.system.utils import get_test_run # noqa: E402
# Needed to run the example DAG with pytest (see: tests/system/README.md#run_via_pytest)
|
Migrate Zendesk example DAGs to new design AIP-<I> (#<I>)
closes: #<I>
|
diff --git a/resources/views/default/form/element/related/elements.blade.php b/resources/views/default/form/element/related/elements.blade.php
index <HASH>..<HASH> 100755
--- a/resources/views/default/form/element/related/elements.blade.php
+++ b/resources/views/default/form/element/related/elements.blade.php
@@ -20,6 +20,7 @@
@include(AdminTemplate::getViewPath('form.element.related.group'), [
'name' => $name,
'group' => new \SleepingOwl\Admin\Form\Related\Group(null, $stub->all()),
+ 'index' => "totalGroupsCount",
])
</div>
<button
|
fix saving group elements, add generation index for new group
|
diff --git a/src/Controller/RestControllerTrait.php b/src/Controller/RestControllerTrait.php
index <HASH>..<HASH> 100644
--- a/src/Controller/RestControllerTrait.php
+++ b/src/Controller/RestControllerTrait.php
@@ -51,4 +51,20 @@ trait RestControllerTrait
return $data;
}
+ protected function addProhibitedKeys(array $keys)
+ {
+ foreach ($keys as $key) {
+ if (is_string($key)) {
+ $this->prohibitedKeys[$key] = true;
+ }
+ }
+ }
+
+ protected function removeProhibitedKeys(array $keys)
+ {
+ foreach ($keys as $key) {
+ unset($this->prohibitedKeys[$key]);
+ }
+ }
+
}
\ No newline at end of file
|
Allow modification of the prohibited keys array, via class methods
|
diff --git a/libraries/joomla/factory.php b/libraries/joomla/factory.php
index <HASH>..<HASH> 100644
--- a/libraries/joomla/factory.php
+++ b/libraries/joomla/factory.php
@@ -506,18 +506,20 @@ abstract class JFactory
$classname = 'JDate';
}
}
- $key = $time . '-' . $tzOffset;
-
- // if (!isset($instances[$classname][$key])) {
- $tmp = new $classname($time, $tzOffset);
- //We need to serialize to break the reference
- // $instances[$classname][$key] = serialize($tmp);
- // unset($tmp);
- // }
-
- // $date = unserialize($instances[$classname][$key]);
- // return $date;
- return $tmp;
+
+ $key = $time . '-' . ($tzOffset instanceof DateTimeZone ? $tzOffset->getName() : (string) $tzOffset);
+
+ if (!isset($instances[$classname][$key]))
+ {
+ $tmp = new $classname($time, $tzOffset);
+ // We need to serialize to break the reference
+ $instances[$classname][$key] = serialize($tmp);
+ unset($tmp);
+ }
+
+ $date = unserialize($instances[$classname][$key]);
+
+ return $date;
}
/**
|
Fixes error in JFactory::getDate where timezone is passed as a string.
Restores backward compatibility of JFactory::getDate to Joomla <I> in
that is caches the date for a given time.
|
diff --git a/src/javascript/image/Image.js b/src/javascript/image/Image.js
index <HASH>..<HASH> 100644
--- a/src/javascript/image/Image.js
+++ b/src/javascript/image/Image.js
@@ -340,12 +340,6 @@ define("moxie/image/Image", [
@method downsize
@deprecated use resize()
- @param {Object} opts
- @param {Number} opts.width Resulting width
- @param {Number} [opts.height=width] Resulting height (optional, if not supplied will default to width)
- @param {Boolean} [opts.crop=false] Whether to crop the image to exact dimensions
- @param {Boolean} [opts.preserveHeaders=true] Whether to preserve meta headers (on JPEGs after resize)
- @param {String} [opts.resample=false] Resampling algorithm to use for resizing
*/
downsize: function(opts) {
var defaults = {
|
Image remove detailed comments on deprecated method.
|
diff --git a/lib/bumper_pusher/version.rb b/lib/bumper_pusher/version.rb
index <HASH>..<HASH> 100644
--- a/lib/bumper_pusher/version.rb
+++ b/lib/bumper_pusher/version.rb
@@ -1,3 +1,3 @@
module BumperPusher
- VERSION = "0.0.1"
+ VERSION = "0.0.2"
end
|
Update gemspec to version <I>
|
diff --git a/utils/vector.py b/utils/vector.py
index <HASH>..<HASH> 100644
--- a/utils/vector.py
+++ b/utils/vector.py
@@ -270,7 +270,7 @@ def parallel_check(vec1, vec2):
import scipy as sp
# Initialize True
- par = True
+ par = False
# Shape check
for v,n in zip([vec1, vec2], range(1,3)):
@@ -285,9 +285,8 @@ def parallel_check(vec1, vec2):
# Check for (anti-)parallel character and return
angle = sp.degrees(sp.arccos(sp.dot(vec1.T,vec2) / spla.norm(vec1) /
spla.norm(vec2)))
- if abs(angle) < PRM.Non_Parallel_Tol or \
- abs(angle - 180) < PRM.Non_Parallel_Tol:
- par = False
+ if min([abs(angle), abs(angle - 180.)]) < PRM.Non_Parallel_Tol:
+ par = True
## end if
return par
|
utils.vector: Corrected and simplified parallel_check
Had had the True/False values reversed, and had a more-verbose-than-
necessary form of the parallel-check calculation.
|
diff --git a/lib/chef/knife/stalenodes.rb b/lib/chef/knife/stalenodes.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/knife/stalenodes.rb
+++ b/lib/chef/knife/stalenodes.rb
@@ -57,6 +57,12 @@ module KnifeStalenodes
:description => "Adds minutes to hours since last check in",
:default => 0
+ option :maxhost,
+ :short => "-n HOSTS",
+ :long => "--number HOSTS",
+ :description => "Max number of hosts to search",
+ :default => 2500
+
def calculate_time
seconds = config[:days].to_i * 86400 + config[:hours].to_i * 3600 + config[:minutes].to_i * 60
@@ -101,7 +107,8 @@ module KnifeStalenodes
search_args = { :keys => {
:ohai_time => ['ohai_time'],
:name => ['name']
- }
+ },
+ :rows => config[:maxhost]
}
query.search(:node, get_query, search_args).first.each do |node|
|
[HelpSpot <I>] Allow rows returned from Solr to be adjustable
|
diff --git a/lib/friendly_id.rb b/lib/friendly_id.rb
index <HASH>..<HASH> 100644
--- a/lib/friendly_id.rb
+++ b/lib/friendly_id.rb
@@ -28,7 +28,7 @@ The concept of *slugs* is at the heart of FriendlyId.
A slug is the part of a URL which identifies a page using human-readable
keywords, rather than an opaque identifier such as a numeric id. This can make
-your application more friendly both for users and search engine.
+your application more friendly both for users and search engines.
#### Finders: Slugs Act Like Numeric IDs
|
Minor typo fix "search engine" -> "search engines"
Thanks for a great gem - HTH, Eliot
|
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
index <HASH>..<HASH> 100644
--- a/tests/integration/__init__.py
+++ b/tests/integration/__init__.py
@@ -594,6 +594,10 @@ class TestDaemon(object):
def __init__(self, parser):
self.parser = parser
self.colors = get_colors(self.parser.options.no_colors is False)
+ if salt.utils.is_windows():
+ # There's no shell color support on windows...
+ for key in self.colors:
+ self.colors[key] = ''
def __enter__(self):
'''
|
We don't currently support colors on windows
|
diff --git a/src/WebServCo/Framework/Libraries/Config.php b/src/WebServCo/Framework/Libraries/Config.php
index <HASH>..<HASH> 100644
--- a/src/WebServCo/Framework/Libraries/Config.php
+++ b/src/WebServCo/Framework/Libraries/Config.php
@@ -14,31 +14,6 @@ final class Config extends \WebServCo\Framework\AbstractLibrary
private $env;
/**
- * Append data to configuration settings.
- *
- * Used recursively.
- * @param array $config Configuration data to append to.
- * @param mixed $data Data to append.
- * @return array
- */
- final private function append($config, $data)
- {
- if (is_array($config) && is_array($data)) {
- foreach ($data as $setting => $value) {
- if (array_key_exists($setting, $config) &&
- is_array($config[$setting]) &&
- is_array($value)
- ) {
- $config[$setting] = $this->append($config[$setting], $value);
- } else {
- $config[$setting] = $value;
- }
- }
- }
- return $config;
- }
-
- /**
* Add base setting data.
*
* Keys will be preserved.
|
Cleanup redundant method "append"
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.