* Re: [PR PATCH] [Updated] ansible: update to 3.4.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
@ 2021-05-18 22:54 ` dstolfa
2021-05-18 23:05 ` [PR PATCH] [Updated] ansible: update to 4.0.0 dstolfa
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dstolfa @ 2021-05-18 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
There is an updated pull request by dstolfa against master on the void-packages repository
https://github.com/dstolfa/void-packages ansible-dev
https://github.com/void-linux/void-packages/pull/30968
ansible: update to 3.4.0
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/30968.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-dev-30968.patch --]
[-- Type: text/x-diff, Size: 4338 bytes --]
From 32b1c0e812cf31916b70954e88fdfc6c5766f3a6 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Tue, 18 May 2021 16:34:37 +0100
Subject: [PATCH] ansible: update to 4.0.0
With the update of ansible to 4.0.0, ansible-base has been deprecated
and ansible-core is the new name of its dependency [1]. This commit
makes the following changes outside of ansible:
ansible-base is now a transitional package that depends on ansible-core.
ansible-core is what ansible-base used to be (for the most part) with
names changed where necessary.
In order to minimize the chance of users getting into a broken state,
this was all done as a single commit rather than separate ones.
[1]: https://www.ansible.com/blog/ansible-3.0.0-qa
---
srcpkgs/ansible-base/template | 25 +++----------------
srcpkgs/ansible-core/template | 24 ++++++++++++++++++
srcpkgs/{ansible-base => ansible-core}/update | 0
srcpkgs/ansible/template | 6 ++---
4 files changed, 30 insertions(+), 25 deletions(-)
create mode 100644 srcpkgs/ansible-core/template
rename srcpkgs/{ansible-base => ansible-core}/update (100%)
diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-base/template
index 177f378e146d..1c073b68b428 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-base/template
@@ -1,24 +1,5 @@
# Template file for 'ansible-base'
+# This is a transitional package for ansible-core. Since ansible 4.0.0,
+# ansible-base was deprecated in favor of ansible-core.
pkgname=ansible-base
-version=2.10.9
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging"
-short_desc="Simple deployment, configuration management and execution framework"
-maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
-license="GPL-3.0-or-later"
-homepage="https://www.ansible.com/"
-distfiles="${PYPI_SITE}/a/ansible-base/ansible-base-${version}.tar.gz"
-checksum=04635d3e08fc29358c76b8e7f1e9db0ce443fb09ce30b2acc6cacaad165f2151
-conflicts="ansible<2.10.1_1"
-make_check=no
-
-post_install() {
- vsconf examples/ansible.cfg
- vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
-}
+depends="ansible-core"
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
new file mode 100644
index 000000000000..34cf7cbe57a3
--- /dev/null
+++ b/srcpkgs/ansible-core/template
@@ -0,0 +1,24 @@
+# Template file for 'ansible-core'
+pkgname=ansible-core
+version=2.11.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
+ python3-yaml python3-packaging"
+short_desc="Simple deployment, configuration management and execution framework"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://www.ansible.com/"
+distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
+checksum=9470ceb710711eacd75f1bcae802af036ab2a6c2cd5a13bfcb50b2d89667c9c5
+conflicts="ansible<4.0.0"
+make_check=no
+
+post_install() {
+ vsconf examples/ansible.cfg
+ vsconf examples/hosts
+ for m in docs/man/man1/*.1; do
+ vman ${m}
+ done
+}
diff --git a/srcpkgs/ansible-base/update b/srcpkgs/ansible-core/update
similarity index 100%
rename from srcpkgs/ansible-base/update
rename to srcpkgs/ansible-core/update
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 143f1e3f6ea4..d7c2047fcafc 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,14 +1,14 @@
# Template file for 'ansible'
pkgname=ansible
-version=3.3.0
+version=4.0.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 ansible-base"
+depends="python3 ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=2de5385c48a2a24a19f6cbaccc7d7684c64b6194f9a9b175aba7949d53b07bc9
+checksum=6f67ca5c634e4721d1f8e206dc71d60d1a114d147945355bfc902bd37eb07080
make_check=no
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
2021-05-18 22:54 ` [PR PATCH] [Updated] " dstolfa
@ 2021-05-18 23:05 ` dstolfa
2021-05-18 23:15 ` dstolfa
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dstolfa @ 2021-05-18 23:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
There is an updated pull request by dstolfa against master on the void-packages repository
https://github.com/dstolfa/void-packages ansible-dev
https://github.com/void-linux/void-packages/pull/30968
ansible: update to 4.0.0
With the major version update of ansible to 4.0.0, ansible-base has been renamed to ansible-core. This pull request addresses the changes necessary to update ansible to 4.0.0.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/30968.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-dev-30968.patch --]
[-- Type: text/x-diff, Size: 4353 bytes --]
From 58e20bfd4e790b1b3b5426cc9fd710fbbb7aedb7 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Tue, 18 May 2021 16:34:37 +0100
Subject: [PATCH] ansible: update to 4.0.0
With the update of ansible to 4.0.0, ansible-base has been deprecated
and ansible-core is the new name of its dependency [1]. This commit
makes the following changes outside of ansible:
ansible-base is now a transitional package that depends on ansible-core.
ansible-core is what ansible-base used to be (for the most part) with
names changed where necessary.
In order to minimize the chance of users getting into a broken state,
this was all done as a single commit rather than separate ones.
[1]: https://www.ansible.com/blog/ansible-3.0.0-qa
---
srcpkgs/ansible-base/template | 21 ++++------------
srcpkgs/ansible-core/template | 24 +++++++++++++++++++
srcpkgs/{ansible-base => ansible-core}/update | 0
srcpkgs/ansible/template | 6 ++---
4 files changed, 31 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/ansible-core/template
rename srcpkgs/{ansible-base => ansible-core}/update (100%)
diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-base/template
index 177f378e146d..4bad4162624b 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-base/template
@@ -1,24 +1,11 @@
# Template file for 'ansible-base'
+# This is a transitional package for ansible-core. Since ansible 4.0.0,
+# ansible-base was deprecated in favor of ansible-core.
pkgname=ansible-base
-version=2.10.9
+version=2.11.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging"
+depends="ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
-distfiles="${PYPI_SITE}/a/ansible-base/ansible-base-${version}.tar.gz"
-checksum=04635d3e08fc29358c76b8e7f1e9db0ce443fb09ce30b2acc6cacaad165f2151
-conflicts="ansible<2.10.1_1"
-make_check=no
-
-post_install() {
- vsconf examples/ansible.cfg
- vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
-}
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
new file mode 100644
index 000000000000..34cf7cbe57a3
--- /dev/null
+++ b/srcpkgs/ansible-core/template
@@ -0,0 +1,24 @@
+# Template file for 'ansible-core'
+pkgname=ansible-core
+version=2.11.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
+ python3-yaml python3-packaging"
+short_desc="Simple deployment, configuration management and execution framework"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://www.ansible.com/"
+distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
+checksum=9470ceb710711eacd75f1bcae802af036ab2a6c2cd5a13bfcb50b2d89667c9c5
+conflicts="ansible<4.0.0"
+make_check=no
+
+post_install() {
+ vsconf examples/ansible.cfg
+ vsconf examples/hosts
+ for m in docs/man/man1/*.1; do
+ vman ${m}
+ done
+}
diff --git a/srcpkgs/ansible-base/update b/srcpkgs/ansible-core/update
similarity index 100%
rename from srcpkgs/ansible-base/update
rename to srcpkgs/ansible-core/update
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 143f1e3f6ea4..d7c2047fcafc 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,14 +1,14 @@
# Template file for 'ansible'
pkgname=ansible
-version=3.3.0
+version=4.0.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 ansible-base"
+depends="python3 ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=2de5385c48a2a24a19f6cbaccc7d7684c64b6194f9a9b175aba7949d53b07bc9
+checksum=6f67ca5c634e4721d1f8e206dc71d60d1a114d147945355bfc902bd37eb07080
make_check=no
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
2021-05-18 22:54 ` [PR PATCH] [Updated] " dstolfa
2021-05-18 23:05 ` [PR PATCH] [Updated] ansible: update to 4.0.0 dstolfa
@ 2021-05-18 23:15 ` dstolfa
2021-05-20 15:12 ` ahesford
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dstolfa @ 2021-05-18 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
There is an updated pull request by dstolfa against master on the void-packages repository
https://github.com/dstolfa/void-packages ansible-dev
https://github.com/void-linux/void-packages/pull/30968
ansible: update to 4.0.0
With the major version update of ansible to 4.0.0, ansible-base has been renamed to ansible-core. This pull request addresses the changes necessary to update ansible to 4.0.0.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/30968.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-dev-30968.patch --]
[-- Type: text/x-diff, Size: 4372 bytes --]
From 762ad3928c119f33244f2ce34dcded4604e6d667 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Tue, 18 May 2021 16:34:37 +0100
Subject: [PATCH] ansible: update to 4.0.0
With the update of ansible to 4.0.0, ansible-base has been deprecated
and ansible-core is the new name of its dependency [1]. This commit
makes the following changes outside of ansible:
ansible-base is now a transitional package that depends on ansible-core.
ansible-core is what ansible-base used to be (for the most part) with
names changed where necessary.
In order to minimize the chance of users getting into a broken state,
this was all done as a single commit rather than separate ones.
[1]: https://www.ansible.com/blog/ansible-3.0.0-qa
---
srcpkgs/ansible-base/template | 22 ++++-------------
srcpkgs/ansible-core/template | 24 +++++++++++++++++++
srcpkgs/{ansible-base => ansible-core}/update | 0
srcpkgs/ansible/template | 6 ++---
4 files changed, 32 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/ansible-core/template
rename srcpkgs/{ansible-base => ansible-core}/update (100%)
diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-base/template
index 177f378e146d..20e33a705cb6 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-base/template
@@ -1,24 +1,12 @@
# Template file for 'ansible-base'
+# This is a transitional package for ansible-core. Since ansible 4.0.0,
+# ansible-base was deprecated in favor of ansible-core.
pkgname=ansible-base
-version=2.10.9
+version=2.11.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging"
+build_style=meta
+depends="ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
-distfiles="${PYPI_SITE}/a/ansible-base/ansible-base-${version}.tar.gz"
-checksum=04635d3e08fc29358c76b8e7f1e9db0ce443fb09ce30b2acc6cacaad165f2151
-conflicts="ansible<2.10.1_1"
-make_check=no
-
-post_install() {
- vsconf examples/ansible.cfg
- vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
-}
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
new file mode 100644
index 000000000000..34cf7cbe57a3
--- /dev/null
+++ b/srcpkgs/ansible-core/template
@@ -0,0 +1,24 @@
+# Template file for 'ansible-core'
+pkgname=ansible-core
+version=2.11.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
+ python3-yaml python3-packaging"
+short_desc="Simple deployment, configuration management and execution framework"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://www.ansible.com/"
+distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
+checksum=9470ceb710711eacd75f1bcae802af036ab2a6c2cd5a13bfcb50b2d89667c9c5
+conflicts="ansible<4.0.0"
+make_check=no
+
+post_install() {
+ vsconf examples/ansible.cfg
+ vsconf examples/hosts
+ for m in docs/man/man1/*.1; do
+ vman ${m}
+ done
+}
diff --git a/srcpkgs/ansible-base/update b/srcpkgs/ansible-core/update
similarity index 100%
rename from srcpkgs/ansible-base/update
rename to srcpkgs/ansible-core/update
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 143f1e3f6ea4..d7c2047fcafc 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,14 +1,14 @@
# Template file for 'ansible'
pkgname=ansible
-version=3.3.0
+version=4.0.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 ansible-base"
+depends="python3 ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=2de5385c48a2a24a19f6cbaccc7d7684c64b6194f9a9b175aba7949d53b07bc9
+checksum=6f67ca5c634e4721d1f8e206dc71d60d1a114d147945355bfc902bd37eb07080
make_check=no
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (2 preceding siblings ...)
2021-05-18 23:15 ` dstolfa
@ 2021-05-20 15:12 ` ahesford
2021-05-20 15:13 ` ahesford
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2021-05-20 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/30968#issuecomment-845208757
Comment:
You should move the transitional package into the new `ansible-core` as a subpackage.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (3 preceding siblings ...)
2021-05-20 15:12 ` ahesford
@ 2021-05-20 15:13 ` ahesford
2021-05-20 16:07 ` [PR PATCH] [Updated] " dstolfa
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2021-05-20 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/30968#issuecomment-845209219
Comment:
Also, ping @jcgruenhage
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (4 preceding siblings ...)
2021-05-20 15:13 ` ahesford
@ 2021-05-20 16:07 ` dstolfa
2021-05-20 16:11 ` dstolfa
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dstolfa @ 2021-05-20 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
There is an updated pull request by dstolfa against master on the void-packages repository
https://github.com/dstolfa/void-packages ansible-dev
https://github.com/void-linux/void-packages/pull/30968
ansible: update to 4.0.0
With the major version update of ansible to 4.0.0, ansible-base has been renamed to ansible-core. This pull request addresses the changes necessary to update ansible to 4.0.0.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/30968.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-dev-30968.patch --]
[-- Type: text/x-diff, Size: 3690 bytes --]
From 1d735a3ff291389b865b363c59d36adbd8c099f6 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Tue, 18 May 2021 16:34:37 +0100
Subject: [PATCH] ansible: update to 4.0.0
With the update of ansible to 4.0.0, ansible-base has been deprecated
and ansible-core is the new name of its dependency [1]. This commit
makes the following changes outside of ansible:
ansible-base is now a transitional package that depends on ansible-core.
ansible-core is what ansible-base used to be (for the most part) with
names changed where necessary.
In order to minimize the chance of users getting into a broken state,
this was all done as a single commit rather than separate ones.
[1]: https://www.ansible.com/blog/ansible-3.0.0-qa
---
srcpkgs/ansible-base | 1 +
srcpkgs/{ansible-base => ansible-core}/template | 16 ++++++++++------
srcpkgs/{ansible-base => ansible-core}/update | 0
srcpkgs/ansible/template | 6 +++---
4 files changed, 14 insertions(+), 9 deletions(-)
create mode 120000 srcpkgs/ansible-base
rename srcpkgs/{ansible-base => ansible-core}/template (65%)
rename srcpkgs/{ansible-base => ansible-core}/update (100%)
diff --git a/srcpkgs/ansible-base b/srcpkgs/ansible-base
new file mode 120000
index 000000000000..33cb068f87ef
--- /dev/null
+++ b/srcpkgs/ansible-base
@@ -0,0 +1 @@
+ansible-core
\ No newline at end of file
diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-core/template
similarity index 65%
rename from srcpkgs/ansible-base/template
rename to srcpkgs/ansible-core/template
index 177f378e146d..d6c9535fdda0 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
-# Template file for 'ansible-base'
-pkgname=ansible-base
-version=2.10.9
+# Template file for 'ansible-core'
+pkgname=ansible-core
+version=2.11.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -10,9 +10,9 @@ short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
-distfiles="${PYPI_SITE}/a/ansible-base/ansible-base-${version}.tar.gz"
-checksum=04635d3e08fc29358c76b8e7f1e9db0ce443fb09ce30b2acc6cacaad165f2151
-conflicts="ansible<2.10.1_1"
+distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
+checksum=9470ceb710711eacd75f1bcae802af036ab2a6c2cd5a13bfcb50b2d89667c9c5
+conflicts="ansible<4.0.0"
make_check=no
post_install() {
@@ -22,3 +22,7 @@ post_install() {
vman ${m}
done
}
+
+ansible-base_package() {
+ depends="ansible-core"
+}
diff --git a/srcpkgs/ansible-base/update b/srcpkgs/ansible-core/update
similarity index 100%
rename from srcpkgs/ansible-base/update
rename to srcpkgs/ansible-core/update
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 143f1e3f6ea4..d7c2047fcafc 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,14 +1,14 @@
# Template file for 'ansible'
pkgname=ansible
-version=3.3.0
+version=4.0.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 ansible-base"
+depends="python3 ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=2de5385c48a2a24a19f6cbaccc7d7684c64b6194f9a9b175aba7949d53b07bc9
+checksum=6f67ca5c634e4721d1f8e206dc71d60d1a114d147945355bfc902bd37eb07080
make_check=no
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (5 preceding siblings ...)
2021-05-20 16:07 ` [PR PATCH] [Updated] " dstolfa
@ 2021-05-20 16:11 ` dstolfa
2021-05-20 16:28 ` dstolfa
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dstolfa @ 2021-05-20 16:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
There is an updated pull request by dstolfa against master on the void-packages repository
https://github.com/dstolfa/void-packages ansible-dev
https://github.com/void-linux/void-packages/pull/30968
ansible: update to 4.0.0
With the major version update of ansible to 4.0.0, ansible-base has been renamed to ansible-core. This pull request addresses the changes necessary to update ansible to 4.0.0.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/30968.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-dev-30968.patch --]
[-- Type: text/x-diff, Size: 3734 bytes --]
From 52ff099022177ca2b6e89630e68fb016955a276c Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Tue, 18 May 2021 16:34:37 +0100
Subject: [PATCH] ansible: update to 4.0.0
With the update of ansible to 4.0.0, ansible-base has been deprecated
and ansible-core is the new name of its dependency [1]. This commit
makes the following changes outside of ansible:
ansible-base is now a transitional package that depends on ansible-core.
ansible-core is what ansible-base used to be (for the most part) with
names changed where necessary.
In order to minimize the chance of users getting into a broken state,
this was all done as a single commit rather than separate ones.
[1]: https://www.ansible.com/blog/ansible-3.0.0-qa
---
srcpkgs/ansible-base | 1 +
srcpkgs/{ansible-base => ansible-core}/template | 17 +++++++++++------
srcpkgs/{ansible-base => ansible-core}/update | 0
srcpkgs/ansible/template | 6 +++---
4 files changed, 15 insertions(+), 9 deletions(-)
create mode 120000 srcpkgs/ansible-base
rename srcpkgs/{ansible-base => ansible-core}/template (62%)
rename srcpkgs/{ansible-base => ansible-core}/update (100%)
diff --git a/srcpkgs/ansible-base b/srcpkgs/ansible-base
new file mode 120000
index 000000000000..33cb068f87ef
--- /dev/null
+++ b/srcpkgs/ansible-base
@@ -0,0 +1 @@
+ansible-core
\ No newline at end of file
diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-core/template
similarity index 62%
rename from srcpkgs/ansible-base/template
rename to srcpkgs/ansible-core/template
index 177f378e146d..e8343e28f0a1 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
-# Template file for 'ansible-base'
-pkgname=ansible-base
-version=2.10.9
+# Template file for 'ansible-core'
+pkgname=ansible-core
+version=2.11.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -10,9 +10,9 @@ short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
-distfiles="${PYPI_SITE}/a/ansible-base/ansible-base-${version}.tar.gz"
-checksum=04635d3e08fc29358c76b8e7f1e9db0ce443fb09ce30b2acc6cacaad165f2151
-conflicts="ansible<2.10.1_1"
+distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
+checksum=9470ceb710711eacd75f1bcae802af036ab2a6c2cd5a13bfcb50b2d89667c9c5
+conflicts="ansible<4.0.0"
make_check=no
post_install() {
@@ -22,3 +22,8 @@ post_install() {
vman ${m}
done
}
+
+ansible-base_package() {
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/ansible-base/update b/srcpkgs/ansible-core/update
similarity index 100%
rename from srcpkgs/ansible-base/update
rename to srcpkgs/ansible-core/update
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 143f1e3f6ea4..d7c2047fcafc 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,14 +1,14 @@
# Template file for 'ansible'
pkgname=ansible
-version=3.3.0
+version=4.0.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 ansible-base"
+depends="python3 ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=2de5385c48a2a24a19f6cbaccc7d7684c64b6194f9a9b175aba7949d53b07bc9
+checksum=6f67ca5c634e4721d1f8e206dc71d60d1a114d147945355bfc902bd37eb07080
make_check=no
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (6 preceding siblings ...)
2021-05-20 16:11 ` dstolfa
@ 2021-05-20 16:28 ` dstolfa
2021-05-21 0:53 ` jcgruenhage
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dstolfa @ 2021-05-20 16:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
New comment by dstolfa on void-packages repository
https://github.com/void-linux/void-packages/pull/30968#issuecomment-845269409
Comment:
@ahesford After local testing, I believe that it behaves correctly as a subpackage now and that upgrades followed by removal of `ansible-base` shouldn't break `ansible` installations.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (7 preceding siblings ...)
2021-05-20 16:28 ` dstolfa
@ 2021-05-21 0:53 ` jcgruenhage
2021-05-21 11:58 ` [PR PATCH] [Updated] " dstolfa
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: jcgruenhage @ 2021-05-21 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/30968#issuecomment-845577012
Comment:
I've built this locally and tested the changes, it seems that it all works as expected.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (8 preceding siblings ...)
2021-05-21 0:53 ` jcgruenhage
@ 2021-05-21 11:58 ` dstolfa
2021-05-21 13:54 ` ericonr
2021-05-21 13:54 ` [PR PATCH] [Closed]: " ericonr
11 siblings, 0 replies; 13+ messages in thread
From: dstolfa @ 2021-05-21 11:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
There is an updated pull request by dstolfa against master on the void-packages repository
https://github.com/dstolfa/void-packages ansible-dev
https://github.com/void-linux/void-packages/pull/30968
ansible: update to 4.0.0
With the major version update of ansible to 4.0.0, ansible-base has been renamed to ansible-core. This pull request addresses the changes necessary to update ansible to 4.0.0.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/30968.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-dev-30968.patch --]
[-- Type: text/x-diff, Size: 3786 bytes --]
From 7925813afdd7e74ea9e3351a0681b7804bf01802 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Tue, 18 May 2021 16:34:37 +0100
Subject: [PATCH] ansible: update to 4.0.0
With the update of ansible to 4.0.0, ansible-base has been deprecated
and ansible-core is the new name of its dependency [1]. This commit
makes the following changes outside of ansible:
ansible-base is now a transitional package that depends on ansible-core.
ansible-core is what ansible-base used to be (for the most part) with
names changed where necessary.
In order to minimize the chance of users getting into a broken state,
this was all done as a single commit rather than separate ones.
[1]: https://www.ansible.com/blog/ansible-3.0.0-qa
---
srcpkgs/ansible-base | 1 +
srcpkgs/{ansible-base => ansible-core}/template | 17 ++++++++++++-----
srcpkgs/{ansible-base => ansible-core}/update | 0
srcpkgs/ansible/template | 6 +++---
4 files changed, 16 insertions(+), 8 deletions(-)
create mode 120000 srcpkgs/ansible-base
rename srcpkgs/{ansible-base => ansible-core}/template (60%)
rename srcpkgs/{ansible-base => ansible-core}/update (100%)
diff --git a/srcpkgs/ansible-base b/srcpkgs/ansible-base
new file mode 120000
index 000000000000..33cb068f87ef
--- /dev/null
+++ b/srcpkgs/ansible-base
@@ -0,0 +1 @@
+ansible-core
\ No newline at end of file
diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-core/template
similarity index 60%
rename from srcpkgs/ansible-base/template
rename to srcpkgs/ansible-core/template
index 177f378e146d..a1d1b965003a 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
-# Template file for 'ansible-base'
-pkgname=ansible-base
-version=2.10.9
+# Template file for 'ansible-core'
+pkgname=ansible-core
+version=2.11.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -10,9 +10,10 @@ short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
-distfiles="${PYPI_SITE}/a/ansible-base/ansible-base-${version}.tar.gz"
-checksum=04635d3e08fc29358c76b8e7f1e9db0ce443fb09ce30b2acc6cacaad165f2151
+distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
+checksum=9470ceb710711eacd75f1bcae802af036ab2a6c2cd5a13bfcb50b2d89667c9c5
conflicts="ansible<2.10.1_1"
+replaces="ansible-base<2.11.0"
make_check=no
post_install() {
@@ -22,3 +23,9 @@ post_install() {
vman ${m}
done
}
+
+ansible-base_package() {
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/ansible-base/update b/srcpkgs/ansible-core/update
similarity index 100%
rename from srcpkgs/ansible-base/update
rename to srcpkgs/ansible-core/update
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 143f1e3f6ea4..d7c2047fcafc 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,14 +1,14 @@
# Template file for 'ansible'
pkgname=ansible
-version=3.3.0
+version=4.0.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 ansible-base"
+depends="python3 ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=2de5385c48a2a24a19f6cbaccc7d7684c64b6194f9a9b175aba7949d53b07bc9
+checksum=6f67ca5c634e4721d1f8e206dc71d60d1a114d147945355bfc902bd37eb07080
make_check=no
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (9 preceding siblings ...)
2021-05-21 11:58 ` [PR PATCH] [Updated] " dstolfa
@ 2021-05-21 13:54 ` ericonr
2021-05-21 13:54 ` [PR PATCH] [Closed]: " ericonr
11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-05-21 13:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30968#issuecomment-845966933
Comment:
There was a typo in the commit, so closing PR manually.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Closed]: ansible: update to 4.0.0
2021-05-18 15:36 [PR PATCH] ansible: update to 3.4.0 dstolfa
` (10 preceding siblings ...)
2021-05-21 13:54 ` ericonr
@ 2021-05-21 13:54 ` ericonr
11 siblings, 0 replies; 13+ messages in thread
From: ericonr @ 2021-05-21 13:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
There's a closed pull request on the void-packages repository
ansible: update to 4.0.0
https://github.com/void-linux/void-packages/pull/30968
Description:
With the major version update of ansible to 4.0.0, ansible-base has been renamed to ansible-core. This pull request addresses the changes necessary to update ansible to 4.0.0.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
^ permalink raw reply [flat|nested] 13+ messages in thread