pdk 2.2.0 → 2.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 8e2609c042f89068710f065fadda48fe3ae5f32b
4
- data.tar.gz: 40acaf2ef749d5e369387bf345f2ed2cb4588078
2
+ SHA256:
3
+ metadata.gz: 7108ed8889a1ee93bf944b2a35cc1bd527fee723ab8466126e293d621bb033d9
4
+ data.tar.gz: d823aa9385c7f1d0daf86f31a8f338706562aa1df67fe049fa9e393f609d046d
5
5
  SHA512:
6
- metadata.gz: 774972368cefed1e1100d3ddd3804e216cbf13fbebd5b8af63c93862972e4d2339336aa5e0b48ea7ee7b09dd176eb98f2355dc0fc7b270ac92e0e8a1c6eac271
7
- data.tar.gz: e966d37fdcf70b2a90227e3e5eebfc6a611950db8da230930a309f5d57a1a3407c4ee1fb23d1c322c7aaa7b57eaa392b48538ad48991b6de5a8a9e7e2e7550ec
6
+ metadata.gz: 4a65547c79720dfb12c74c7392844d06dc2e094e97c1812459aa8e055ffb865fea41c6304286dae180600f7182a62b96b7ae1ec295d62e6f09fbb7b3872992c7
7
+ data.tar.gz: 6b3fc743d50509f50e672f397f9de2e27c62c6807870f2daa4f21c4ea88536934adf2dadcac10cd83c9aa9348d49434a239602f9917e6b957479241ab00d5e1e
data/CHANGELOG.md CHANGED
@@ -3,6 +3,15 @@
3
3
  All changes to this repo will be documented in this file.
4
4
  See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) for a high-level summary.
5
5
 
6
+
7
+ ## [v2.3.0](https://github.com/puppetlabs/pdk/tree/v2.3.0) (2021-10-21)
8
+
9
+ [Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.2.0...v2.3.0)
10
+
11
+ **Merged pull requests:**
12
+
13
+ - Account for Psych API changes [\#1147](https://github.com/puppetlabs/pdk/pull/1147) ([binford2k](https://github.com/binford2k))
14
+
6
15
  ## [v2.2.0](https://github.com/puppetlabs/pdk/tree/v2.2.0) (2021-08-02)
7
16
 
8
17
  [Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.1.1...v2.2.0)
@@ -15,6 +24,10 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
15
24
 
16
25
  - \(GH-1113\) \(GH-917\) Fix forge-token handling [\#1121](https://github.com/puppetlabs/pdk/pull/1121) ([sanfrancrisko](https://github.com/sanfrancrisko))
17
26
 
27
+ **Merged pull requests:**
28
+
29
+ - \(PDK-1729\) version to 2.2.0.pre2 [\#1106](https://github.com/puppetlabs/pdk/pull/1106) ([da-ar](https://github.com/da-ar))
30
+
18
31
  ## [v2.1.1](https://github.com/puppetlabs/pdk/tree/v2.1.1) (2021-06-22)
19
32
 
20
33
  [Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.1.0...v2.1.1)
@@ -13,7 +13,11 @@ module PDK
13
13
 
14
14
  require 'yaml'
15
15
 
16
- data = ::YAML.safe_load(data, [Symbol], [], true)
16
+ data = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
17
+ ::YAML.safe_load(data, permitted_classes: [Symbol], permitted_symbols: [], aliases: true)
18
+ else
19
+ ::YAML.safe_load(data, [Symbol], [], true)
20
+ end
17
21
  return if data.nil?
18
22
 
19
23
  data.each { |k, v| yield k, PDK::Config::Setting.new(k, self, v) }
data/lib/pdk/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module PDK
2
- VERSION = '2.2.0'.freeze
3
- TEMPLATE_REF = VERSION
2
+ VERSION = '2.3.0'.freeze
3
+ TEMPLATE_REF = '2.3.0'.freeze
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pdk
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet, Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-08-02 00:00:00.000000000 Z
11
+ date: 2021-10-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -443,7 +443,6 @@ files:
443
443
  - lib/pdk/validate/yaml/yaml_syntax_validator.rb
444
444
  - lib/pdk/validate/yaml/yaml_validator_group.rb
445
445
  - lib/pdk/version.rb
446
- - lib/pdk/version.rb.orig
447
446
  - locales/config.yaml
448
447
  - locales/pdk.pot
449
448
  homepage: https://github.com/puppetlabs/pdk
@@ -465,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
465
464
  version: '0'
466
465
  requirements: []
467
466
  rubyforge_project:
468
- rubygems_version: 2.6.14.4
467
+ rubygems_version: 2.7.6.2
469
468
  signing_key:
470
469
  specification_version: 4
471
470
  summary: A key part of the Puppet Development Kit, the shortest path to better modules
@@ -1,9 +0,0 @@
1
- module PDK
2
- <<<<<<< HEAD
3
- VERSION = '2.2.0.pre2'.freeze
4
- TEMPLATE_REF = '2.1.1'.freeze
5
- =======
6
- VERSION = '2.2.0'.freeze
7
- TEMPLATE_REF = VERSION
8
- >>>>>>> 8ef8eb2 ((MAINT) Release prep for 2.2.0)
9
- end