PySSTV 0.5.9__tar.gz → 0.5.10__tar.gz

{pysstv-0.5.9 → pysstv-0.5.10}/PKG-INFO

@@ -1,17 +1,19 @@
 Metadata-Version: 2.4
 Name: pySSTV
-Version: 0.5.9
+Version: 0.5.10
 Summary: Python classes for generating Slow-scan Television transmissions
-Home-page: https://github.com/dnet/pySSTV
-Author: András Veres-Szentkirályi
-Author-email: vsza@vsza.hu
-Requires-Python: >=3.10
+Author-email: András Veres-Szentkirályi <vsza@vsza.hu>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/dnet/pySSTV
+Keywords: HAM,SSTV,slow-scan,television,Scottie,Martin,Robot,Pasokon
+Classifier: Development Status :: 4 - Beta
+Classifier: Topic :: Communications :: Ham Radio
+Classifier: Topic :: Multimedia :: Video :: Conversion
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pillow==12.3.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: home-page
+Requires-Dist: pillow==13.0.0
 Dynamic: license-file
 
 SSTV generator in pure Python
@@ -98,5 +100,5 @@ Useful links
 Dependencies
 ------------
 
- - Python 3.5 or later
+ - Python 3.11 or later
  - Python Imaging Library (Debian/Ubuntu package: `python3-pil`)

{pysstv-0.5.9 → pysstv-0.5.10}/PySSTV.egg-info/PKG-INFO

@@ -1,17 +1,19 @@
 Metadata-Version: 2.4
 Name: pySSTV
-Version: 0.5.9
+Version: 0.5.10
 Summary: Python classes for generating Slow-scan Television transmissions
-Home-page: https://github.com/dnet/pySSTV
-Author: András Veres-Szentkirályi
-Author-email: vsza@vsza.hu
-Requires-Python: >=3.10
+Author-email: András Veres-Szentkirályi <vsza@vsza.hu>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/dnet/pySSTV
+Keywords: HAM,SSTV,slow-scan,television,Scottie,Martin,Robot,Pasokon
+Classifier: Development Status :: 4 - Beta
+Classifier: Topic :: Communications :: Ham Radio
+Classifier: Topic :: Multimedia :: Video :: Conversion
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pillow==12.3.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: home-page
+Requires-Dist: pillow==13.0.0
 Dynamic: license-file
 
 SSTV generator in pure Python
@@ -98,5 +100,5 @@ Useful links
 Dependencies
 ------------
 
- - Python 3.5 or later
+ - Python 3.11 or later
  - Python Imaging Library (Debian/Ubuntu package: `python3-pil`)

{pysstv-0.5.9 → pysstv-0.5.10}/PySSTV.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@ LICENSE.txt
 MANIFEST.in
 README.md
 pyproject.toml
-setup.py
 PySSTV.egg-info/PKG-INFO
 PySSTV.egg-info/SOURCES.txt
 PySSTV.egg-info/dependency_links.txt
@@ -11,6 +10,7 @@ PySSTV.egg-info/top_level.txt
 pySSTV.egg-info/PKG-INFO
 pySSTV.egg-info/SOURCES.txt
 pySSTV.egg-info/dependency_links.txt
+pySSTV.egg-info/entry_points.txt
 pySSTV.egg-info/requires.txt
 pySSTV.egg-info/top_level.txt
 pysstv/__init__.py

pysstv-0.5.10/PySSTV.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+pysstv = pysstv.__main__:main

pysstv-0.5.10/PySSTV.egg-info/requires.txt

@@ -0,0 +1 @@
+pillow==13.0.0

{pysstv-0.5.9 → pysstv-0.5.10}/README.md

@@ -82,5 +82,5 @@ Useful links
 Dependencies
 ------------
 
- - Python 3.5 or later
+ - Python 3.11 or later
  - Python Imaging Library (Debian/Ubuntu package: `python3-pil`)

pysstv-0.5.10/pyproject.toml

