openSUSE Commits
Threads by month
- ----- 2024 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2023
- 1 participants
- 1691 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rubygem-rubocop for openSUSE:Factory checked in at 2023-11-01 22:10:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-rubocop (Old)
and /work/SRC/openSUSE:Factory/.rubygem-rubocop.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-rubocop"
Wed Nov 1 22:10:29 2023 rev:49 rq:1121572 version:1.57.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-rubocop/rubygem-rubocop.changes 2023-10-17 20:24:53.499057916 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-rubocop.new.17445/rubygem-rubocop.changes 2023-11-01 22:11:11.558361659 +0100
@@ -1,0 +2,25 @@
+Wed Nov 1 07:55:15 UTC 2023 - Mykola Krachkovsky <w01dnick(a)gmail.com>
+
+- updated to version 1.57.2
+
+ ## 1.57.2 (2023-10-26)
+
+ ### Bug fixes
+
+ * [#12274](https://github.com/rubocop/rubocop/issues/12274): Fix a false positive for `Lint/Void` when `each`'s receiver is an object of `Enumerator` to which `filter` has been applied. ([@koic][])
+ * [#12291](https://github.com/rubocop/rubocop/issues/12291): Fix a false positive for `Metrics/ClassLength` when a class with a singleton class definition. ([@koic][])
+ * [#12293](https://github.com/rubocop/rubocop/issues/12293): Fix a false positive for `Style/RedundantDoubleSplatHashBraces` when using double splat hash braces with `merge` and method chain. ([@koic][])
+ * [#12298](https://github.com/rubocop/rubocop/issues/12298): Fix a false positive for `Style/RedundantParentheses` when using a parenthesized hash literal as the first argument in a method call without parentheses. ([@koic][])
+ * [#12283](https://github.com/rubocop/rubocop/pull/12283): Fix an error for `Style/SingleLineDoEndBlock` when using single line `do`...`end` with no body. ([@koic][])
+ * [#12312](https://github.com/rubocop/rubocop/issues/12312): Fix an incorrect autocorrect for `Style/HashSyntax` when braced hash key and value are the same and it is used in `if`...`else`. ([@koic][])
+ * [#12307](https://github.com/rubocop/rubocop/issues/12307): Fix an infinite loop error for `Layout/EndAlignment` when `EnforcedStyleAlignWith: variable` and using a conditional statement in a method argument on the same line and `end` with method call is not aligned. ([@koic][])
+ * [#11652](https://github.com/rubocop/rubocop/issues/11652): Make `--auto-gen-config` generate `inherit_from` correctly inside ERB `if`. ([@jonas054][])
+ * [#12310](https://github.com/rubocop/rubocop/issues/12310): Drop `base64` gem from runtime dependency. ([@koic][])
+ * [#12300](https://github.com/rubocop/rubocop/issues/12300): Fix an error for `Style/IdenticalConditionalBranches` when `if`...`else` with identical leading lines and using index assign. ([@koic][])
+ * [#12286](https://github.com/rubocop/rubocop/issues/12286): Fix false positives for `Style/RedundantDoubleSplatHashBraces` when using double splat with a hash literal enclosed in parenthesized ternary operator. ([@koic][])
+ * [#12279](https://github.com/rubocop/rubocop/issues/12279): Fix false positives for `Lint/EmptyConditionalBody` when missing 2nd `if` body with a comment. ([@koic][])
+ * [#12275](https://github.com/rubocop/rubocop/issues/12275): Fix a false positive for `Style/RedundantDoubleSplatHashBraces` when using double splat within block argument containing a hash literal in an array literal. ([@koic][])
+ * [#12284](https://github.com/rubocop/rubocop/issues/12284): Fix false positives for `Style/SingleArgumentDig` when using some anonymous argument syntax. ([@koic][])
+ * [#12301](https://github.com/rubocop/rubocop/issues/12301): Make `Style/RedundantFilterChain` aware of safe navigation operator. ([@koic][])
+
+-------------------------------------------------------------------
Old:
----
rubocop-1.57.1.gem
New:
----
rubocop-1.57.2.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-rubocop.spec ++++++
--- /var/tmp/diff_new_pack.oTbSPS/_old 2023-11-01 22:11:12.074380775 +0100
+++ /var/tmp/diff_new_pack.oTbSPS/_new 2023-11-01 22:11:12.074380775 +0100
@@ -24,7 +24,7 @@
#
Name: rubygem-rubocop
-Version: 1.57.1
+Version: 1.57.2
Release: 0
%define mod_name rubocop
%define mod_full_name %{mod_name}-%{version}
++++++ rubocop-1.57.1.gem -> rubocop-1.57.2.gem ++++++
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cli/command/auto_generate_config.rb new/lib/rubocop/cli/command/auto_generate_config.rb
--- old/lib/rubocop/cli/command/auto_generate_config.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cli/command/auto_generate_config.rb 2023-10-26 11:45:40.000000000 +0200
@@ -10,6 +10,7 @@
AUTO_GENERATED_FILE = '.rubocop_todo.yml'
YAML_OPTIONAL_DOC_START = /\A---(\s+#|\s*\z)/.freeze
+ PLACEHOLDER = '###rubocop:inherit_here'
PHASE_1 = 'Phase 1 of 2: run Layout/LineLength cop'
PHASE_2 = 'Phase 2 of 2: run all cops'
@@ -125,15 +126,19 @@
def existing_configuration(config_file)
File.read(config_file, encoding: Encoding::UTF_8)
- .sub(/^inherit_from: *[^\n]+/, '')
- .sub(/^inherit_from: *(\n *- *[^\n]+)+/, '')
+ .sub(/^inherit_from: *[^\n]+/, PLACEHOLDER)
+ .sub(/^inherit_from: *(\n *- *[^\n]+)+/, PLACEHOLDER)
end
def write_config_file(file_name, file_string, rubocop_yml_contents)
lines = /\S/.match?(rubocop_yml_contents) ? rubocop_yml_contents.split("\n", -1) : []
- doc_start_index = lines.index { |line| YAML_OPTIONAL_DOC_START.match?(line) } || -1
- lines.insert(doc_start_index + 1, "inherit_from:#{file_string}\n")
- File.write(file_name, lines.join("\n"))
+ unless rubocop_yml_contents&.include?(PLACEHOLDER)
+ doc_start_index = lines.index { |line| YAML_OPTIONAL_DOC_START.match?(line) } || -1
+ lines.insert(doc_start_index + 1, PLACEHOLDER)
+ end
+ File.write(file_name, lines.join("\n")
+ .sub(/#{PLACEHOLDER}\n*/o, "inherit_from:#{file_string}\n\n")
+ .sub(/\n\n+\Z/, "\n"))
end
def relative_path_to_todo_from_options_config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/layout/end_alignment.rb new/lib/rubocop/cop/layout/end_alignment.rb
--- old/lib/rubocop/cop/layout/end_alignment.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/layout/end_alignment.rb 2023-10-26 11:45:40.000000000 +0200
@@ -163,7 +163,13 @@
when :keyword
node
when :variable
- alignment_node_for_variable_style(node)
+ align_to = alignment_node_for_variable_style(node)
+
+ while (parent = align_to.parent) && parent.send_type? && same_line?(align_to, parent)
+ align_to = parent
+ end
+
+ align_to
else
start_line_range(node)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/lint/void.rb new/lib/rubocop/cop/lint/void.rb
--- old/lib/rubocop/cop/lint/void.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/lint/void.rb 2023-10-26 11:45:40.000000000 +0200
@@ -6,6 +6,16 @@
# Checks for operators, variables, literals, lambda, proc and nonmutating
# methods used in void context.
#
+ # `each` blocks are allowed to prevent false positives.
+ # For example, the expression inside the `each` block below.
+ # It's not void, especially when the receiver is an `Enumerator`:
+ #
+ # [source,ruby]
+ # ----
+ # enumerator = [1, 2, 3].filter
+ # enumerator.each { |item| item >= 2 } #=> [2, 3]
+ # ----
+ #
# @example CheckForMethodsWithNoSideEffects: false (default)
# # bad
# def some_method
@@ -47,6 +57,7 @@
OP_MSG = 'Operator `%<op>s` used in void context.'
VAR_MSG = 'Variable `%<var>s` used in void context.'
+ CONST_MSG = 'Constant `%<var>s` used in void context.'
LIT_MSG = 'Literal `%<lit>s` used in void context.'
SELF_MSG = '`self` used in void context.'
EXPRESSION_MSG = '`%<expression>s` used in void context.'
@@ -72,6 +83,7 @@
return unless node.body && !node.body.begin_type?
return unless in_void_context?(node.body)
+ check_void_op(node.body) { node.method?(:each) }
check_expression(node.body)
end
@@ -87,11 +99,13 @@
def check_begin(node)
expressions = *node
expressions.pop unless in_void_context?(node)
- expressions.each { |expr| check_expression(expr) }
+ expressions.each do |expr|
+ check_void_op(expr)
+ check_expression(expr)
+ end
end
def check_expression(expr)
- check_void_op(expr)
check_literal(expr)
check_var(expr)
check_self(expr)
@@ -101,8 +115,9 @@
check_nonmutating(expr)
end
- def check_void_op(node)
+ def check_void_op(node, &block)
return unless node.send_type? && OPERATORS.include?(node.method_name)
+ return if block && yield(node)
add_offense(node.loc.selector,
message: format(OP_MSG, op: node.method_name)) do |corrector|
@@ -113,15 +128,18 @@
def check_var(node)
return unless node.variable? || node.const_type?
- if node.const_type? && node.special_keyword?
- add_offense(node, message: format(VAR_MSG, var: node.source)) do |corrector|
- autocorrect_void_expression(corrector, node)
- end
+ if node.const_type?
+ template = node.special_keyword? ? VAR_MSG : CONST_MSG
+
+ offense_range = node
+ message = format(template, var: node.source)
else
- add_offense(node.loc.name,
- message: format(VAR_MSG, var: node.loc.name.source)) do |corrector|
- autocorrect_void_expression(corrector, node)
- end
+ offense_range = node.loc.name
+ message = format(VAR_MSG, var: node.loc.name.source)
+ end
+
+ add_offense(offense_range, message: message) do |corrector|
+ autocorrect_void_expression(corrector, node)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/metrics/class_length.rb new/lib/rubocop/cop/metrics/class_length.rb
--- old/lib/rubocop/cop/metrics/class_length.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/metrics/class_length.rb 2023-10-26 11:45:40.000000000 +0200
@@ -42,7 +42,12 @@
def on_class(node)
check_code_length(node)
end
- alias on_sclass on_class
+
+ def on_sclass(node)
+ return if node.each_ancestor(:class).any?
+
+ on_class(node)
+ end
def on_casgn(node)
parent = node.parent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/mixin/comments_help.rb new/lib/rubocop/cop/mixin/comments_help.rb
--- old/lib/rubocop/cop/mixin/comments_help.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/mixin/comments_help.rb 2023-10-26 11:45:40.000000000 +0200
@@ -62,25 +62,29 @@
# Returns the end line of a node, which might be a comment and not part of the AST
# End line is considered either the line at which another node starts, or
# the line at which the parent node ends.
- # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Lint/DuplicateBranch
+ # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
def find_end_line(node)
- if node.if_type? && node.else?
- node.loc.else.line
- elsif node.if_type? && node.ternary?
- node.else_branch.loc.line
- elsif node.if_type? && node.elsif?
- node.each_ancestor(:if).find(&:if?).loc.end.line
+ if node.if_type?
+ if node.else?
+ node.loc.else.line
+ elsif node.ternary?
+ node.else_branch.loc.line
+ elsif node.elsif?
+ node.each_ancestor(:if).find(&:if?).loc.end.line
+ end
elsif node.block_type? || node.numblock_type?
node.loc.end.line
elsif (next_sibling = node.right_sibling) && next_sibling.is_a?(AST::Node)
next_sibling.loc.line
elsif (parent = node.parent)
- parent.loc.respond_to?(:end) && parent.loc.end ? parent.loc.end.line : parent.loc.line
- else
- node.loc.end.line
- end
+ if parent.loc.respond_to?(:end) && parent.loc.end
+ parent.loc.end.line
+ else
+ parent.loc.line
+ end
+ end || node.loc.end.line
end
- # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Lint/DuplicateBranch
+ # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb new/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb
--- old/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb 2023-10-26 11:45:40.000000000 +0200
@@ -48,18 +48,21 @@
def register_offense(node, message, replacement) # rubocop:disable Metrics/AbcSize
add_offense(node.value, message: message) do |corrector|
- if (def_node = def_node_that_require_parentheses(node))
- last_argument = def_node.last_argument
- if last_argument.nil? || !last_argument.hash_type?
- next corrector.replace(node, replacement)
- end
-
- white_spaces = range_between(def_node.selector.end_pos,
- def_node.first_argument.source_range.begin_pos)
- corrector.replace(white_spaces, '(')
- corrector.insert_after(last_argument, ')') if node == last_argument.pairs.last
- end
corrector.replace(node, replacement)
+
+ next unless (def_node = def_node_that_require_parentheses(node))
+
+ last_argument = def_node.last_argument
+ if last_argument.nil? || !last_argument.hash_type?
+ next corrector.replace(node, replacement)
+ end
+
+ white_spaces = range_between(def_node.selector.end_pos,
+ def_node.first_argument.source_range.begin_pos)
+ next if node.parent.braces?
+
+ corrector.replace(white_spaces, '(')
+ corrector.insert_after(last_argument, ')') if node == last_argument.pairs.last
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/style/identical_conditional_branches.rb new/lib/rubocop/cop/style/identical_conditional_branches.rb
--- old/lib/rubocop/cop/style/identical_conditional_branches.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/style/identical_conditional_branches.rb 2023-10-26 11:45:40.000000000 +0200
@@ -153,7 +153,15 @@
return unless duplicated_expressions?(node, heads)
condition_variable = assignable_condition_value(node)
- return if heads.first.assignment? && condition_variable == heads.first.name.to_s
+
+ head = heads.first
+ if head.assignment?
+ # The `send` node is used instead of the `indexasgn` node, so `name` cannot be used.
+ # https://github.com/rubocop/rubocop-ast/blob/v1.29.0/lib/rubocop/ast/node/in…
+ assigned_value = head.send_type? ? head.receiver.source : head.name.to_s
+
+ return if condition_variable == assigned_value
+ end
check_expressions(node, heads, :before_condition)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb new/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb
--- old/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb 2023-10-26 11:45:40.000000000 +0200
@@ -29,7 +29,8 @@
def on_hash(node)
return if node.pairs.empty? || node.pairs.any?(&:hash_rocket?)
return unless (parent = node.parent)
- return if parent.call_type? && !merge_method?(parent)
+ return unless parent.call_type? || parent.kwsplat_type?
+ return unless mergeable?(parent)
return unless (kwsplat = node.each_ancestor(:kwsplat).first)
return if allowed_double_splat_receiver?(kwsplat)
@@ -42,9 +43,11 @@
private
def allowed_double_splat_receiver?(kwsplat)
- return false unless kwsplat.children.first.call_type?
+ first_child = kwsplat.children.first
+ return true if first_child.block_type? || first_child.numblock_type?
+ return false unless first_child.call_type?
- root_receiver = root_receiver(kwsplat.children.first)
+ root_receiver = root_receiver(first_child)
!root_receiver&.hash_type?
end
@@ -71,7 +74,7 @@
def select_merge_method_nodes(kwsplat)
extract_send_methods(kwsplat).select do |node|
- merge_method?(node)
+ mergeable?(node)
end
end
@@ -106,7 +109,7 @@
end
def convert_to_new_arguments(node)
- return unless merge_method?(node)
+ return unless mergeable?(node)
node.arguments.map do |arg|
if arg.hash_type?
@@ -117,8 +120,12 @@
end
end
- def merge_method?(node)
- MERGE_METHODS.include?(node.method_name)
+ def mergeable?(node)
+ return true unless node.call_type?
+ return false unless MERGE_METHODS.include?(node.method_name)
+ return true unless (parent = node.parent)
+
+ mergeable?(parent)
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/style/redundant_filter_chain.rb new/lib/rubocop/cop/style/redundant_filter_chain.rb
--- old/lib/rubocop/cop/style/redundant_filter_chain.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/style/redundant_filter_chain.rb 2023-10-26 11:45:40.000000000 +0200
@@ -60,10 +60,10 @@
# @!method select_predicate?(node)
def_node_matcher :select_predicate?, <<~PATTERN
- (send
+ (call
{
- (block $(send _ {:select :filter :find_all}) ...)
- $(send _ {:select :filter :find_all} block_pass_type?)
+ (block $(call _ {:select :filter :find_all}) ...)
+ $(call _ {:select :filter :find_all} block_pass_type?)
}
${:#{RESTRICT_ON_SEND.join(' :')}})
PATTERN
@@ -87,6 +87,7 @@
register_offense(select_node, node)
end
end
+ alias on_csend on_send
private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/style/redundant_parentheses.rb new/lib/rubocop/cop/style/redundant_parentheses.rb
--- old/lib/rubocop/cop/style/redundant_parentheses.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/style/redundant_parentheses.rb 2023-10-26 11:45:40.000000000 +0200
@@ -111,17 +111,19 @@
def first_arg_begins_with_hash_literal?(node)
# Don't flag `method ({key: value})` or `method ({key: value}.method)`
- method_chain_begins_with_hash_literal?(node.children.first) &&
- first_argument?(node) &&
- !parentheses?(node.parent)
+ hash_literal = method_chain_begins_with_hash_literal(node.children.first)
+ if (root_method = node.each_ancestor(:send).to_a.last)
+ parenthesized = root_method.parenthesized_call?
+ end
+ hash_literal && first_argument?(node) && !parentheses?(hash_literal) && !parenthesized
end
- def method_chain_begins_with_hash_literal?(node)
- return false if node.nil?
- return true if node.hash_type?
- return false unless node.send_type?
+ def method_chain_begins_with_hash_literal(node)
+ return if node.nil?
+ return node if node.hash_type?
+ return unless node.send_type?
- method_chain_begins_with_hash_literal?(node.children.first)
+ method_chain_begins_with_hash_literal(node.children.first)
end
def check(begin_node)
@@ -231,7 +233,13 @@
end
def first_argument?(node)
- first_send_argument?(node) || first_super_argument?(node) || first_yield_argument?(node)
+ if first_send_argument?(node) ||
+ first_super_argument?(node) ||
+ first_yield_argument?(node)
+ return true
+ end
+
+ node.each_ancestor.any? { |ancestor| first_argument?(ancestor) }
end
# @!method first_send_argument?(node)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/style/single_argument_dig.rb new/lib/rubocop/cop/style/single_argument_dig.rb
--- old/lib/rubocop/cop/style/single_argument_dig.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/style/single_argument_dig.rb 2023-10-26 11:45:40.000000000 +0200
@@ -33,6 +33,7 @@
MSG = 'Use `%<receiver>s[%<argument>s]` instead of `%<original>s`.'
RESTRICT_ON_SEND = %i[dig].freeze
+ IGNORED_ARGUMENT_TYPES = %i[block_pass forwarded_restarg forwarded_args hash].freeze
# @!method single_argument_dig?(node)
def_node_matcher :single_argument_dig?, <<~PATTERN
@@ -44,7 +45,7 @@
expression = single_argument_dig?(node)
return unless expression
- return if expression.forwarded_args_type?
+ return if IGNORED_ARGUMENT_TYPES.include?(expression.type)
receiver = node.receiver.source
argument = expression.source
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/cop/style/single_line_do_end_block.rb new/lib/rubocop/cop/style/single_line_do_end_block.rb
--- old/lib/rubocop/cop/style/single_line_do_end_block.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/cop/style/single_line_do_end_block.rb 2023-10-26 11:45:40.000000000 +0200
@@ -30,6 +30,7 @@
MSG = 'Prefer multiline `do`...`end` block.'
+ # rubocop:disable Metrics/AbcSize
def on_block(node)
return if !node.single_line? || node.braces?
@@ -42,10 +43,11 @@
corrector.remove(node.loc.end)
corrector.insert_after(node_body.loc.heredoc_end, "\nend")
else
- corrector.insert_after(node_body, "\n")
+ corrector.insert_before(node.loc.end, "\n")
end
end
end
+ # rubocop:enable Metrics/AbcSize
alias on_numblock on_block
private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/formatter/html_formatter.rb new/lib/rubocop/formatter/html_formatter.rb
--- old/lib/rubocop/formatter/html_formatter.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/formatter/html_formatter.rb 2023-10-26 11:45:40.000000000 +0200
@@ -1,6 +1,5 @@
# frozen_string_literal: true
-require 'base64'
require 'cgi'
require 'erb'
require 'ostruct'
@@ -124,7 +123,10 @@
def base64_encoded_logo_image
image = File.read(LOGO_IMAGE_PATH, binmode: true)
- Base64.encode64(image)
+
+ # `Base64.encode64` compatible:
+ # https://github.com/ruby/base64/blob/v0.1.1/lib/base64.rb#L27-L40
+ [image].pack('m')
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rubocop/version.rb new/lib/rubocop/version.rb
--- old/lib/rubocop/version.rb 2023-10-13 09:36:04.000000000 +0200
+++ new/lib/rubocop/version.rb 2023-10-26 11:45:40.000000000 +0200
@@ -3,7 +3,7 @@
module RuboCop
# This module holds the RuboCop version information.
module Version
- STRING = '1.57.1'
+ STRING = '1.57.2'
MSG = '%<version>s (using Parser %<parser_version>s, ' \
'rubocop-ast %<rubocop_ast_version>s, ' \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2023-10-13 09:36:04.000000000 +0200
+++ new/metadata 2023-10-26 11:45:40.000000000 +0200
@@ -1,32 +1,18 @@
--- !ruby/object:Gem::Specification
name: rubocop
version: !ruby/object:Gem::Version
- version: 1.57.1
+ version: 1.57.2
platform: ruby
authors:
- Bozhidar Batsov
- Jonas Arvidsson
- Yuji Nakayama
-autorequire:
+autorequire:
bindir: exe
cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
- name: base64
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 0.1.1
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 0.1.1
-- !ruby/object:Gem::Dependency
name: json
requirement: !ruby/object:Gem::Requirement
requirements:
@@ -1042,7 +1028,7 @@
documentation_uri: https://docs.rubocop.org/rubocop/1.57/
bug_tracker_uri: https://github.com/rubocop/rubocop/issues
rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message:
rdoc_options: []
require_paths:
- lib
@@ -1057,8 +1043,8 @@
- !ruby/object:Gem::Version
version: '0'
requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.6
+signing_key:
specification_version: 4
summary: Automatic Ruby code style checking tool.
test_files: []
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-azure-synapse-artifacts for openSUSE:Factory checked in at 2023-11-01 22:10:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-azure-synapse-artifacts (Old)
and /work/SRC/openSUSE:Factory/.python-azure-synapse-artifacts.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-azure-synapse-artifacts"
Wed Nov 1 22:10:28 2023 rev:16 rq:1121585 version:0.18.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-azure-synapse-artifacts/python-azure-synapse-artifacts.changes 2023-08-14 22:36:25.400669307 +0200
+++ /work/SRC/openSUSE:Factory/.python-azure-synapse-artifacts.new.17445/python-azure-synapse-artifacts.changes 2023-11-01 22:11:10.762332170 +0100
@@ -1,0 +2,10 @@
+Wed Nov 1 09:03:51 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- New upstream release
+ + Version 0.18.0
+ + For detailed information about changes see the
+ CHANGELOG.md file provided with this package
+- Remove unzip package from BuildRequires
+- Switch source archive format to TAR.GZ
+
+-------------------------------------------------------------------
Old:
----
azure-synapse-artifacts-0.17.0.zip
New:
----
azure-synapse-artifacts-0.18.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-azure-synapse-artifacts.spec ++++++
--- /var/tmp/diff_new_pack.9voG09/_old 2023-11-01 22:11:11.274351138 +0100
+++ /var/tmp/diff_new_pack.9voG09/_new 2023-11-01 22:11:11.278351286 +0100
@@ -21,20 +21,19 @@
%define skip_python2 1
%endif
Name: python-azure-synapse-artifacts
-Version: 0.17.0
+Version: 0.18.0
Release: 0
Summary: Microsoft Azure Synapse Artifacts Client Library for Python
License: MIT
Group: Development/Languages/Python
URL: https://github.com/Azure/azure-sdk-for-python
-Source: https://files.pythonhosted.org/packages/source/a/azure-synapse-artifacts/az…
+Source: https://files.pythonhosted.org/packages/source/a/azure-synapse-artifacts/az…
Source1: LICENSE.txt
BuildRequires: %{python_module azure-nspkg >= 3.0.0}
BuildRequires: %{python_module azure-synapse-nspkg >= 1.0.0}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-BuildRequires: unzip
Requires: python-azure-core < 2.0.0
Requires: python-azure-core >= 1.3.2
Requires: python-azure-nspkg >= 3.0.0
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kail for openSUSE:Factory checked in at 2023-11-01 22:10:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kail (Old)
and /work/SRC/openSUSE:Factory/.kail.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kail"
Wed Nov 1 22:10:25 2023 rev:8 rq:1121569 version:0.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kail/kail.changes 2023-01-09 17:23:59.927225069 +0100
+++ /work/SRC/openSUSE:Factory/.kail.new.17445/kail.changes 2023-11-01 22:11:08.570250965 +0100
@@ -1,0 +2,37 @@
+Wed Nov 01 08:06:56 UTC 2023 - kastl(a)b1-systems.de
+
+- Update to version 0.17.0:
+ * Update ci.yml
+ * Bump github.com/rs/zerolog from 1.30.0 to 1.31.0
+ * chore: use bytes.Equal(canaryLog, log) instead
+ * add windows support, compile successful, make test also passed,
+ replace travis-badge to GitHub actions badge
+ * Fix duration in README.md tabe
+ * Bump k8s.io/client-go from 0.28.1 to 0.28.3
+ * Bump k8s.io/client-go from 0.27.4 to 0.28.1
+ * Bump k8s.io/client-go from 0.27.3 to 0.27.4
+ * Bump github.com/rs/zerolog from 1.29.1 to 1.30.0
+ * Bump github.com/boz/go-lifecycle from 0.1.0 to 0.1.1
+ * Bump github.com/sirupsen/logrus from 1.9.0 to 1.9.3
+ * drop "with:" for removed instructions
+ * Bump k8s.io/client-go from 0.27.1 to 0.27.3
+ * Bump github.com/stretchr/testify from 1.8.2 to 1.8.4
+ * Fix for Dockerfile smell DL3007
+ * bump dependencies and golang version
+ * doc: fix minikube url
+ * Bump k8s.io/client-go from 0.26.2 to 0.26.3
+ * Bump github.com/fatih/color from 1.14.1 to 1.15.0
+ * Bump k8s.io/client-go from 0.26.1 to 0.26.2
+ * Bump k8s.io/api from 0.26.1 to 0.26.2
+ * Bump github.com/stretchr/testify from 1.8.1 to 1.8.2
+ * Bump github.com/fatih/color from 1.14.0 to 1.14.1
+ * Bump github.com/rs/zerolog from 1.28.0 to 1.29.0
+ * Bump k8s.io/client-go from 0.26.0 to 0.26.1
+ * Bump github.com/fatih/color from 1.13.0 to 1.14.0
+ * Bump k8s.io/apimachinery from 0.26.0 to 0.26.1
+ * docker build added to goreleaser
+ * Bump github.com/rs/zerolog from 1.15.0 to 1.28.0
+ * reverted gorelease snapshot build in test as build is taking
+ longer
+
+-------------------------------------------------------------------
Old:
----
kail-0.16.1.tar.gz
New:
----
kail-0.17.0.obscpio
kail.obsinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kail.spec ++++++
--- /var/tmp/diff_new_pack.keqs60/_old 2023-11-01 22:11:09.190273933 +0100
+++ /var/tmp/diff_new_pack.keqs60/_new 2023-11-01 22:11:09.190273933 +0100
@@ -17,7 +17,7 @@
Name: kail
-Version: 0.16.1
+Version: 0.17.0
Release: 0
Summary: Kubernetes log viewer
License: MIT
@@ -25,7 +25,7 @@
URL: https://github.com/boz/kail
Source: %{name}-%{version}.tar.gz
Source1: vendor.tar.gz
-BuildRequires: golang(API) >= 1.18
+BuildRequires: golang(API) >= 1.20
ExcludeArch: s390
ExcludeArch: %{ix86}
@@ -36,20 +36,21 @@
in or out of the selection.
%prep
-%setup -qa1
+%autosetup -p 1 -a 1
%build
-# use vendor directory and build as position independent executeable
-sed -i -e 's|$(GO) build|go build -mod vendor -buildmode=pie|g' Makefile
-make build
+go build \
+ -mod=vendor \
+ -buildmode=pie \
+ -ldflags="-X main.version=%{version} -X main.commit=v%{version}" \
+ -o bin/%{name} ./cmd/%{name}
%install
# Install the binary.
-mkdir -p %{buildroot}%{_bindir}/
-install -m 0755 kail %{buildroot}%{_bindir}/kail
+install -D -m 0755 bin/%{name} %{buildroot}/%{_bindir}/%{name}
%files
%license LICENSE.txt
%doc README.md
-%{_bindir}/kail
+%{_bindir}/%{name}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.keqs60/_old 2023-11-01 22:11:09.218274971 +0100
+++ /var/tmp/diff_new_pack.keqs60/_new 2023-11-01 22:11:09.218274971 +0100
@@ -1,22 +1,21 @@
<services>
- <service name="tar_scm" mode="disabled">
+ <service name="obs_scm" mode="manual">
<param name="url">https://github.com/boz/kail</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.16.1</param>
+ <param name="revision">v0.17.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
- <service name="set_version" mode="disabled">
- <param name="basename">kail</param>
+ <service name="set_version" mode="manual">
</service>
- <service name="recompress" mode="disabled">
+ <service name="tar" mode="buildtime"/>
+ <service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
- <service name="go_modules" mode="disabled">
- <param name="archive">kail-0.16.1.tar.gz</param>
+ <service name="go_modules" mode="manual">
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.keqs60/_old 2023-11-01 22:11:09.238275712 +0100
+++ /var/tmp/diff_new_pack.keqs60/_new 2023-11-01 22:11:09.238275712 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/boz/kail</param>
- <param name="changesrevision">625673f43fcfb4ff6f45f2044376d8bfca8cbd6a</param></service></servicedata>
+ <param name="changesrevision">db891f00cb45b19b2edaa8284664bb1ae878fcdc</param></service></servicedata>
(No newline at EOF)
++++++ kail.obsinfo ++++++
name: kail
version: 0.17.0
mtime: 1698777249
commit: db891f00cb45b19b2edaa8284664bb1ae878fcdc
++++++ vendor.tar.gz ++++++
++++ 237146 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kyverno for openSUSE:Factory checked in at 2023-11-01 22:10:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kyverno (Old)
and /work/SRC/openSUSE:Factory/.kyverno.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kyverno"
Wed Nov 1 22:10:22 2023 rev:25 rq:1121553 version:1.10.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/kyverno/kyverno.changes 2023-09-06 19:02:00.427716066 +0200
+++ /work/SRC/openSUSE:Factory/.kyverno.new.17445/kyverno.changes 2023-11-01 22:11:07.046194507 +0100
@@ -1,0 +2,7 @@
+Wed Nov 01 08:18:56 UTC 2023 - kastl(a)b1-systems.de
+
+- Update to version 1.10.4:
+ * release-1.10.4 (#8799)
+ * fix: backport CVE fixes (#8798)
+
+-------------------------------------------------------------------
Old:
----
kyverno-1.10.3.obscpio
New:
----
kyverno-1.10.4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kyverno.spec ++++++
--- /var/tmp/diff_new_pack.4QkL7q/_old 2023-11-01 22:11:08.222238073 +0100
+++ /var/tmp/diff_new_pack.4QkL7q/_new 2023-11-01 22:11:08.226238221 +0100
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: kyverno
-Version: 1.10.3
+Version: 1.10.4
Release: 0
Summary: CLI and kubectl plugin for Kyverno
License: Apache-2.0
@@ -63,8 +63,7 @@
zsh command line completion support for %{name}.
%prep
-%setup -q
-%setup -q -T -D -a 1
+%autosetup -p 1 -a 1
%build
DATE_FMT="+%%Y-%%m-%%dT%%H:%%M:%%SZ"
++++++ _service ++++++
--- /var/tmp/diff_new_pack.4QkL7q/_old 2023-11-01 22:11:08.250239110 +0100
+++ /var/tmp/diff_new_pack.4QkL7q/_new 2023-11-01 22:11:08.254239258 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/kyverno/kyverno</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v1.10.3</param>
+ <param name="revision">v1.10.4</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.4QkL7q/_old 2023-11-01 22:11:08.270239851 +0100
+++ /var/tmp/diff_new_pack.4QkL7q/_new 2023-11-01 22:11:08.270239851 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/kyverno/kyverno</param>
- <param name="changesrevision">8137b4b8afd7ab1464a42e717dc83f1cc471a4a1</param></service></servicedata>
+ <param name="changesrevision">da6ef87588b7c14a9f01af80b461973494b422fd</param></service></servicedata>
(No newline at EOF)
++++++ kyverno-1.10.3.obscpio -> kyverno-1.10.4.obscpio ++++++
/work/SRC/openSUSE:Factory/kyverno/kyverno-1.10.3.obscpio /work/SRC/openSUSE:Factory/.kyverno.new.17445/kyverno-1.10.4.obscpio differ: char 48, line 1
++++++ kyverno.obsinfo ++++++
--- /var/tmp/diff_new_pack.4QkL7q/_old 2023-11-01 22:11:08.306241185 +0100
+++ /var/tmp/diff_new_pack.4QkL7q/_new 2023-11-01 22:11:08.310241333 +0100
@@ -1,5 +1,5 @@
name: kyverno
-version: 1.10.3
-mtime: 1691726382
-commit: 8137b4b8afd7ab1464a42e717dc83f1cc471a4a1
+version: 1.10.4
+mtime: 1698750515
+commit: da6ef87588b7c14a9f01af80b461973494b422fd
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/kyverno/vendor.tar.gz /work/SRC/openSUSE:Factory/.kyverno.new.17445/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chart-testing for openSUSE:Factory checked in at 2023-11-01 22:10:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chart-testing (Old)
and /work/SRC/openSUSE:Factory/.chart-testing.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chart-testing"
Wed Nov 1 22:10:21 2023 rev:8 rq:1121550 version:3.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/chart-testing/chart-testing.changes 2023-07-11 15:57:17.561167667 +0200
+++ /work/SRC/openSUSE:Factory/.chart-testing.new.17445/chart-testing.changes 2023-11-01 22:11:04.654105892 +0100
@@ -1,0 +2,26 @@
+Wed Nov 01 08:08:21 UTC 2023 - kastl(a)b1-systems.de
+
+- Update to version 3.10.0:
+ * feat(helm): Add support for OCI chart repositories (#445)
+ * use the same ref to check branch existance and merge-base
+ calculation (#601)
+ * Bump actions/checkout from 4.1.0 to 4.1.1 (#603)
+ * Bump github.com/spf13/viper from 1.16.0 to 1.17.0 (#602)
+ * Bump actions/checkout from 4.0.0 to 4.1.0 (#599)
+ * Bump docker/login-action from 2.2.0 to 3.0.0 (#597)
+ * Bump docker/setup-qemu-action from 2.2.0 to 3.0.0 (#596)
+ * Bump docker/setup-buildx-action from 2.10.0 to 3.0.0 (#598)
+ * Bump goreleaser/goreleaser-action from 4.4.0 to 5.0.0 (#595)
+ * Bump actions/checkout from 3.6.0 to 4.0.0 (#592)
+ * Bump sigstore/cosign-installer from 3.1.1 to 3.1.2 (#593)
+ * Bump actions/checkout from 3.5.3 to 3.6.0 (#588)
+ * Bump docker/setup-buildx-action from 2.9.1 to 2.10.0 (#589)
+ * Sort event list (#584)
+ * Bump golangci/golangci-lint-action from 3.6.0 to 3.7.0 (#581)
+ * Bump goreleaser/goreleaser-action from 4.3.0 to 4.4.0 (#582)
+ * Bump actions/setup-go from 4.0.1 to 4.1.0 (#583)
+ * Bump docker/setup-buildx-action from 2.9.0 to 2.9.1 (#579)
+ * Bump helm/kind-action from 1.7.0 to 1.8.0 (#578)
+ * Bump docker/setup-buildx-action from 2.8.0 to 2.9.0 (#576)
+
+-------------------------------------------------------------------
Old:
----
chart-testing-3.9.0.obscpio
New:
----
chart-testing-3.10.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chart-testing.spec ++++++
--- /var/tmp/diff_new_pack.fzMxUW/_old 2023-11-01 22:11:05.438134936 +0100
+++ /var/tmp/diff_new_pack.fzMxUW/_new 2023-11-01 22:11:05.442135084 +0100
@@ -21,7 +21,7 @@
%define name_of_binary ct
Name: chart-testing
-Version: 3.9.0
+Version: 3.10.0
Release: 0
Summary: CLI tool for linting and testing Helm charts
Group: Development/Languages/Other
@@ -39,8 +39,7 @@
ct is the the tool for testing Helm charts. It is meant to be used for linting and testing pull requests. It automatically detects charts changed against the target branch.
%prep
-%setup -q
-%setup -q -T -D -a 1
+%autosetup -p 1 -a 1
%build
go build \
++++++ _service ++++++
--- /var/tmp/diff_new_pack.fzMxUW/_old 2023-11-01 22:11:05.470136122 +0100
+++ /var/tmp/diff_new_pack.fzMxUW/_new 2023-11-01 22:11:05.470136122 +0100
@@ -1,14 +1,14 @@
<services>
- <service name="obs_scm" mode="disabled">
+ <service name="obs_scm" mode="manual">
<param name="url">https://github.com/helm/chart-testing</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v3.9.0</param>
+ <param name="revision">v3.10.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
- <service name="set_version" mode="disabled">
+ <service name="set_version" mode="manual">
<param name="basename">chart-testing</param>
</service>
<service name="tar" mode="buildtime"/>
@@ -16,7 +16,7 @@
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
- <service name="go_modules" mode="disabled">
+ <service name="go_modules" mode="manual">
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.fzMxUW/_old 2023-11-01 22:11:05.490136863 +0100
+++ /var/tmp/diff_new_pack.fzMxUW/_new 2023-11-01 22:11:05.494137011 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/helm/chart-testing</param>
- <param name="changesrevision">88cc7026481da7468e34a614b8ca4f0da42c063c</param></service></servicedata>
+ <param name="changesrevision">0cb17e5aa89e2d6cf49cb4e7f09b602af58adfbb</param></service></servicedata>
(No newline at EOF)
++++++ chart-testing-3.9.0.obscpio -> chart-testing-3.10.0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chart-testing-3.9.0/.github/workflows/ci.yaml new/chart-testing-3.10.0/.github/workflows/ci.yaml
--- old/chart-testing-3.9.0/.github/workflows/ci.yaml 2023-07-10 12:14:23.000000000 +0200
+++ new/chart-testing-3.10.0/.github/workflows/ci.yaml 2023-10-27 14:13:16.000000000 +0200
@@ -12,7 +12,7 @@
steps:
- name: checkout
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0
@@ -20,7 +20,7 @@
uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # v2.0.0
- name: Setup go
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+ uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version-file: './go.mod'
check-latest: true
@@ -30,18 +30,18 @@
version: v3.12.1
- name: Install GoReleaser
- uses: goreleaser/goreleaser-action@336e29918d653399e599bfca99fadc1d7ffbc9f7 # v4.3.0
+ uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
with:
install-only: true
- name: Install cosign
- uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 # v3.1.1
+ uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2
- name: Install syft
uses: anchore/sbom-action/download-syft@78fc58e266e87a38d4194b2137a3d4e9bcaf7ca1 # v0.14.0
- name: Install k8s Kind
- uses: helm/kind-action@fa81e57adff234b2908110485695db0f181f3c67 # v1.3.0
+ uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.3.0
with:
install_only: true
@@ -65,10 +65,10 @@
git diff --exit-code
- name: Set up QEMU
- uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
+ uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@16c0bc4a6e6ada2cfd8afd41d22d95379cf7c32a # v2.8.0
+ uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
- name: Build
run: |
@@ -82,8 +82,8 @@
name: check-docs
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version-file: './go.mod'
check-latest: true
@@ -103,12 +103,12 @@
name: lint
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version-file: './go.mod'
check-latest: true
- name: golangci-lint
- uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # v3
+ uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3
with:
version: v1.53
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chart-testing-3.9.0/.github/workflows/release.yaml new/chart-testing-3.10.0/.github/workflows/release.yaml
--- old/chart-testing-3.9.0/.github/workflows/release.yaml 2023-07-10 12:14:23.000000000 +0200
+++ new/chart-testing-3.10.0/.github/workflows/release.yaml 2023-10-27 14:13:16.000000000 +0200
@@ -17,7 +17,7 @@
steps:
- name: checkout
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0
@@ -25,18 +25,18 @@
uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # v2.0.0
- name: Setup go
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+ uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version-file: './go.mod'
check-latest: true
- name: Install GoReleaser
- uses: goreleaser/goreleaser-action@336e29918d653399e599bfca99fadc1d7ffbc9f7 # v4.3.0
+ uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
with:
install-only: true
- name: Install cosign
- uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 # v3.1.1
+ uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2
- name: Install syft
uses: anchore/sbom-action/download-syft@78fc58e266e87a38d4194b2137a3d4e9bcaf7ca1 # v0.14.0
@@ -53,13 +53,13 @@
git diff --exit-code
- name: Set up QEMU
- uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
+ uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@16c0bc4a6e6ada2cfd8afd41d22d95379cf7c32a # v2.8.0
+ uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
- name: Login to registry
- uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
+ uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
with:
registry: quay.io
username: ${{ secrets.DOCKER_USERNAME }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chart-testing-3.9.0/README.md new/chart-testing-3.10.0/README.md
--- old/chart-testing-3.9.0/README.md 2023-07-10 12:14:23.000000000 +0200
+++ new/chart-testing-3.10.0/README.md 2023-10-27 14:13:16.000000000 +0200
@@ -131,6 +131,7 @@
#### Using private chart repositories
When adding chart-repos you can specify additional arguments for the `helm repo add` command using `helm-repo-extra-args` on a per-repo basis.
+You can also specify OCI registries which will be added using the `helm registry login` command, they also support the `helm-repo-extra-args` for authentication.
This could for example be used to authenticate a private chart repository.
`config.yaml`:
@@ -140,6 +141,7 @@
- incubator=https://incubator.io
- basic-auth=https://private.com
- ssl-repo=https://self-signed.ca
+ - oci-registry=oci://nice-oci-registry.pt
helm-repo-extra-args:
- ssl-repo=--ca-file ./my-ca.crt
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chart-testing-3.9.0/go.mod new/chart-testing-3.10.0/go.mod
--- old/chart-testing-3.9.0/go.mod 2023-07-10 12:14:23.000000000 +0200
+++ new/chart-testing-3.10.0/go.mod 2023-10-27 14:13:16.000000000 +0200
@@ -11,14 +11,14 @@
github.com/mitchellh/go-homedir v1.1.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
- github.com/spf13/viper v1.16.0
+ github.com/spf13/viper v1.17.0
github.com/stretchr/testify v1.8.4
gopkg.in/yaml.v2 v2.4.0
)
require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
- github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -26,16 +26,21 @@
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
- github.com/pelletier/go-toml/v2 v2.0.8 // indirect
- github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
- github.com/spf13/afero v1.9.5 // indirect
+ github.com/sagikazarmark/locafero v0.3.0 // indirect
+ github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+ github.com/sourcegraph/conc v0.3.0 // indirect
+ github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
- github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
- github.com/subosito/gotenv v1.4.2 // indirect
- golang.org/x/sys v0.8.0 // indirect
- golang.org/x/text v0.9.0 // indirect
+ github.com/subosito/gotenv v1.6.0 // indirect
+ go.uber.org/atomic v1.9.0 // indirect
+ go.uber.org/multierr v1.9.0 // indirect
+ golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+ golang.org/x/sys v0.12.0 // indirect
+ golang.org/x/text v0.13.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chart-testing-3.9.0/go.sum new/chart-testing-3.10.0/go.sum
--- old/chart-testing-3.9.0/go.sum 2023-07-10 12:14:23.000000000 +0200
+++ new/chart-testing-3.10.0/go.sum 2023-10-27 14:13:16.000000000 +0200
@@ -53,15 +53,16 @@
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
+github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
@@ -129,7 +130,7 @@
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM=
+github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=
@@ -154,52 +155,57 @@
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
-github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
+github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
+github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
-github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ=
+github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U=
+github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
+github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
+github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
+github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
+github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
+github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
-github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
+github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
+github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
-github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -210,6 +216,10 @@
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
+go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -227,6 +237,8 @@
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -337,8 +349,8 @@
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -348,8 +360,8 @@
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chart-testing-3.9.0/pkg/chart/chart.go new/chart-testing-3.10.0/pkg/chart/chart.go
--- old/chart-testing-3.9.0/pkg/chart/chart.go 2023-07-10 12:14:23.000000000 +0200
+++ new/chart-testing-3.10.0/pkg/chart/chart.go 2023-10-27 14:13:16.000000000 +0200
@@ -722,11 +722,12 @@
return "", errors.New("must be in a git repository")
}
- if !t.git.BranchExists(t.config.TargetBranch) {
- return "", fmt.Errorf("targetBranch '%s' does not exist", t.config.TargetBranch)
+ branch := fmt.Sprintf("%s/%s", t.config.Remote, t.config.TargetBranch)
+ if !t.git.BranchExists(branch) {
+ return "", fmt.Errorf("targetBranch '%s' does not exist", branch)
}
- return t.git.MergeBase(fmt.Sprintf("%s/%s", t.config.Remote, t.config.TargetBranch), t.config.Since)
+ return t.git.MergeBase(branch, t.config.Since)
}
// ComputeChangedChartDirectories takes the merge base of HEAD and the configured remote and target branch and computes a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chart-testing-3.9.0/pkg/tool/helm.go new/chart-testing-3.10.0/pkg/tool/helm.go
--- old/chart-testing-3.9.0/pkg/tool/helm.go 2023-07-10 12:14:23.000000000 +0200
+++ new/chart-testing-3.10.0/pkg/tool/helm.go 2023-10-27 14:13:16.000000000 +0200
@@ -16,6 +16,7 @@
import (
"fmt"
+ "strings"
"github.com/helm/chart-testing/v3/pkg/exec"
)
@@ -35,6 +36,13 @@
}
func (h Helm) AddRepo(name string, url string, extraArgs []string) error {
+ const ociPrefix string = "oci://"
+
+ if strings.HasPrefix(url, ociPrefix) {
+ registryDomain := url[len(ociPrefix):]
+ return h.exec.RunProcess("helm", "registry", "login", registryDomain, extraArgs)
+ }
+
return h.exec.RunProcess("helm", "repo", "add", name, url, extraArgs)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chart-testing-3.9.0/pkg/tool/kubectl.go new/chart-testing-3.10.0/pkg/tool/kubectl.go
--- old/chart-testing-3.9.0/pkg/tool/kubectl.go 2023-07-10 12:14:23.000000000 +0200
+++ new/chart-testing-3.10.0/pkg/tool/kubectl.go 2023-10-27 14:13:16.000000000 +0200
@@ -222,7 +222,7 @@
func (k Kubectl) GetEvents(namespace string) error {
return k.exec.RunProcess("kubectl",
fmt.Sprintf("--request-timeout=%s", k.timeout),
- "get", "events", "--output", "wide", "--namespace", namespace)
+ "get", "events", "--output", "wide", "--namespace", namespace, "--sort-by", "lastTimestamp")
}
func (k Kubectl) DescribePod(namespace string, pod string) error {
++++++ chart-testing.obsinfo ++++++
--- /var/tmp/diff_new_pack.fzMxUW/_old 2023-11-01 22:11:05.630142049 +0100
+++ /var/tmp/diff_new_pack.fzMxUW/_new 2023-11-01 22:11:05.634142197 +0100
@@ -1,5 +1,5 @@
name: chart-testing
-version: 3.9.0
-mtime: 1688984063
-commit: 88cc7026481da7468e34a614b8ca4f0da42c063c
+version: 3.10.0
+mtime: 1698408796
+commit: 0cb17e5aa89e2d6cf49cb4e7f09b602af58adfbb
++++++ vendor.tar.gz ++++++
++++ 27350 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-python-lsp-jsonrpc for openSUSE:Factory checked in at 2023-11-01 22:10:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-python-lsp-jsonrpc (Old)
and /work/SRC/openSUSE:Factory/.python-python-lsp-jsonrpc.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-python-lsp-jsonrpc"
Wed Nov 1 22:10:20 2023 rev:2 rq:1121664 version:1.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-python-lsp-jsonrpc/python-python-lsp-jsonrpc.changes 2021-07-16 22:13:23.278556391 +0200
+++ /work/SRC/openSUSE:Factory/.python-python-lsp-jsonrpc.new.17445/python-python-lsp-jsonrpc.changes 2023-11-01 22:11:03.290055361 +0100
@@ -1,0 +2,19 @@
+Wed Nov 1 16:48:02 UTC 2023 - Ben Greiner <code(a)bnavigator.de>
+
+- Fix requirements
+- Don't check coverage
+
+-------------------------------------------------------------------
+Wed Nov 1 06:10:09 UTC 2023 - Steve Kowalik <steven.kowalik(a)suse.com>
+
+- Update to 1.1.2:
+ * Fix tests so they're compatible with both ujson and pure json library
+ * Remove redundant wheel dep from pyproject.toml
+ * Add license trove classifier
+ * Drop support for Python 3.7 and 3.6
+ * Allow method handlers to return json rpc errors
+ * Migrate metadata from `setup.cfg` to PEP 621-compliant `pyproject.toml`
+ * Use f-strings wherever possible
+- Switch to pyproject macros.
+
+-------------------------------------------------------------------
Old:
----
python-lsp-jsonrpc-1.0.0.tar.gz
New:
----
python-lsp-jsonrpc-1.1.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-python-lsp-jsonrpc.spec ++++++
--- /var/tmp/diff_new_pack.b0a5qv/_old 2023-11-01 22:11:03.942079515 +0100
+++ /var/tmp/diff_new_pack.b0a5qv/_new 2023-11-01 22:11:03.942079515 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-python-lsp-jsonrpc
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,19 @@
#
-%{?!python_module:%define python_module() python3-%{**}}
-%define skip_python2 1
Name: python-python-lsp-jsonrpc
-Version: 1.0.0
+Version: 1.1.2
Release: 0
Summary: JSON RPC 2.0 server library
License: MIT
URL: https://github.com/python-lsp/python-lsp-jsonrpc
Source: https://files.pythonhosted.org/packages/source/p/python-lsp-jsonrpc/python-…
+BuildRequires: %{python_module base >= 3.8}
+BuildRequires: %{python_module pip}
+BuildRequires: %{python_module setuptools >= 61.2}
+BuildRequires: %{python_module setuptools_scm >= 3.4.3}
+BuildRequires: %{python_module wheel}
BuildRequires: python-rpm-macros
-BuildRequires: %{python_module setuptools}
# SECTION test requirements
BuildRequires: %{python_module ujson >= 3.0.0}
BuildRequires: %{python_module pytest}
@@ -40,25 +42,23 @@
A Python 3.6+ server implementation of the JSON RPC 2.0 protocol.
This library has been pulled out of the Python Language Server project.
-
%prep
%setup -q -n python-lsp-jsonrpc-%{version}
+sed -i /addopts/d pyproject.toml
%build
-%python_build
+%pyproject_wheel
%install
-%python_install
+%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-# Remove pytest addopts
-rm setup.cfg
%pytest
%files %{python_files}
%doc README.md
%license LICENSE
%{python_sitelib}/pylsp_jsonrpc
-%{python_sitelib}/python_lsp_jsonrpc-%{version}*-info
+%{python_sitelib}/python_lsp_jsonrpc-%{version}.dist-info
++++++ python-lsp-jsonrpc-1.0.0.tar.gz -> python-lsp-jsonrpc-1.1.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/.coveragerc new/python-lsp-jsonrpc-1.1.2/.coveragerc
--- old/python-lsp-jsonrpc-1.0.0/.coveragerc 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/.coveragerc 2022-01-10 22:08:23.000000000 +0100
@@ -0,0 +1,2 @@
+[run]
+omit = pylsp_jsonrpc/_version.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/.gitattributes new/python-lsp-jsonrpc-1.1.2/.gitattributes
--- old/python-lsp-jsonrpc-1.0.0/.gitattributes 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/.gitattributes 2021-02-21 18:24:16.000000000 +0100
@@ -0,0 +1 @@
+jsonrpc/_version.py export-subst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/.github/workflows/static.yml new/python-lsp-jsonrpc-1.1.2/.github/workflows/static.yml
--- old/python-lsp-jsonrpc-1.0.0/.github/workflows/static.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/.github/workflows/static.yml 2022-05-10 05:45:17.000000000 +0200
@@ -0,0 +1,40 @@
+name: Static code analysis
+
+on:
+ push:
+ branches:
+ - develop
+
+ pull_request:
+ branches:
+ - '*'
+
+jobs:
+ build:
+ name: Static code analysis
+ runs-on: ubuntu-latest
+ env:
+ CI: 'true'
+ OS: 'linux'
+ timeout-minutes: 2
+ steps:
+ - uses: actions/cache@v1
+ with:
+ path: ~/.cache/pip
+ key: static-pip-${{ hashFiles('setup.py') }}
+ restore-keys: static-pip-
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2
+ with:
+ # TODO: check with Python 3, but need to fix the
+ # errors first
+ python-version: '3.8'
+ architecture: 'x64'
+ - run: python -m pip install --upgrade pip setuptools
+ - run: pip install -e .[test]
+ - name: Pylint checks
+ run: pylint pylsp_jsonrpc test
+ - name: Code style checks
+ run: pycodestyle pylsp_jsonrpc test
+ - name: Pyflakes checks
+ run: pyflakes pylsp_jsonrpc test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/.github/workflows/test-linux.yml new/python-lsp-jsonrpc-1.1.2/.github/workflows/test-linux.yml
--- old/python-lsp-jsonrpc-1.0.0/.github/workflows/test-linux.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/.github/workflows/test-linux.yml 2023-09-08 00:31:24.000000000 +0200
@@ -0,0 +1,42 @@
+name: Linux tests
+
+on:
+ push:
+ branches:
+ - develop
+
+ pull_request:
+ branches:
+ - '*'
+
+jobs:
+ build:
+ name: Linux Py${{ matrix.PYTHON_VERSION }}
+ runs-on: ubuntu-latest
+ env:
+ CI: 'true'
+ OS: 'linux'
+ PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+ strategy:
+ fail-fast: false
+ matrix:
+ PYTHON_VERSION: ['3.10', '3.9', '3.8']
+ timeout-minutes: 10
+ steps:
+ - uses: actions/cache@v1
+ with:
+ path: ~/.cache/pip
+ key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }}
+ restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.PYTHON_VERSION }}
+ architecture: 'x64'
+ - run: python -m pip install --upgrade pip setuptools
+ - run: pip install -e .[all,test]
+ - run: pytest -v test/
+ # Enable this if SSH debugging is required
+ # - name: Setup tmate session
+ # uses: mxschmitt/action-tmate@v3
+ # if: ${{ failure() }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/.github/workflows/test-mac.yml new/python-lsp-jsonrpc-1.1.2/.github/workflows/test-mac.yml
--- old/python-lsp-jsonrpc-1.0.0/.github/workflows/test-mac.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/.github/workflows/test-mac.yml 2023-09-08 00:31:24.000000000 +0200
@@ -0,0 +1,42 @@
+name: Mac tests
+
+on:
+ push:
+ branches:
+ - develop
+
+ pull_request:
+ branches:
+ - '*'
+
+jobs:
+ build:
+ name: Mac Py${{ matrix.PYTHON_VERSION }}
+ runs-on: macos-latest
+ env:
+ CI: 'true'
+ OS: 'macos'
+ PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+ strategy:
+ fail-fast: false
+ matrix:
+ PYTHON_VERSION: ['3.10', '3.9', '3.8']
+ timeout-minutes: 10
+ steps:
+ - uses: actions/cache@v1
+ with:
+ path: ~/Library/Caches/pip
+ key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }}
+ restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.PYTHON_VERSION }}
+ architecture: 'x64'
+ - run: python -m pip install --upgrade pip setuptools
+ - run: pip install -e .[all,test]
+ - run: pytest -v test/
+ # Enable this if SSH debugging is required
+ # - name: Setup tmate session
+ # uses: mxschmitt/action-tmate@v3
+ # if: ${{ failure() }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/.github/workflows/test-win.yml new/python-lsp-jsonrpc-1.1.2/.github/workflows/test-win.yml
--- old/python-lsp-jsonrpc-1.0.0/.github/workflows/test-win.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/.github/workflows/test-win.yml 2023-09-08 00:31:24.000000000 +0200
@@ -0,0 +1,38 @@
+name: Windows tests
+
+on:
+ push:
+ branches:
+ - develop
+
+ pull_request:
+ branches:
+ - '*'
+
+jobs:
+ build:
+ name: Win Py${{ matrix.PYTHON_VERSION }}
+ runs-on: windows-latest
+ env:
+ CI: 'true'
+ OS: 'win'
+ PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
+ strategy:
+ fail-fast: false
+ matrix:
+ PYTHON_VERSION: ['3.10', '3.9', '3.8']
+ timeout-minutes: 10
+ steps:
+ - uses: actions/cache@v1
+ with:
+ path: ~\AppData\Local\pip\Cache
+ key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('setup.py') }}
+ restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.PYTHON_VERSION }}
+ architecture: 'x64'
+ - run: python -m pip install --upgrade pip setuptools
+ - run: pip install -e .[all,test]
+ - run: pytest -v test/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/.gitignore new/python-lsp-jsonrpc-1.1.2/.gitignore
--- old/python-lsp-jsonrpc-1.0.0/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/.gitignore 2022-05-15 18:12:50.000000000 +0200
@@ -0,0 +1,114 @@
+# autogenerated version file
+/pylsp_jsonrpc/_version.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea/
+out/
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+env3/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+# Usually these files are written by a python script from a template
+# before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+pytest.xml
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+# JavaScript
+**/*.vscode/
+
+# vim
+*.sw[mnopqrs]
+
+# Idea
+.idea/
+
+# Merge orig files
+*.orig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/CHANGELOG.md new/python-lsp-jsonrpc-1.1.2/CHANGELOG.md
--- old/python-lsp-jsonrpc-1.0.0/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/CHANGELOG.md 2023-09-23 19:46:03.000000000 +0200
@@ -0,0 +1,71 @@
+# History of changes
+
+## Version 1.1.2 (2023/09/23)
+
+### Pull Requests Merged
+
+* [PR 26](https://github.com/python-lsp/python-lsp-jsonrpc/pull/26) - Fix tests so they're compatible with both ujson and pure json library, by [@ajohnston9](https://github.com/ajohnston9)
+
+In this release 1 pull request was closed.
+
+----
+
+## Version 1.1.1 (2023/09/09)
+
+### Issues Closed
+
+* [Issue 18](https://github.com/python-lsp/python-lsp-jsonrpc/issues/18) - No license included in package metadata ([PR 19](https://github.com/python-lsp/python-lsp-jsonrpc/pull/19) by [@thejcannon](https://github.com/thejcannon))
+
+In this release 1 issue was closed.
+
+### Pull Requests Merged
+
+* [PR 23](https://github.com/python-lsp/python-lsp-jsonrpc/pull/23) - Remove redundant wheel dep from pyproject.toml, by [@mgorny](https://github.com/mgorny)
+* [PR 19](https://github.com/python-lsp/python-lsp-jsonrpc/pull/19) - Add license trove classifier, by [@thejcannon](https://github.com/thejcannon) ([18](https://github.com/python-lsp/python-lsp-jsonrpc/issues/18))
+
+In this release 2 pull requests were closed.
+
+----
+
+## Version 1.1.0 (2023/09/07)
+
+## New features
+
+* Allow method handlers to return json rpc errors
+* Drop support for Python 3.7 and 3.6
+
+### Issues Closed
+
+* [Issue 11](https://github.com/python-lsp/python-lsp-jsonrpc/issues/11) - Drop support for Python 3.6 ([PR 16](https://github.com/python-lsp/python-lsp-jsonrpc/pull/16) by [@ccordoba12](https://github.com/ccordoba12))
+
+In this release 1 issue was closed.
+
+### Pull Requests Merged
+
+* [PR 21](https://github.com/python-lsp/python-lsp-jsonrpc/pull/21) - Drop support for Python 3.7, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 20](https://github.com/python-lsp/python-lsp-jsonrpc/pull/20) - Allow method handlers to return json rpc errors, by [@smacke](https://github.com/smacke)
+* [PR 16](https://github.com/python-lsp/python-lsp-jsonrpc/pull/16) - Make necessary changes to drop support for Python 3.6, by [@ccordoba12](https://github.com/ccordoba12) ([11](https://github.com/python-lsp/python-lsp-jsonrpc/issues/11))
+* [PR 15](https://github.com/python-lsp/python-lsp-jsonrpc/pull/15) - Drop Python 3.6 on CIs and start testing with Python 3.10, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 14](https://github.com/python-lsp/python-lsp-jsonrpc/pull/14) - Migrate metadata from `setup.cfg` to PEP 621-compliant `pyproject.toml`, by [@KOLANICH](https://github.com/KOLANICH)
+* [PR 10](https://github.com/python-lsp/python-lsp-jsonrpc/pull/10) - Use f-strings wherever possible, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 9](https://github.com/python-lsp/python-lsp-jsonrpc/pull/9) - Add license info to setup.py so it will show up in wheel installs., by [@itsbenweeks](https://github.com/itsbenweeks)
+* [PR 8](https://github.com/python-lsp/python-lsp-jsonrpc/pull/8) - Move the package metadata from setup.py to setup.cfg, by [@KOLANICH](https://github.com/KOLANICH)
+* [PR 4](https://github.com/python-lsp/python-lsp-jsonrpc/pull/4) - PR: Fix typos in readme, by [@yaegassy](https://github.com/yaegassy)
+
+In this release 9 pull requests were closed.
+
+----
+
+## Version 1.0.0 (2021/04/14)
+
+### Issues Closed
+
+* [Issue 3](https://github.com/python-lsp/python-lsp-jsonrpc/issues/3) - Release v1.0.0
+
+In this release 1 issue was closed.
+
+### Pull Requests Merged
+
+* [PR 2](https://github.com/python-lsp/python-lsp-jsonrpc/pull/2) - PR: Update package name, remove Python 2 compatibility and update CIs, by [@andfoy](https://github.com/andfoy)
+
+In this release 1 pull request was closed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/PKG-INFO new/python-lsp-jsonrpc-1.1.2/PKG-INFO
--- old/python-lsp-jsonrpc-1.0.0/PKG-INFO 2021-04-14 23:13:43.751572400 +0200
+++ new/python-lsp-jsonrpc-1.1.2/PKG-INFO 2023-09-23 19:47:51.097817200 +0200
@@ -1,28 +1,37 @@
Metadata-Version: 2.1
Name: python-lsp-jsonrpc
-Version: 1.0.0
+Version: 1.1.2
Summary: JSON RPC 2.0 server library
-Home-page: https://github.com/python-lsp/python-lsp-jsonrpc
Author: Python Language Server Contributors
-License: UNKNOWN
-Description: # Python JSON RPC Server
-
- A Python 3.6+ server implementation of the [JSON RPC 2.0](http://www.jsonrpc.org/specification) protocol. This library has been pulled out of the [Python LSP Server](https://github.com/python-lsp/python-lsp-server) project.
-
- ## Installation
-
- pip install -U python-jsonrpc-server
-
- ## Examples
-
- The examples directory contains two examples of running language servers over websockets. `examples/langserver.py` shows how to run a language server in-memory. `examples/langserver_ext.py` shows how to run a subprocess language server, in this case the Python LSP Server.
-
- Start by installing `tornado` and `python-language-server`
-
- pip install python-lsp-server[all] tornado
-
- Then running `python examples/langserver.py` or `python examples/langserver_ext.py` will host a websocket on ``ws://localhost:3000/python``.
-
-Platform: UNKNOWN
+License: MIT
+Project-URL: Homepage, https://github.com/python-lsp/python-lsp-jsonrpc
+Classifier: License :: OSI Approved :: MIT License
+Requires-Python: >=3.8
Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: ujson>=3.0.0
Provides-Extra: test
+Requires-Dist: pylint; extra == "test"
+Requires-Dist: pycodestyle; extra == "test"
+Requires-Dist: pyflakes; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: coverage; extra == "test"
+
+# Python JSON RPC Server
+
+A Python 3.8+ server implementation of the [JSON RPC 2.0](http://www.jsonrpc.org/specification) protocol. This library has been pulled out of the [Python LSP Server](https://github.com/python-lsp/python-lsp-server) project.
+
+## Installation
+
+ pip install -U python-lsp-jsonrpc
+
+## Examples
+
+The examples directory contains two examples of running language servers over websockets. `examples/langserver.py` shows how to run a language server in-memory. `examples/langserver_ext.py` shows how to run a subprocess language server, in this case the Python LSP Server.
+
+Start by installing `tornado` and `python-lsp-server`
+
+ pip install python-lsp-server[all] tornado
+
+Then running `python examples/langserver.py` or `python examples/langserver_ext.py` will host a websocket on ``ws://localhost:3000/python``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/README.md new/python-lsp-jsonrpc-1.1.2/README.md
--- old/python-lsp-jsonrpc-1.0.0/README.md 2021-04-14 23:05:37.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/README.md 2023-09-08 00:31:24.000000000 +0200
@@ -1,16 +1,16 @@
# Python JSON RPC Server
-A Python 3.6+ server implementation of the [JSON RPC 2.0](http://www.jsonrpc.org/specification) protocol. This library has been pulled out of the [Python LSP Server](https://github.com/python-lsp/python-lsp-server) project.
+A Python 3.8+ server implementation of the [JSON RPC 2.0](http://www.jsonrpc.org/specification) protocol. This library has been pulled out of the [Python LSP Server](https://github.com/python-lsp/python-lsp-server) project.
## Installation
- pip install -U python-jsonrpc-server
+ pip install -U python-lsp-jsonrpc
## Examples
The examples directory contains two examples of running language servers over websockets. `examples/langserver.py` shows how to run a language server in-memory. `examples/langserver_ext.py` shows how to run a subprocess language server, in this case the Python LSP Server.
-Start by installing `tornado` and `python-language-server`
+Start by installing `tornado` and `python-lsp-server`
pip install python-lsp-server[all] tornado
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/RELEASE.md new/python-lsp-jsonrpc-1.1.2/RELEASE.md
--- old/python-lsp-jsonrpc-1.0.0/RELEASE.md 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/RELEASE.md 2023-09-08 00:42:38.000000000 +0200
@@ -0,0 +1,22 @@
+## Before the release:
+
+1. Create pull request to update CHANGELOG.md with
+ * `loghub python-lsp/python-lsp-jsonrpc -m vX.X.X`
+ * git add -A && git commit -m "Update changelog for X.X.X"
+
+ This is necessary to run our tests before the release, so we can be sure
+ everything is in order.
+
+## To release a new version of python-lsp-jsonrpc:
+
+1. git fetch upstream && git checkout upstream/master
+2. Close milestone on GitHub
+3. git clean -xfdi
+4. git tag -a vX.X.X -m "Release vX.X.X"
+5. python -m pip install --upgrade pip
+6. pip install --upgrade --upgrade-strategy eager build setuptools twine wheel
+7. python -bb -X dev -W error -m build
+8. twine check --strict dist/*
+9. twine upload dist/*
+10. git push upstream --tags
+11. Create release on Github
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/examples/langserver.py new/python-lsp-jsonrpc-1.1.2/examples/langserver.py
--- old/python-lsp-jsonrpc-1.0.0/examples/langserver.py 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/examples/langserver.py 2022-01-10 22:08:23.000000000 +0100
@@ -0,0 +1,75 @@
+import logging
+
+from tornado import web, ioloop, websocket
+
+from pylsp_jsonrpc import dispatchers, endpoint
+
+try:
+ import ujson as json
+except Exception: # pylint: disable=broad-except
+ import json
+
+log = logging.getLogger(__name__)
+
+
+class LanguageServer(dispatchers.MethodDispatcher):
+ """Implement a JSON RPC method dispatcher for the language server protocol."""
+
+ def __init__(self):
+ # Endpoint is lazily set after construction
+ self.endpoint = None
+
+ def m_initialize(self, rootUri=None, **kwargs):
+ log.info("Got initialize params: %s", kwargs)
+ return {"capabilities": {
+ "textDocumentSync": {
+ "openClose": True,
+ }
+ }}
+
+ def m_text_document__did_open(self, textDocument=None, **_kwargs):
+ log.info("Opened text document %s", textDocument)
+ self.endpoint.notify('textDocument/publishDiagnostics', {
+ 'uri': textDocument['uri'],
+ 'diagnostics': [{
+ 'range': {
+ 'start': {'line': 0, 'character': 0},
+ 'end': {'line': 1, 'character': 0},
+ },
+ 'message': 'Some very bad Python code',
+ 'severity': 1 # DiagnosticSeverity.Error
+ }]
+ })
+
+
+class LanguageServerWebSocketHandler(websocket.WebSocketHandler):
+ """Setup tornado websocket handler to host language server."""
+
+ def __init__(self, *args, **kwargs):
+ # Create an instance of the language server used to dispatch JSON RPC methods
+ langserver = LanguageServer()
+
+ # Setup an endpoint that dispatches to the ls, and writes server->client messages
+ # back to the client websocket
+ self.endpoint = endpoint.Endpoint(langserver, lambda msg: self.write_message(json.dumps(msg)))
+
+ # Give the language server a handle to the endpoint so it can send JSON RPC
+ # notifications and requests.
+ langserver.endpoint = self.endpoint
+
+ super(LanguageServerWebSocketHandler, self).__init__(*args, **kwargs)
+
+ def on_message(self, message):
+ """Forward client->server messages to the endpoint."""
+ self.endpoint.consume(json.loads(message))
+
+ def check_origin(self, origin):
+ return True
+
+
+if __name__ == "__main__":
+ app = web.Application([
+ (r"/python", LanguageServerWebSocketHandler),
+ ])
+ app.listen(3000, address='127.0.0.1')
+ ioloop.IOLoop.current().start()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/examples/langserver_ext.py new/python-lsp-jsonrpc-1.1.2/examples/langserver_ext.py
--- old/python-lsp-jsonrpc-1.0.0/examples/langserver_ext.py 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/examples/langserver_ext.py 2022-01-10 22:08:23.000000000 +0100
@@ -0,0 +1,60 @@
+import logging
+import subprocess
+import threading
+
+from tornado import ioloop, process, web, websocket
+
+from pylsp_jsonrpc import streams
+
+try:
+ import ujson as json
+except Exception: # pylint: disable=broad-except
+ import json
+
+log = logging.getLogger(__name__)
+
+
+class LanguageServerWebSocketHandler(websocket.WebSocketHandler):
+ """Setup tornado websocket handler to host an external language server."""
+
+ writer = None
+
+ def open(self, *args, **kwargs):
+ log.info("Spawning pylsp subprocess")
+
+ # Create an instance of the language server
+ proc = process.Subprocess(
+ ['pylsp', '-v'],
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE
+ )
+
+ # Create a writer that formats json messages with the correct LSP headers
+ self.writer = streams.JsonRpcStreamWriter(proc.stdin)
+
+ # Create a reader for consuming stdout of the language server. We need to
+ # consume this in another thread
+ def consume():
+ # Start a tornado IOLoop for reading/writing to the process in this thread
+ ioloop.IOLoop()
+ reader = streams.JsonRpcStreamReader(proc.stdout)
+ reader.listen(lambda msg: self.write_message(json.dumps(msg)))
+
+ thread = threading.Thread(target=consume)
+ thread.daemon = True
+ thread.start()
+
+ def on_message(self, message):
+ """Forward client->server messages to the endpoint."""
+ self.writer.write(json.loads(message))
+
+ def check_origin(self, origin):
+ return True
+
+
+if __name__ == "__main__":
+ app = web.Application([
+ (r"/python", LanguageServerWebSocketHandler),
+ ])
+ app.listen(3000, address='127.0.0.1')
+ ioloop.IOLoop.current().start()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/__init__.py new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/__init__.py
--- old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/__init__.py 2021-04-14 23:05:37.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/__init__.py 2022-05-15 18:12:50.000000000 +0200
@@ -1,6 +1,23 @@
# Copyright 2017-2020 Palantir Technologies, Inc.
# Copyright 2021- Python Language Server Contributors.
+from . import _version
from ._version import __version__
-__all__ = [__version__]
+
+def convert_version_info(version: str) -> (int, ..., str):
+ version_info = version.split(".")
+ for i in range(len(version_info)): # pylint:disable=consider-using-enumerate
+ try:
+ version_info[i] = int(version_info[i])
+ except ValueError:
+ version_info[i] = version_info[i].split("+")[0]
+ version_info = version_info[: i + 1]
+ break
+
+ return tuple(version_info)
+
+
+_version.VERSION_INFO = convert_version_info(__version__)
+
+__all__ = ("__version__",)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/_version.py new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/_version.py
--- old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/_version.py 2021-04-14 23:13:05.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/_version.py 2023-09-23 19:47:50.000000000 +0200
@@ -1,5 +1 @@
-# Copyright 2017-2020 Palantir Technologies, Inc.
-# Copyright 2021- Python Language Server Contributors.
-
-VERSION_INFO = (1, 0, 0)
-__version__ = '.'.join(map(str, VERSION_INFO))
+__version__ = "1.1.2"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/dispatchers.py new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/dispatchers.py
--- old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/dispatchers.py 2021-04-14 23:05:37.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/dispatchers.py 2022-01-10 22:19:15.000000000 +0100
@@ -16,7 +16,7 @@
"""
def __getitem__(self, item):
- method_name = 'm_{}'.format(_method_to_string(item))
+ method_name = f'm_{_method_to_string(item)}'
if hasattr(self, method_name):
method = getattr(self, method_name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/endpoint.py new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/endpoint.py
--- old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/endpoint.py 2021-04-14 23:05:37.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/endpoint.py 2023-09-08 00:15:39.000000000 +0200
@@ -4,6 +4,7 @@
import logging
import uuid
import sys
+from typing import Any, Dict, Mapping
from concurrent import futures
from .exceptions import (JsonRpcException, JsonRpcRequestCancelled,
@@ -175,6 +176,17 @@
if request_future.cancel():
log.debug("Cancelled request with id %s", msg_id)
+ @staticmethod
+ def _make_response_payload(header: Dict[str, Any], result: Any) -> Mapping[str, Any]:
+ # return type of 'Mapping' because it should not be mutated
+ # further from here
+ response = dict(header)
+ if isinstance(result, dict) and ('result' in result or 'error' in result):
+ response.update(result)
+ else:
+ response['result'] = result
+ return response
+
def _handle_request(self, msg_id, method, params):
"""Handle a request from the client."""
try:
@@ -195,11 +207,14 @@
handler_result.add_done_callback(self._request_callback(msg_id))
else:
log.debug("Got result from synchronous request handler: %s", handler_result)
- self._consumer({
- 'jsonrpc': JSONRPC_VERSION,
- 'id': msg_id,
- 'result': handler_result
- })
+ response = self._make_response_payload(
+ {
+ 'jsonrpc': JSONRPC_VERSION,
+ 'id': msg_id,
+ },
+ handler_result,
+ )
+ self._consumer(response)
def _request_callback(self, request_id):
"""Construct a request callback for the given request ID."""
@@ -216,7 +231,8 @@
}
try:
- message['result'] = future.result()
+ result = future.result()
+ message = self._make_response_payload(message, result)
except JsonRpcException as e:
log.exception("Failed to handle request %s", request_id)
message['error'] = e.to_dict()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/streams.py new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/streams.py
--- old/python-lsp-jsonrpc-1.0.0/pylsp_jsonrpc/streams.py 2021-04-14 23:05:37.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/pylsp_jsonrpc/streams.py 2022-01-10 22:19:15.000000000 +0100
@@ -74,7 +74,7 @@
try:
return int(value)
except ValueError as e:
- raise ValueError("Invalid Content-Length header: {}".format(value)) from e
+ raise ValueError(f"Invalid Content-Length header: {value}") from e
return None
@@ -100,9 +100,9 @@
content_length = len(body) if isinstance(body, bytes) else len(body.encode('utf-8'))
response = (
- "Content-Length: {}\r\n"
- "Content-Type: application/vscode-jsonrpc; charset=utf8\r\n\r\n"
- "{}".format(content_length, body)
+ f"Content-Length: {content_length}\r\n"
+ f"Content-Type: application/vscode-jsonrpc; charset=utf8\r\n\r\n"
+ f"{body}"
)
self._wfile.write(response.encode('utf-8'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/pyproject.toml new/python-lsp-jsonrpc-1.1.2/pyproject.toml
--- old/python-lsp-jsonrpc-1.0.0/pyproject.toml 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/pyproject.toml 2023-09-09 23:56:19.000000000 +0200
@@ -0,0 +1,51 @@
+# Copyright 2017-2020 Palantir Technologies, Inc.
+# Copyright 2021- Python Language Server Contributors.
+
+[build-system]
+requires = ["setuptools>=61.2.0", "setuptools_scm[toml]>=3.4.3"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "python-lsp-jsonrpc"
+authors = [{name = "Python Language Server Contributors"}]
+description = "JSON RPC 2.0 server library"
+license = {text = "MIT"}
+requires-python = ">=3.8"
+dependencies = ["ujson>=3.0.0"]
+dynamic = ["version"]
+classifiers = [
+ "License :: OSI Approved :: MIT License",
+]
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.urls]
+Homepage = "https://github.com/python-lsp/python-lsp-jsonrpc"
+
+[project.optional-dependencies]
+test = [
+ "pylint",
+ "pycodestyle",
+ "pyflakes",
+ "pytest",
+ "pytest-cov",
+ "coverage",
+]
+
+[tool.setuptools]
+license-files = ["LICENSE"]
+include-package-data = false
+
+[tool.setuptools.packages.find]
+exclude = ["contrib", "docs", "test", "test.*"]
+namespaces = false
+
+[tool.setuptools_scm]
+write_to = "pylsp_jsonrpc/_version.py"
+write_to_template = "__version__ = \"{version}\"\n" # VERSION_INFO is populated in __main__
+
+[tool.pytest.ini_options]
+testpaths = ["test"]
+addopts = "--cov-report html --cov-report term --junitxml=pytest.xml --cov pylsp_jsonrpc --cov test"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/python_lsp_jsonrpc.egg-info/PKG-INFO new/python-lsp-jsonrpc-1.1.2/python_lsp_jsonrpc.egg-info/PKG-INFO
--- old/python-lsp-jsonrpc-1.0.0/python_lsp_jsonrpc.egg-info/PKG-INFO 2021-04-14 23:13:43.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/python_lsp_jsonrpc.egg-info/PKG-INFO 2023-09-23 19:47:51.000000000 +0200
@@ -1,28 +1,37 @@
Metadata-Version: 2.1
Name: python-lsp-jsonrpc
-Version: 1.0.0
+Version: 1.1.2
Summary: JSON RPC 2.0 server library
-Home-page: https://github.com/python-lsp/python-lsp-jsonrpc
Author: Python Language Server Contributors
-License: UNKNOWN
-Description: # Python JSON RPC Server
-
- A Python 3.6+ server implementation of the [JSON RPC 2.0](http://www.jsonrpc.org/specification) protocol. This library has been pulled out of the [Python LSP Server](https://github.com/python-lsp/python-lsp-server) project.
-
- ## Installation
-
- pip install -U python-jsonrpc-server
-
- ## Examples
-
- The examples directory contains two examples of running language servers over websockets. `examples/langserver.py` shows how to run a language server in-memory. `examples/langserver_ext.py` shows how to run a subprocess language server, in this case the Python LSP Server.
-
- Start by installing `tornado` and `python-language-server`
-
- pip install python-lsp-server[all] tornado
-
- Then running `python examples/langserver.py` or `python examples/langserver_ext.py` will host a websocket on ``ws://localhost:3000/python``.
-
-Platform: UNKNOWN
+License: MIT
+Project-URL: Homepage, https://github.com/python-lsp/python-lsp-jsonrpc
+Classifier: License :: OSI Approved :: MIT License
+Requires-Python: >=3.8
Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: ujson>=3.0.0
Provides-Extra: test
+Requires-Dist: pylint; extra == "test"
+Requires-Dist: pycodestyle; extra == "test"
+Requires-Dist: pyflakes; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: coverage; extra == "test"
+
+# Python JSON RPC Server
+
+A Python 3.8+ server implementation of the [JSON RPC 2.0](http://www.jsonrpc.org/specification) protocol. This library has been pulled out of the [Python LSP Server](https://github.com/python-lsp/python-lsp-server) project.
+
+## Installation
+
+ pip install -U python-lsp-jsonrpc
+
+## Examples
+
+The examples directory contains two examples of running language servers over websockets. `examples/langserver.py` shows how to run a language server in-memory. `examples/langserver_ext.py` shows how to run a subprocess language server, in this case the Python LSP Server.
+
+Start by installing `tornado` and `python-lsp-server`
+
+ pip install python-lsp-server[all] tornado
+
+Then running `python examples/langserver.py` or `python examples/langserver_ext.py` will host a websocket on ``ws://localhost:3000/python``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/python_lsp_jsonrpc.egg-info/SOURCES.txt new/python-lsp-jsonrpc-1.1.2/python_lsp_jsonrpc.egg-info/SOURCES.txt
--- old/python-lsp-jsonrpc-1.0.0/python_lsp_jsonrpc.egg-info/SOURCES.txt 2021-04-14 23:13:43.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/python_lsp_jsonrpc.egg-info/SOURCES.txt 2023-09-23 19:47:51.000000000 +0200
@@ -1,9 +1,20 @@
+.coveragerc
+.gitattributes
+.gitignore
.pylintrc
+CHANGELOG.md
LICENSE
MANIFEST.in
README.md
+RELEASE.md
+pyproject.toml
setup.cfg
-setup.py
+.github/workflows/static.yml
+.github/workflows/test-linux.yml
+.github/workflows/test-mac.yml
+.github/workflows/test-win.yml
+examples/langserver.py
+examples/langserver_ext.py
pylsp_jsonrpc/__init__.py
pylsp_jsonrpc/_version.py
pylsp_jsonrpc/dispatchers.py
@@ -15,6 +26,7 @@
python_lsp_jsonrpc.egg-info/dependency_links.txt
python_lsp_jsonrpc.egg-info/requires.txt
python_lsp_jsonrpc.egg-info/top_level.txt
+scripts/circle/pypi.sh
test/__init__.py
test/test_endpoint.py
test/test_streams.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/scripts/circle/pypi.sh new/python-lsp-jsonrpc-1.1.2/scripts/circle/pypi.sh
--- old/python-lsp-jsonrpc-1.0.0/scripts/circle/pypi.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/python-lsp-jsonrpc-1.1.2/scripts/circle/pypi.sh 2021-02-21 18:24:16.000000000 +0100
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+if [ -z "$CI" ]; then
+ echo "Will only continue on CI"
+ exit
+fi
+
+# build package and upload to private pypi index
+rm -f ~/.pypirc
+echo "[distutils]" >> ~/.pypirc
+echo "index-servers = pypi-private" >> ~/.pypirc
+echo "[pypi-private]" >> ~/.pypirc
+echo "repository=https://$PYPI_HOST" >> ~/.pypirc
+echo "username=$PYPI_USERNAME" >> ~/.pypirc
+echo "password=$PYPI_PASSWORD" >> ~/.pypirc
+
+python setup.py sdist bdist_wheel upload -r pypi-private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/setup.cfg new/python-lsp-jsonrpc-1.1.2/setup.cfg
--- old/python-lsp-jsonrpc-1.0.0/setup.cfg 2021-04-14 23:13:43.751572400 +0200
+++ new/python-lsp-jsonrpc-1.1.2/setup.cfg 2023-09-23 19:47:51.097817200 +0200
@@ -3,12 +3,6 @@
max-line-length = 120
exclude = test/plugins/.ropeproject,test/.ropeproject
-[tool:pytest]
-testpaths = test
-addopts =
- --cov-report html --cov-report term --junitxml=pytest.xml
- --cov pylsp_jsonrpc --cov test
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/setup.py new/python-lsp-jsonrpc-1.1.2/setup.py
--- old/python-lsp-jsonrpc-1.0.0/setup.py 2021-04-14 23:05:37.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/setup.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright 2017-2020 Palantir Technologies, Inc.
-# Copyright 2021- Python Language Server Contributors.
-
-import ast
-import os
-from setuptools import find_packages, setup
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-
-
-def get_version(module='pylsp_jsonrpc'):
- """Get version."""
- with open(os.path.join(HERE, module, '_version.py'), 'r') as f:
- data = f.read()
- lines = data.split('\n')
- for line in lines:
- if line.startswith('VERSION_INFO'):
- version_tuple = ast.literal_eval(line.split('=')[-1].strip())
- version = '.'.join(map(str, version_tuple))
- break
- return version
-
-
-README = open('README.md', 'r').read()
-
-
-setup(
- name='python-lsp-jsonrpc',
- version=get_version(),
- description='JSON RPC 2.0 server library',
- long_description=README,
- long_description_content_type='text/markdown',
- url='https://github.com/python-lsp/python-lsp-jsonrpc',
- author='Python Language Server Contributors',
- packages=find_packages(exclude=['contrib', 'docs', 'test']),
- install_requires=[
- 'ujson>=3.0.0',
- ],
- extras_require={
- 'test': ['pylint', 'pycodestyle', 'pyflakes', 'pytest',
- 'pytest-cov', 'coverage'],
- },
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/test/test_endpoint.py new/python-lsp-jsonrpc-1.1.2/test/test_endpoint.py
--- old/python-lsp-jsonrpc-1.0.0/test/test_endpoint.py 2021-04-14 23:05:37.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/test/test_endpoint.py 2022-01-10 22:19:15.000000000 +0100
@@ -332,7 +332,7 @@
def await_assertion(condition, timeout=3.0, interval=0.1, exc=None):
if timeout <= 0:
- raise exc if exc else AssertionError("Failed to wait for condition %s" % condition)
+ raise exc if exc else AssertionError(f"Failed to wait for condition {condition}")
try:
condition()
except AssertionError as e:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-lsp-jsonrpc-1.0.0/test/test_streams.py new/python-lsp-jsonrpc-1.1.2/test/test_streams.py
--- old/python-lsp-jsonrpc-1.0.0/test/test_streams.py 2021-04-14 23:05:37.000000000 +0200
+++ new/python-lsp-jsonrpc-1.1.2/test/test_streams.py 2023-09-23 19:46:03.000000000 +0200
@@ -82,13 +82,20 @@
'method': 'method',
'params': {}
})
-
- assert wfile.getvalue() == (
- b'Content-Length: 44\r\n'
- b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
- b'\r\n'
- b'{"id":"hello","method":"method","params":{}}'
- )
+ if 'ujson' in sys.modules:
+ assert wfile.getvalue() == (
+ b'Content-Length: 44\r\n'
+ b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
+ b'\r\n'
+ b'{"id":"hello","method":"method","params":{}}'
+ )
+ else:
+ assert wfile.getvalue() == (
+ b'Content-Length: 49\r\n'
+ b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
+ b'\r\n'
+ b'{"id": "hello", "method": "method", "params": {}}'
+ )
class JsonDatetime(datetime.datetime):
@@ -98,7 +105,7 @@
dif = int(self.timestamp())
else:
dif = int((self - datetime.datetime(1970, 1, 1)).total_seconds())
- return '{0}'.format(dif)
+ return f'{dif}'
def test_writer_bad_message(wfile, writer):
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-python-lsp-server for openSUSE:Factory checked in at 2023-11-01 22:10:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-python-lsp-server (Old)
and /work/SRC/openSUSE:Factory/.python-python-lsp-server.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-python-lsp-server"
Wed Nov 1 22:10:18 2023 rev:26 rq:1121662 version:1.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-python-lsp-server/python-python-lsp-server.changes 2023-10-29 19:42:29.388883543 +0100
+++ /work/SRC/openSUSE:Factory/.python-python-lsp-server.new.17445/python-python-lsp-server.changes 2023-11-01 22:11:02.506026317 +0100
@@ -1,0 +2,5 @@
+Wed Nov 1 16:06:21 UTC 2023 - Ben Greiner <code(a)bnavigator.de>
+
+- Fix runtime requirements
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-python-lsp-server.spec ++++++
--- /var/tmp/diff_new_pack.JKPINs/_old 2023-11-01 22:11:02.998044543 +0100
+++ /var/tmp/diff_new_pack.JKPINs/_new 2023-11-01 22:11:02.998044543 +0100
@@ -35,6 +35,7 @@
BuildRequires: %{python_module autopep8 >= 2.0.4 with %python-autopep8 < 2.1.0}
BuildRequires: %{python_module flake8 >= 6.1.0 with %python-flake8 < 7}
BuildRequires: %{python_module flaky}
+BuildRequires: %{python_module importlib_metadata > 4.8.3 if %python-base < 3.10}
BuildRequires: %{python_module jedi >= 0.17.2 with %python-jedi < 0.20}
BuildRequires: %{python_module matplotlib}
BuildRequires: %{python_module numpy}
@@ -43,7 +44,7 @@
BuildRequires: %{python_module pydocstyle >= 6.3.0 with %python-pydocstyle < 6.4.0}
BuildRequires: %{python_module pylint >= 2.5.0 with %python-pylint < 3.1}
BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module python-lsp-jsonrpc >= 1.0.0}
+BuildRequires: %{python_module python-lsp-jsonrpc >= 1.1.0 with %python-python-lsp-jsonrpc < 2}
BuildRequires: %{python_module rope >= 1.2.0}
BuildRequires: %{python_module ujson >= 3.0.0}
BuildRequires: %{python_module whatthepatch >= 1.0.2 with %python-whatthepatch < 2}
@@ -52,9 +53,12 @@
BuildRequires: fdupes
Requires: python-docstring-to-markdown
Requires: python-pluggy >= 1.0.0
-Requires: python-python-lsp-jsonrpc >= 1.0.0
Requires: python-ujson >= 3.0.0
Requires: (python-jedi >= 0.17.2 with python-jedi < 0.20)
+Requires: (python-python-lsp-jsonrpc >= 1.1.0 with python-python-lsp-jsonrpc < 2)
+%if 0%{?python_version_nodots} < 310
+Requires: python-importlib_metadata >= 4.8.3
+%endif
Suggests: python-autopep8 >= 2.0.4
Conflicts: python-autopep8 >= 2.1.0
Suggests: python-pydocstyle >= 6.3.0
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-python-lsp-black for openSUSE:Factory checked in at 2023-11-01 22:10:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-python-lsp-black (Old)
and /work/SRC/openSUSE:Factory/.python-python-lsp-black.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-python-lsp-black"
Wed Nov 1 22:10:18 2023 rev:7 rq:1121657 version:1.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-python-lsp-black/python-python-lsp-black.changes 2023-07-01 23:18:38.314471545 +0200
+++ /work/SRC/openSUSE:Factory/.python-python-lsp-black.new.17445/python-python-lsp-black.changes 2023-11-01 22:11:01.950005719 +0100
@@ -1,0 +2,11 @@
+Wed Nov 1 15:46:08 UTC 2023 - Ben Greiner <code(a)bnavigator.de>
+
+- Revert the last change. The error message was genuine and showed
+ a dependency issue.
+
+-------------------------------------------------------------------
+Wed Nov 1 06:12:25 UTC 2023 - Steve Kowalik <steven.kowalik(a)suse.com>
+
+- Be clear that we require lsp-jsonrpc, because the test suite does.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-python-lsp-black.spec ++++++
--- /var/tmp/diff_new_pack.aFZmxA/_old 2023-11-01 22:11:02.402022464 +0100
+++ /var/tmp/diff_new_pack.aFZmxA/_new 2023-11-01 22:11:02.402022464 +0100
@@ -36,7 +36,7 @@
# /SECTION
BuildRequires: fdupes
Requires: python-black >= 22.3.0
-Requires: python-python-lsp-server
+Requires: python-python-lsp-server >= 1.4
%if 0%{?python_version_nodots} < 311
Requires: python-tomli
%endif
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-django-request for openSUSE:Factory checked in at 2023-11-01 22:10:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-request (Old)
and /work/SRC/openSUSE:Factory/.python-django-request.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-request"
Wed Nov 1 22:10:16 2023 rev:6 rq:1121529 version:1.6.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-django-request/python-django-request.changes 2023-07-12 17:27:52.506720348 +0200
+++ /work/SRC/openSUSE:Factory/.python-django-request.new.17445/python-django-request.changes 2023-11-01 22:11:01.053972526 +0100
@@ -1,0 +2,8 @@
+Wed Nov 1 04:30:55 UTC 2023 - Steve Kowalik <steven.kowalik(a)suse.com>
+
+- Add patch do-not-fail-on-day-one-of-month.patch:
+ * Do not fail due to edge cases on the 1st or last of a month.
+- Switch to pyproject macros.
+- Stop using greedy globs in %files.
+
+-------------------------------------------------------------------
New:
----
do-not-fail-on-day-one-of-month.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-request.spec ++++++
--- /var/tmp/diff_new_pack.7XlUNy/_old 2023-11-01 22:11:01.810000533 +0100
+++ /var/tmp/diff_new_pack.7XlUNy/_new 2023-11-01 22:11:01.814000681 +0100
@@ -26,7 +26,10 @@
Source: https://github.com/django-request/django-request/archive/%{version}.tar.gz#…
# gh#django-request/django-request#241
Patch0: set-timezone-for-day-tests.patch
+Patch1: do-not-fail-on-day-one-of-month.patch
+BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Django >= 2.2
@@ -47,10 +50,10 @@
%autosetup -p1 -n django-request-%{version}
%build
-%python_build
+%pyproject_wheel
%install
-%python_install
+%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
@@ -61,5 +64,6 @@
%files %{python_files}
%doc CHANGELOG.md README.rst
%license LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/request
+%{python_sitelib}/django_request-%{version}.dist-info
++++++ do-not-fail-on-day-one-of-month.patch ++++++
Index: django-request-1.6.3/tests/test_managers.py
===================================================================
--- django-request-1.6.3.orig/tests/test_managers.py
+++ django-request-1.6.3/tests/test_managers.py
@@ -66,6 +66,7 @@ class RequestQuerySetTest(TestCase):
qs = Request.objects.all().year(self.request.time.year + 1)
self.assertEqual(qs.count(), 0)
+ @override_settings(USE_TZ=True, TIME_ZONE='Africa/Nairobi')
def test_month(self):
qs = Request.objects.all().month(year=None, month=None, date=now())
self.assertEqual(qs.count(), 1)
@@ -78,6 +79,7 @@ class RequestQuerySetTest(TestCase):
)
self.assertEqual(qs.count(), 0)
+ @override_settings(USE_TZ=True, TIME_ZONE='Africa/Nairobi')
def test_month_without_date(self):
now_month = now().strftime('%b')
qs = Request.objects.all().month(
@@ -103,7 +105,7 @@ class RequestQuerySetTest(TestCase):
def test_month_is_december(self):
# setUp
- december_time = now().replace(month=12)
+ december_time = now().replace(month=12, day=15)
self.request.time = december_time
self.request.save()
# Test
@@ -112,7 +114,7 @@ class RequestQuerySetTest(TestCase):
def test_month_is_not_december(self):
# setUp
- november_time = now().replace(month=11)
+ november_time = now().replace(month=11, day=15)
self.request.time = november_time
self.request.save()
# Test
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hugo for openSUSE:Factory checked in at 2023-11-01 22:10:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hugo (Old)
and /work/SRC/openSUSE:Factory/.hugo.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hugo"
Wed Nov 1 22:10:14 2023 rev:49 rq:1121528 version:0.120.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/hugo/hugo.changes 2023-10-30 22:12:04.567073753 +0100
+++ /work/SRC/openSUSE:Factory/.hugo.new.17445/hugo.changes 2023-11-01 22:10:57.477840048 +0100
@@ -1,0 +2,7 @@
+Tue Oct 31 19:11:11 UTC 2023 - Jeff Kowalczyk <jkowalczyk(a)suse.com>
+
+- Update to version 0.120.2:
+ * Fix deprecation printing on info level
+ * tpl/tplimpl: Fix deprecation logic in RSS template
+
+-------------------------------------------------------------------
Old:
----
hugo-0.120.1.tar.gz
New:
----
hugo-0.120.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hugo.spec ++++++
--- /var/tmp/diff_new_pack.Y7Bi4U/_old 2023-11-01 22:10:59.881929108 +0100
+++ /var/tmp/diff_new_pack.Y7Bi4U/_new 2023-11-01 22:10:59.897929700 +0100
@@ -17,7 +17,7 @@
Name: hugo
-Version: 0.120.1
+Version: 0.120.2
Release: 0
Summary: Static website generator written in Go
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Y7Bi4U/_old 2023-11-01 22:11:00.177940073 +0100
+++ /var/tmp/diff_new_pack.Y7Bi4U/_new 2023-11-01 22:11:00.213941407 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/gohugoio/hugo.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.120.1</param>
+ <param name="revision">v0.120.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Y7Bi4U/_old 2023-11-01 22:11:00.369947186 +0100
+++ /var/tmp/diff_new_pack.Y7Bi4U/_new 2023-11-01 22:11:00.401948371 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/gohugoio/hugo.git</param>
- <param name="changesrevision">16fb2cae88eb6add7d12e9fbfcf01d8670e60a35</param></service></servicedata>
+ <param name="changesrevision">9c2b2414d231ec1bdaf3e3a030bf148a45c7aa17</param></service></servicedata>
(No newline at EOF)
++++++ hugo-0.120.1.tar.gz -> hugo-0.120.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/hugo/hugo-0.120.1.tar.gz /work/SRC/openSUSE:Factory/.hugo.new.17445/hugo-0.120.2.tar.gz differ: char 12, line 1
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/hugo/vendor.tar.gz /work/SRC/openSUSE:Factory/.hugo.new.17445/vendor.tar.gz differ: char 5, line 1
1
0