diff --git a/pysol_cards-0.16.0.tar.gz b/pysol_cards-0.16.0.tar.gz deleted file mode 100644 index d16e14e..0000000 --- a/pysol_cards-0.16.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b87ca7b3f99155cccd3cfd739f739f7744d6f8198222c6d493a034a3d4570c3 -size 18987 diff --git a/pysol_cards-0.18.1.tar.gz b/pysol_cards-0.18.1.tar.gz new file mode 100644 index 0000000..bf72dde --- /dev/null +++ b/pysol_cards-0.18.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:103c7c0c319e72e836e099bbb47ff54be729d975e35c11ba74d4ac5e4286b8eb +size 17975 diff --git a/python-pysol-cards-no-six.patch b/python-pysol-cards-no-six.patch deleted file mode 100644 index 00d6877..0000000 --- a/python-pysol-cards-no-six.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: pysol_cards-0.16.0/pysol_cards.egg-info/requires.txt -=================================================================== ---- pysol_cards-0.16.0.orig/pysol_cards.egg-info/requires.txt -+++ pysol_cards-0.16.0/pysol_cards.egg-info/requires.txt -@@ -1,2 +1 @@ - random2 --six -Index: pysol_cards-0.16.0/pysol_cards/deal_game.py -=================================================================== ---- pysol_cards-0.16.0.orig/pysol_cards/deal_game.py -+++ pysol_cards-0.16.0/pysol_cards/deal_game.py -@@ -13,9 +13,6 @@ from pysol_cards.cards import Card - from pysol_cards.cards import createCards - from pysol_cards.random import shuffle - --from six import print_ -- -- - def empty_card(): - ret = Card(0, 0, 0) - ret.empty = True -@@ -170,7 +167,7 @@ class Game(object): - return self.board.calc_string(renderer) - - def print_layout(self, renderer): -- print_(self.calc_layout_string(renderer), sep='', end='') -+ print(self.calc_layout_string(renderer), sep='', end='') - - def new_cards(self, cards): - self.cards = cards -@@ -304,7 +301,7 @@ class Game(object): - def der_katz(game): - is_ds = game.game_id == 'die_schlange' - if is_ds: -- print_('Foundations: H-A S-A D-A C-A H-A S-A D-A C-A') -+ print('Foundations: H-A S-A D-A C-A H-A S-A D-A C-A') - game.board = Board(9) - i = 0 - for c in game: -Index: pysol_cards-0.16.0/requirements.txt -=================================================================== ---- pysol_cards-0.16.0.orig/requirements.txt -+++ pysol_cards-0.16.0/requirements.txt -@@ -1,2 +1 @@ - random2 --six -Index: pysol_cards-0.16.0/setup.py -=================================================================== ---- pysol_cards-0.16.0.orig/setup.py -+++ pysol_cards-0.16.0/setup.py -@@ -29,7 +29,7 @@ setup(name='pysol_cards', - ], - packages=find_packages(exclude=('tests', 'tests.*')), - include_package_data=True, -- install_requires=['random2','six'], -+ install_requires=['random2'], - entry_points={ - 'console_scripts': [ - 'pysol_cards = pysol_cards.__main__:main', diff --git a/python-pysol-cards.changes b/python-pysol-cards.changes index 3af01aa..c94821f 100644 --- a/python-pysol-cards.changes +++ b/python-pysol-cards.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Feb 25 14:04:45 UTC 2025 - John Paul Adrian Glaubitz + +- Update to 0.18.1 + * Update build for/on fedora41 + * Remove entry point +- from version 0.18.0 + * Avoid "id" as a varname, because it clashes with a python built-in name + * Remove remaining Python2 compat layer + * Clean-up pydistman/cookiecutter fluff before PyPI + * Clean-up pydistman/cookiecutter fluff before prepping a PyPI package +- Adjust sed statement to drop shebangs instead of modifying them +- Drop python-pysol-cards-no-six.patch, fixed upstream +- Remove pysol_cards binary from %files section +- Switch package to modern Python Stack on SLE-15 + * Use Python 3.11 on SLE-15 by default + * Drop support for older Python versions + ------------------------------------------------------------------- Thu Nov 28 08:40:26 UTC 2024 - Dirk Müller diff --git a/python-pysol-cards.spec b/python-pysol-cards.spec index 089c11c..24b058e 100644 --- a/python-pysol-cards.spec +++ b/python-pysol-cards.spec @@ -1,7 +1,7 @@ # # spec file for package python-pysol-cards # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2020 Malcolm J Lewis # # All modifications and additions to the file contributed by third parties @@ -17,16 +17,14 @@ # -%define pythons python3 +%{?sle15_python_module_pythons} Name: python-pysol-cards -Version: 0.16.0 +Version: 0.18.1 Release: 0 Summary: Python module for pysol-cards License: Apache-2.0 URL: https://pypi.org/project/pysol-cards/ Source: https://files.pythonhosted.org/packages/source/p/pysol_cards/pysol_cards-%{version}.tar.gz -# https://github.com/shlomif/pysol_cards/issues/6 -Patch0: python-pysol-cards-no-six.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module random2} @@ -45,8 +43,7 @@ Freecell Pro deals. %prep %autosetup -p1 -n pysol_cards-%{version} -# Fix rpm runtime dependency rpmlint error replace the shebang in all the scripts with %%{_bindir}/python3 -find . -name "*.py" -exec sed -i 's|#! %{_bindir}/env python|#!%{_bindir}/python3|' {} ";" +find . -name "*.py" -exec sed -i '/\#\!\ \/usr\/bin\/env\ python/d' {} \; %build export LC_ALL=en_US.utf8 @@ -64,7 +61,6 @@ sed -i '/^addopts/d' setup.cfg %files %{python_files} %doc AUTHORS CHANGELOG.rst README.rst %license LICENSE -%{_bindir}/pysol_cards %{python_sitelib}/pysol_cards %{python_sitelib}/pysol_cards-%{version}.dist-info