@@ -0,0 +1,34 @@
+[project]
+name = "pySSTV"
+version = "0.5.10"
+readme = "README.md"
+description='Python classes for generating Slow-scan Television transmissions'
+requires-python = ">=3.11"
+authors = [{name = "András Veres-Szentkirályi", email = "vsza@vsza.hu"}]
+license = "MIT"
+license-files = ["LICENSE.txt"]
+keywords = ["HAM", "SSTV", "slow-scan", "television", "Scottie", "Martin", "Robot", "Pasokon"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Topic :: Communications :: Ham Radio",
+    "Topic :: Multimedia :: Video :: Conversion",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "pillow==13.0.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/dnet/pySSTV"
+
+[project.scripts]
+pysstv = "pysstv.__main__:main"
+
+[build-system]
+requires = ["setuptools>=77"]
+build-backend = "setuptools.build_meta"
+
+[dependency-groups]
+dev = [
+    "pytest",
+]

{pysstv-0.5.9 → pysstv-0.5.10}/pysstv/__main__.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function, division
 from PIL import Image
 from argparse import ArgumentParser
 from sys import stderr
@@ -77,8 +76,8 @@ def main():
             y = (image.height - mode.HEIGHT) / 2
             image = image.crop((x, y, mode.WIDTH + x, mode.HEIGHT + y))
     elif not all(i >= m for i, m in zip(image.size, (mode.WIDTH, mode.HEIGHT))):
-        print(('Image must be at least {m.WIDTH} x {m.HEIGHT} pixels '
-               'for mode {m.__name__}').format(m=mode), file=stderr)
+        print(f'Image must be at least {mode.WIDTH} x {mode.HEIGHT} pixels '
+              f'for mode {mode.__name__}', file=stderr)
         raise SystemExit(1)
     s = mode(image, args.rate, args.bits)
     s.vox_enabled = args.vox
@@ -90,11 +89,7 @@ def main():
 
 
 def build_module_map():
-    try:
-        from collections import OrderedDict
-        module_map = OrderedDict()
-    except ImportError:
-        module_map = {}
+    module_map = {}
     for module in SSTV_MODULES:
         for mode in module.MODES:
             module_map[mode.__name__] = mode

{pysstv-0.5.9 → pysstv-0.5.10}/pysstv/color.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from __future__ import division
 from pysstv.sstv import byte_to_freq, FREQ_BLACK, FREQ_WHITE, FREQ_VIS_START
 from pysstv.grayscale import GrayscaleSSTV
 from itertools import chain
@@ -74,7 +73,6 @@ class ScottieS1(MartinM1):
 class ScottieS2(ScottieS1):
     VIS_CODE = 0x38
     SCAN = 88.064 - ScottieS1.INTER_CH_GAP
-    WIDTH = 160
 
 
 class ScottieDX(ScottieS1):

{pysstv-0.5.9 → pysstv-0.5.10}/pysstv/grayscale.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import division
 from pysstv.sstv import SSTV, byte_to_freq
 
 
@@ -27,7 +26,7 @@ class Robot8BW(GrayscaleSSTV):
     WIDTH = 160
     HEIGHT = 120
     SYNC = 7
-    SCAN = 60
+    SCAN = 59.90
 
 
 class Robot24BW(GrayscaleSSTV):

{pysstv-0.5.9 → pysstv-0.5.10}/pysstv/sstv.py

@@ -1,9 +1,7 @@
 #!/usr/bin/env python
 
-from __future__ import division, with_statement
 from math import sin, pi
 from random import random
-from contextlib import closing
 from itertools import cycle, chain
 from array import array
 import wave
@@ -24,7 +22,7 @@ MSEC_VIS_BIT = 30
 MSEC_FSKID_BIT = 22
 
 
-class SSTV(object):
+class SSTV:
 
     def __init__(self, image, samples_per_sec, bits):
         self.image = image
@@ -47,7 +45,7 @@ class SSTV(object):
         if self.nchannels != 1:
             data = array(fmt, chain.from_iterable(
                 zip(*([data] * self.nchannels))))
-        with closing(wave.open(filename, 'wb')) as wav:
+        with wave.open(filename, 'wb') as wav:
             wav.setnchannels(self.nchannels)
             wav.setsampwidth(self.bits // 8)
             wav.setframerate(self.samples_per_sec)
@@ -103,13 +101,12 @@ class SSTV(object):
         yield FREQ_VIS_START, MSEC_VIS_START
         yield FREQ_SYNC, MSEC_VIS_BIT  # start bit
         vis = self.VIS_CODE
-        num_ones = 0
         for _ in range(7):
             bit = vis & 1
             vis >>= 1
-            num_ones += bit
             bit_freq = FREQ_VIS_BIT1 if bit == 1 else FREQ_VIS_BIT0
             yield bit_freq, MSEC_VIS_BIT
+        num_ones = (self.VIS_CODE & 0x7f).bit_count()
         parity_freq = FREQ_VIS_BIT1 if num_ones % 2 == 1 else FREQ_VIS_BIT0
         yield parity_freq, MSEC_VIS_BIT
         yield FREQ_SYNC, MSEC_VIS_BIT  # stop bit
@@ -125,8 +122,8 @@ class SSTV(object):
         return []
 
     def add_fskid_text(self, text):
-        self.fskid_payload += '\x20\x2a{0}\x01'.format(
-                ''.join(chr(ord(c) - 0x20) for c in text))
+        encoded = ''.join(chr(ord(c) - 0x20) for c in text)
+        self.fskid_payload += f'\x20\x2a{encoded}\x01'
 
     def horizontal_sync(self):
         yield FREQ_SYNC, self.SYNC

{pysstv-0.5.9 → pysstv-0.5.10}/pysstv/tests/test_color.py

@@ -39,6 +39,6 @@ class TestMartinM1(unittest.TestCase):
         self.maxDiff = None
         line_numbers = [1, 10, 100]
         for line in line_numbers:
-            expected = load_pickled_asset("MartinM1_encode_line_lena{0}".format(line))
+            expected = load_pickled_asset(f"MartinM1_encode_line_lena{line}")
             actual = list(self.lena.encode_line(line))
             self.assertEqual(expected, actual)

{pysstv-0.5.9 → pysstv-0.5.10}/pysstv/tests/test_sstv.py

@@ -1,8 +1,8 @@
 import unittest
 from io import BytesIO
 from itertools import islice
-import mock
-from mock import MagicMock
+from unittest import mock
+from unittest.mock import MagicMock
 import hashlib
 
 from pysstv import sstv

pysstv-0.5.9/PySSTV.egg-info/requires.txt

@@ -1 +0,0 @@
-pillow==12.3.0

pysstv-0.5.9/pyproject.toml

@@ -1,19 +0,0 @@
-[project]
-name = "pySSTV"
-version = "0.5.9"
-readme = "README.md"
-description='Python classes for generating Slow-scan Television transmissions'
-requires-python = ">=3.10"
-dependencies = [
-    "pillow==12.3.0",
-]
-
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
-
-[dependency-groups]
-dev = [
-    "mock==1.0.1",
-    "nose==1.3.0",
-]

pysstv-0.5.9/setup.py

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-from setuptools import setup
-
-setup(
-    name='PySSTV',
-    version='0.5.9',
-    description='Python classes for generating Slow-scan Television transmissions',
-    author=u'András Veres-Szentkirályi',
-    author_email='vsza@vsza.hu',
-    url='https://github.com/dnet/pySSTV',
-    packages=['pysstv', 'pysstv.tests', 'pysstv.examples'],
-    entry_points={
-        'console_scripts': [
-            'pysstv = pysstv.__main__:main',
-        ],
-    },
-    keywords='HAM SSTV slow-scan television Scottie Martin Robot Pasokon',
-    install_requires = ['Pillow'],
-    license='MIT',
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Topic :: Communications :: Ham Radio',
-        'Topic :: Multimedia :: Video :: Conversion',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        ],
-    long_description=open('README.md').read(),
-    long_description_content_type="text/markdown",
-)