Skip to content

Commit

Permalink
Upgrade resolvelib>=0.8.1,<0.9.0
Browse files Browse the repository at this point in the history
Since 2021-09-27 `resolvelib` author comment with "issue resolved now"
(see sarugaku/resolvelib#69 (comment)).

Replace `resolvelib` version upper cap with `resolvelib>=0.8.1,<0.9.0`
with corresponding `find_matches()` and `get_preference()` interface
change should now be good enough.

Signed-off-by: Wong Hoi Sing Edison <[email protected]>
  • Loading branch information
hswong3i committed May 18, 2022
1 parent 185340e commit 8b171d5
Show file tree
Hide file tree
Showing 1,787 changed files with 360,080 additions and 11 deletions.
10 changes: 10 additions & 0 deletions .pybuild/cpython3_3.10/.pydistutils.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[clean]
all=1
[build]
build_lib=/home/hswong3i/Documents/osc/ansible-ansible-2.13.0/.pybuild/cpython3_3.10/build
[install]
force=1
install_layout=deb
install_scripts=$base/bin
install_lib=/usr/lib/python3.10/dist-packages
prefix=/usr
12 changes: 12 additions & 0 deletions debian/.debhelper/generated/ansible-core/installed-by-dh_install
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
debian/tmp/usr/bin/ansible
debian/tmp/usr/bin/ansible-config
debian/tmp/usr/bin/ansible-connection
debian/tmp/usr/bin/ansible-console
debian/tmp/usr/bin/ansible-doc
debian/tmp/usr/bin/ansible-galaxy
debian/tmp/usr/bin/ansible-inventory
debian/tmp/usr/bin/ansible-playbook
debian/tmp/usr/bin/ansible-pull
debian/tmp/usr/bin/ansible-vault
debian/tmp/usr/lib/python3.10/dist-packages/ansible
debian/tmp/usr/lib/python3.10/dist-packages/ansible_core-2.13.0-py3.10.egg-info
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
debian/tmp/usr/bin/ansible-test
debian/tmp/usr/lib/python3.10/dist-packages/ansible_test
Empty file.
1 change: 1 addition & 0 deletions debian/ansible-core.debhelper.log
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dh_auto_install
10 changes: 10 additions & 0 deletions debian/ansible-core.postinst.debhelper
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

# Automatically added by dh_python3
if command -v py3compile >/dev/null 2>&1; then
py3compile -p ansible-core
fi
if command -v pypy3compile >/dev/null 2>&1; then
pypy3compile -p ansible-core || true
fi

# End automatically added section
10 changes: 10 additions & 0 deletions debian/ansible-core.prerm.debhelper
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

# Automatically added by dh_python3
if command -v py3clean >/dev/null 2>&1; then
py3clean -p ansible-core
else
dpkg -L ansible-core | perl -ne 's,/([^/]*)\.py$,/__pycache__/\1.*, or next; unlink $_ or die $! foreach glob($_)'
find /usr/lib/python3/dist-packages/ -type d -name __pycache__ -empty -print0 | xargs --null --no-run-if-empty rmdir
fi

# End automatically added section
3 changes: 3 additions & 0 deletions debian/ansible-core.substvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
python3:Depends=python3-cryptography, python3-jinja2, python3-packaging, python3-resolvelib, python3-yaml, python3:any
misc:Depends=
misc:Pre-Depends=
17 changes: 17 additions & 0 deletions debian/ansible-core/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Package: ansible-core
Source: python-ansible-core
Version: 100:2.13.0-1
Architecture: all
Maintainer: Wong Hoi Sing Edison <[email protected]>
Installed-Size: 5729
Depends: python3-cryptography, python3-jinja2, python3-packaging, python3-resolvelib (>= 0.8.1), python3-yaml, python3:any, libyaml-0-2, python3, python3-jmespath, python3-netaddr
Provides: python3-ansible-core
Section: python
Priority: optional
Homepage: https://github.com/ansible/ansible/tags
Description: Ansible IT Automation
Ansible is a radically simple model-driven configuration management,
multi-node deployment, and remote task execution system. Ansible works
over SSH and does not require any software or daemons to be installed on
remote nodes. Extension modules can be written in any language and are
transferred to managed machines automatically.
567 changes: 567 additions & 0 deletions debian/ansible-core/DEBIAN/md5sums

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions debian/ansible-core/DEBIAN/postinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh
set -e

# Automatically added by dh_python3
if command -v py3compile >/dev/null 2>&1; then
py3compile -p ansible-core
fi
if command -v pypy3compile >/dev/null 2>&1; then
pypy3compile -p ansible-core || true
fi

# End automatically added section
12 changes: 12 additions & 0 deletions debian/ansible-core/DEBIAN/prerm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh
set -e

# Automatically added by dh_python3
if command -v py3clean >/dev/null 2>&1; then
py3clean -p ansible-core
else
dpkg -L ansible-core | perl -ne 's,/([^/]*)\.py$,/__pycache__/\1.*, or next; unlink $_ or die $! foreach glob($_)'
find /usr/lib/python3/dist-packages/ -type d -name __pycache__ -empty -print0 | xargs --null --no-run-if-empty rmdir
fi

# End automatically added section
33 changes: 33 additions & 0 deletions debian/ansible-core/usr/bin/ansible
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-core==2.13.0','console_scripts','ansible'
import re
import sys

# for compatibility with easy_install; see #2198
__requires__ = 'ansible-core==2.13.0'

try:
from importlib.metadata import distribution
except ImportError:
try:
from importlib_metadata import distribution
except ImportError:
from pkg_resources import load_entry_point


def importlib_load_entry_point(spec, group, name):
dist_name, _, _ = spec.partition('==')
matches = (
entry_point
for entry_point in distribution(dist_name).entry_points
if entry_point.group == group and entry_point.name == name
)
return next(matches).load()


globals().setdefault('load_entry_point', importlib_load_entry_point)


if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit(load_entry_point('ansible-core==2.13.0', 'console_scripts', 'ansible')())
33 changes: 33 additions & 0 deletions debian/ansible-core/usr/bin/ansible-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-core==2.13.0','console_scripts','ansible-config'
import re
import sys

# for compatibility with easy_install; see #2198
__requires__ = 'ansible-core==2.13.0'

try:
from importlib.metadata import distribution
except ImportError:
try:
from importlib_metadata import distribution
except ImportError:
from pkg_resources import load_entry_point


def importlib_load_entry_point(spec, group, name):
dist_name, _, _ = spec.partition('==')
matches = (
entry_point
for entry_point in distribution(dist_name).entry_points
if entry_point.group == group and entry_point.name == name
)
return next(matches).load()


globals().setdefault('load_entry_point', importlib_load_entry_point)


if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit(load_entry_point('ansible-core==2.13.0', 'console_scripts', 'ansible-config')())
33 changes: 33 additions & 0 deletions debian/ansible-core/usr/bin/ansible-connection
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-core==2.13.0','console_scripts','ansible-connection'
import re
import sys

# for compatibility with easy_install; see #2198
__requires__ = 'ansible-core==2.13.0'

try:
from importlib.metadata import distribution
except ImportError:
try:
from importlib_metadata import distribution
except ImportError:
from pkg_resources import load_entry_point


def importlib_load_entry_point(spec, group, name):
dist_name, _, _ = spec.partition('==')
matches = (
entry_point
for entry_point in distribution(dist_name).entry_points
if entry_point.group == group and entry_point.name == name
)
return next(matches).load()


globals().setdefault('load_entry_point', importlib_load_entry_point)


if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit(load_entry_point('ansible-core==2.13.0', 'console_scripts', 'ansible-connection')())
33 changes: 33 additions & 0 deletions debian/ansible-core/usr/bin/ansible-console
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-core==2.13.0','console_scripts','ansible-console'
import re
import sys

# for compatibility with easy_install; see #2198
__requires__ = 'ansible-core==2.13.0'

try:
from importlib.metadata import distribution
except ImportError:
try:
from importlib_metadata import distribution
except ImportError:
from pkg_resources import load_entry_point


def importlib_load_entry_point(spec, group, name):
dist_name, _, _ = spec.partition('==')
matches = (
entry_point
for entry_point in distribution(dist_name).entry_points
if entry_point.group == group and entry_point.name == name
)
return next(matches).load()


globals().setdefault('load_entry_point', importlib_load_entry_point)


if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit(load_entry_point('ansible-core==2.13.0', 'console_scripts', 'ansible-console')())
33 changes: 33 additions & 0 deletions debian/ansible-core/usr/bin/ansible-doc
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-core==2.13.0','console_scripts','ansible-doc'
import re
import sys

# for compatibility with easy_install; see #2198
__requires__ = 'ansible-core==2.13.0'

try:
from importlib.metadata import distribution
except ImportError:
try:
from importlib_metadata import distribution
except ImportError:
from pkg_resources import load_entry_point


def importlib_load_entry_point(spec, group, name):
dist_name, _, _ = spec.partition('==')
matches = (
entry_point
for entry_point in distribution(dist_name).entry_points
if entry_point.group == group and entry_point.name == name
)
return next(matches).load()


globals().setdefault('load_entry_point', importlib_load_entry_point)


if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit(load_entry_point('ansible-core==2.13.0', 'console_scripts', 'ansible-doc')())
33 changes: 33 additions & 0 deletions debian/ansible-core/usr/bin/ansible-galaxy
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-core==2.13.0','console_scripts','ansible-galaxy'
import re
import sys

# for compatibility with easy_install; see #2198
__requires__ = 'ansible-core==2.13.0'

try:
from importlib.metadata import distribution
except ImportError:
try:
from importlib_metadata import distribution
except ImportError:
from pkg_resources import load_entry_point


def importlib_load_entry_point(spec, group, name):
dist_name, _, _ = spec.partition('==')
matches = (
entry_point
for entry_point in distribution(dist_name).entry_points
if entry_point.group == group and entry_point.name == name
)
return next(matches).load()


globals().setdefault('load_entry_point', importlib_load_entry_point)


if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit(load_entry_point('ansible-core==2.13.0', 'console_scripts', 'ansible-galaxy')())
33 changes: 33 additions & 0 deletions debian/ansible-core/usr/bin/ansible-inventory
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-core==2.13.0','console_scripts','ansible-inventory'
import re
import sys

# for compatibility with easy_install; see #2198
__requires__ = 'ansible-core==2.13.0'

try:
from importlib.metadata import distribution
except ImportError:
try:
from importlib_metadata import distribution
except ImportError:
from pkg_resources import load_entry_point


def importlib_load_entry_point(spec, group, name):
dist_name, _, _ = spec.partition('==')
matches = (
entry_point
for entry_point in distribution(dist_name).entry_points
if entry_point.group == group and entry_point.name == name
)
return next(matches).load()


globals().setdefault('load_entry_point', importlib_load_entry_point)


if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit(load_entry_point('ansible-core==2.13.0', 'console_scripts', 'ansible-inventory')())
33 changes: 33 additions & 0 deletions debian/ansible-core/usr/bin/ansible-playbook
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/python3
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-core==2.13.0','console_scripts','ansible-playbook'
import re
import sys

# for compatibility with easy_install; see #2198
__requires__ = 'ansible-core==2.13.0'

try:
from importlib.metadata import distribution
except ImportError:
try:
from importlib_metadata import distribution
except ImportError:
from pkg_resources import load_entry_point


def importlib_load_entry_point(spec, group, name):
dist_name, _, _ = spec.partition('==')
matches = (
entry_point
for entry_point in distribution(dist_name).entry_points
if entry_point.group == group and entry_point.name == name
)
return next(matches).load()


globals().setdefault('load_entry_point', importlib_load_entry_point)


if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
sys.exit(load_entry_point('ansible-core==2.13.0', 'console_scripts', 'ansible-playbook')())
Loading

0 comments on commit 8b171d5

Please sign in to comment.