diff --git a/.gitignore b/.gitignore index c8b5ecff..034c5d6a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,11 +31,11 @@ aclocal.m4 apis/rivwebcapi/rivwebcapi.pc apis/rivwebcapi/tests/*_test -apis/rivwebpyapi/PKG-INFO -apis/rivwebpyapi/SOURCES.txt -apis/rivwebpyapi/dependency_links.txt -apis/rivwebpyapi/requires.txt -apis/rivwebpyapi/top_level.txt +apis/PKG-INFO +apis/SOURCES.txt +apis/dependency_links.txt +apis/requires.txt +apis/top_level.txt autom4te.cache build_debs.sh cae/caed diff --git a/ChangeLog b/ChangeLog index cfd2bbb0..fa563dc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22871,3 +22871,6 @@ * Reset the version of the 'rivwebpyapi' module to 4.0.0b3. * Changed the upload PyPI repository for the 'rivwebpyapi' module from 'testpypi' to 'pypi'. +2022-01-08 Fred Gleason + * Consolidated the 'pypad' and 'rivwebpyapi' Python modules into + a single 'rivendellaudio' package namespace. diff --git a/INSTALL b/INSTALL index a7f9f68a..16e4f371 100644 --- a/INSTALL +++ b/INSTALL @@ -127,9 +127,6 @@ Available at http://www.underbit.com/products/mad/. TwoLAME - MPEG Layer 2 Encoder Library. Needed for MPEG Layer 2 exporting and capture. Available at http://www.twolame.org/. -Python3 'build' and 'twine' modules. Needed to build DEB packages using -the 'make deb' target. Available from the Python Packaging Index (PyPI). - DOCUMENTATION ------------- diff --git a/apis/Makefile.am b/apis/Makefile.am index 33e17693..ade30637 100644 --- a/apis/Makefile.am +++ b/apis/Makefile.am @@ -2,7 +2,7 @@ ## ## Makefile.am for rivendell/apis ## -## (C) Copyright 2018-2021 Fred Gleason +## (C) Copyright 2018-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as @@ -24,13 +24,42 @@ SUBDIRS = pypad\ rivwebcapi\ rivwebpyapi +pypi: + rm -rf pypi + mkdir -p pypi/src/rivendellaudio + touch pypi/src/rivendellaudio/__init__.py + cp pypad/api/pypad.py pypi/src/rivendellaudio/ + cp rivwebpyapi/api/rivwebpyapi.py pypi/src/rivendellaudio/ + cp ../LICENSES/LGPLv2.txt pypi/LICENSE + cp pyproject.toml pypi/ + cp setup.cfg pypi/ + mkdir -p pypi/tests + python3 -m build pypi + cp pypi/dist/* . + cp pypi/src/rivendellaudio.egg-info/* . + rm -rf pypi + +post-pypi: + python3 -m twine upload --repository pypi *.tar.gz *.whl + +EXTRA_DIST = pyproject.toml\ + setup.cfg.in + CLEANFILES = *~\ *.idb\ *ilk\ *.obj\ *.pdb\ *.qm\ - moc_* + *.tar.gz\ + *.whl\ + PKG-INFO\ + SOURCES.txt\ + dependency_links.txt\ + moc_*\ + not-zip-safe\ + requires.txt\ + top_level.txt MAINTAINERCLEANFILES = *~\ *.tar.gz\ diff --git a/apis/pypad/api/Makefile.am b/apis/pypad/api/Makefile.am index 935fb80d..eaca2294 100644 --- a/apis/pypad/api/Makefile.am +++ b/apis/pypad/api/Makefile.am @@ -2,7 +2,7 @@ ## ## Makefile.am for Rivendell pypad/api ## -## (C) Copyright 2018-2019 Fred Gleason +## (C) Copyright 2018-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -rivendelldir = $(pyexecdir) +rivendelldir = $(pyexecdir)/rivendell rivendell_PYTHON = pypad.py CLEANFILES = *~\ diff --git a/apis/pypad/scripts/pypad_ando.py b/apis/pypad/scripts/pypad_ando.py index 60096ce9..e0e730f5 100755 --- a/apis/pypad/scripts/pypad_ando.py +++ b/apis/pypad/scripts/pypad_ando.py @@ -4,7 +4,7 @@ # # Send PAD updates to an Ando AdInjector # -# (C) Copyright 2018 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -23,7 +23,10 @@ import sys import socket import configparser -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style last_updates={} diff --git a/apis/pypad/scripts/pypad_filewrite.py b/apis/pypad/scripts/pypad_filewrite.py index ce657680..aeee2393 100755 --- a/apis/pypad/scripts/pypad_filewrite.py +++ b/apis/pypad/scripts/pypad_filewrite.py @@ -4,7 +4,7 @@ # # Write PAD updates to files # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -22,7 +22,10 @@ import sys import configparser -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/pypad/scripts/pypad_httpget.py b/apis/pypad/scripts/pypad_httpget.py index 3f17f3b2..77b8bf55 100755 --- a/apis/pypad/scripts/pypad_httpget.py +++ b/apis/pypad/scripts/pypad_httpget.py @@ -4,7 +4,7 @@ # # Write PAD updates to HTTP GET URL # -# (C) Copyright 2019-2020 Fred Gleason +# (C) Copyright 2019-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -23,7 +23,10 @@ import sys import configparser import pycurl -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style import syslog from io import BytesIO diff --git a/apis/pypad/scripts/pypad_icecast2.py b/apis/pypad/scripts/pypad_icecast2.py index 390ed6d9..548dbd0b 100755 --- a/apis/pypad/scripts/pypad_icecast2.py +++ b/apis/pypad/scripts/pypad_icecast2.py @@ -4,7 +4,7 @@ # # Send PAD updates to Icecast2 mountpoint # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -27,7 +27,10 @@ import requests from requests.auth import HTTPBasicAuth import xml.etree.ElementTree as ET import syslog -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style import configparser def ProcessPad(update): diff --git a/apis/pypad/scripts/pypad_inno713.py b/apis/pypad/scripts/pypad_inno713.py index 3f8412cb..310ecb18 100755 --- a/apis/pypad/scripts/pypad_inno713.py +++ b/apis/pypad/scripts/pypad_inno713.py @@ -4,7 +4,7 @@ # # Send Now & Next updates to an Innovonics 713 RDS encoder # -# (C) Copyright 2018 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -24,7 +24,10 @@ import sys import socket import configparser import serial -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/pypad/scripts/pypad_ino713_tcp.py b/apis/pypad/scripts/pypad_ino713_tcp.py index 95aa8f4f..b652a7ce 100755 --- a/apis/pypad/scripts/pypad_ino713_tcp.py +++ b/apis/pypad/scripts/pypad_ino713_tcp.py @@ -4,7 +4,7 @@ # # Send Now & Next updates to an Inovonics 713 RDS encoder as TCP # -# (C) Copyright 2018 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # 2020 Eric Adler # # This program is free software; you can redistribute it and/or modify @@ -24,7 +24,10 @@ import sys import socket import configparser -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style import time def eprint(*args,**kwargs): diff --git a/apis/pypad/scripts/pypad_liqcomp.py b/apis/pypad/scripts/pypad_liqcomp.py index 6e0f1825..8993a84d 100755 --- a/apis/pypad/scripts/pypad_liqcomp.py +++ b/apis/pypad/scripts/pypad_liqcomp.py @@ -4,7 +4,7 @@ # # Send PAD updates to a Liquid Compass stream encoder # -# (C) Copyright 2018 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -23,7 +23,10 @@ import sys import socket import configparser -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style last_updates={} diff --git a/apis/pypad/scripts/pypad_live365.py b/apis/pypad/scripts/pypad_live365.py index 78d75beb..7334693f 100755 --- a/apis/pypad/scripts/pypad_live365.py +++ b/apis/pypad/scripts/pypad_live365.py @@ -4,7 +4,7 @@ # # Write PAD updates to Live365 stations # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -24,7 +24,10 @@ import sys import syslog import configparser import pycurl -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style from io import BytesIO def eprint(*args,**kwargs): diff --git a/apis/pypad/scripts/pypad_nautel.py b/apis/pypad/scripts/pypad_nautel.py index 975dd133..7b3af754 100755 --- a/apis/pypad/scripts/pypad_nautel.py +++ b/apis/pypad/scripts/pypad_nautel.py @@ -4,7 +4,7 @@ # # Send Now & Next updates to an Nautel FM Transmitter as TCP for RDS # -# (C) Copyright 2018-2021 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # 2020 Eric Adler # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,10 @@ import sys import socket import syslog import configparser -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style import time def eprint(*args,**kwargs): diff --git a/apis/pypad/scripts/pypad_serial.py b/apis/pypad/scripts/pypad_serial.py index 77f35808..8f3b6236 100755 --- a/apis/pypad/scripts/pypad_serial.py +++ b/apis/pypad/scripts/pypad_serial.py @@ -4,7 +4,7 @@ # # Write PAD updates to serial (tty) devices. # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -23,7 +23,10 @@ import sys import syslog import configparser -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style import serial from io import BytesIO diff --git a/apis/pypad/scripts/pypad_shoutcast1.py b/apis/pypad/scripts/pypad_shoutcast1.py index 61e71a57..0bd90994 100755 --- a/apis/pypad/scripts/pypad_shoutcast1.py +++ b/apis/pypad/scripts/pypad_shoutcast1.py @@ -4,7 +4,7 @@ # # Write PAD updates to a Shoutcast 1 instance # -# (C) Copyright 2018-2020 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -24,7 +24,10 @@ import sys import syslog import configparser import pycurl -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style from io import BytesIO def eprint(*args,**kwargs): diff --git a/apis/pypad/scripts/pypad_spinitron.py b/apis/pypad/scripts/pypad_spinitron.py index fdb193bd..6bf48a8c 100755 --- a/apis/pypad/scripts/pypad_spinitron.py +++ b/apis/pypad/scripts/pypad_spinitron.py @@ -4,7 +4,7 @@ # # Write PAD updates to the Spinitron Playlist Service # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -24,7 +24,10 @@ import sys import syslog import configparser import pycurl -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style from io import BytesIO last_updates={} diff --git a/apis/pypad/scripts/pypad_spottrap.py b/apis/pypad/scripts/pypad_spottrap.py index fee63eda..fc8e85fe 100755 --- a/apis/pypad/scripts/pypad_spottrap.py +++ b/apis/pypad/scripts/pypad_spottrap.py @@ -4,7 +4,7 @@ # # Output Now & Next data on the basis of Group and Length. # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -23,7 +23,10 @@ import sys import socket import configparser -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style last_updates={} diff --git a/apis/pypad/scripts/pypad_tunein.py b/apis/pypad/scripts/pypad_tunein.py index 2c58069a..f2f25ec5 100755 --- a/apis/pypad/scripts/pypad_tunein.py +++ b/apis/pypad/scripts/pypad_tunein.py @@ -4,7 +4,7 @@ # # Send PAD updates to TuneIn # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -26,7 +26,10 @@ import socket import requests import xml.etree.ElementTree as ET import syslog -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style import configparser def ProcessPad(update): diff --git a/apis/pypad/scripts/pypad_udp.py b/apis/pypad/scripts/pypad_udp.py index 57aad168..6034c3a6 100755 --- a/apis/pypad/scripts/pypad_udp.py +++ b/apis/pypad/scripts/pypad_udp.py @@ -4,7 +4,7 @@ # # Send PAD updates via UDP # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -23,7 +23,10 @@ import sys import socket import configparser -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/pypad/scripts/pypad_urlwrite.py b/apis/pypad/scripts/pypad_urlwrite.py index 56f6d6d1..75498368 100755 --- a/apis/pypad/scripts/pypad_urlwrite.py +++ b/apis/pypad/scripts/pypad_urlwrite.py @@ -4,7 +4,7 @@ # # Write PAD updates to arbitrary URLs # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -24,7 +24,10 @@ import sys import syslog import configparser import pycurl -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style from io import BytesIO def eprint(*args,**kwargs): diff --git a/apis/pypad/scripts/pypad_walltime.py b/apis/pypad/scripts/pypad_walltime.py index c4cea975..21df98c8 100755 --- a/apis/pypad/scripts/pypad_walltime.py +++ b/apis/pypad/scripts/pypad_walltime.py @@ -4,7 +4,7 @@ # # Write PAD updates a WallTime text widget. # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -24,7 +24,10 @@ import sys import syslog import configparser import pycurl -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style from io import BytesIO def eprint(*args,**kwargs): diff --git a/apis/pypad/scripts/pypad_xcmd.py b/apis/pypad/scripts/pypad_xcmd.py index bc4f08a0..068ce3a6 100755 --- a/apis/pypad/scripts/pypad_xcmd.py +++ b/apis/pypad/scripts/pypad_xcmd.py @@ -4,7 +4,7 @@ # # Send Now & Next updates to an RDS encoder supporting X-Command # -# (C) Copyright 2019 Fred Gleason +# (C) Copyright 2019-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -28,7 +28,10 @@ import configparser import serial import xml.etree.ElementTree as ET import time -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style def eprint(*args,**kwargs): print(pypad_name+': ',file=sys.stderr,end='') diff --git a/apis/pypad/scripts/pypad_xds.py b/apis/pypad/scripts/pypad_xds.py index 0f700f67..44ce5253 100755 --- a/apis/pypad/scripts/pypad_xds.py +++ b/apis/pypad/scripts/pypad_xds.py @@ -4,7 +4,7 @@ # # Send CICs via UDP or serial # -# (C) Copyright 2018-2020 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -26,7 +26,10 @@ import configparser import serial import time import syslog -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style # # For supressing redundant 'now' updates diff --git a/apis/pypad/scripts/pypad_xmpad.py b/apis/pypad/scripts/pypad_xmpad.py index eb5a1dd2..fd2b2a0c 100755 --- a/apis/pypad/scripts/pypad_xmpad.py +++ b/apis/pypad/scripts/pypad_xmpad.py @@ -4,7 +4,7 @@ # # Write PAD updates to a Sirius/XM channel # -# (C) Copyright 2018-2019 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -24,7 +24,10 @@ import sys import syslog import configparser import serial -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style XMPAD_DELIMITER='\02' # XMPAD_DELIMITER='\x7c' #(|) diff --git a/apis/pypad/tests/filepath_test.py b/apis/pypad/tests/filepath_test.py index efd365d3..fddadd78 100755 --- a/apis/pypad/tests/filepath_test.py +++ b/apis/pypad/tests/filepath_test.py @@ -6,7 +6,7 @@ # # Exercise every filepath wildcard in 'pypad.Update::resolveFilepath()' # -# (C) Copyright 2018 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -22,7 +22,10 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style def ProcessPad(update): print() diff --git a/apis/pypad/tests/now_and_next.py b/apis/pypad/tests/now_and_next.py index 1b6aa63f..a6d5a2a8 100755 --- a/apis/pypad/tests/now_and_next.py +++ b/apis/pypad/tests/now_and_next.py @@ -4,7 +4,7 @@ # # Barebones example pypad script for Rivendell # -# (C) Copyright 2018 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -24,10 +24,13 @@ # To see the full documentation of these classes, enter the following at # a python interactive prompt: # -# import pypad +# from rivendellaudio import pypad # help(pypad) # -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style # # First, we create a callback method, that will be called every time a @@ -66,4 +69,5 @@ rcvr.setPadCallback(ProcessPad) # the target Rivendell system. Once started, all further processing can only # be done in the callback method! # -rcvr.start('localhost',pypad.PAD_TCP_PORT) +rcvr.start('192.168.21.14',pypad.PAD_TCP_PORT) +#rcvr.start('localhost',pypad.PAD_TCP_PORT) diff --git a/apis/pypad/tests/pad_test.py b/apis/pypad/tests/pad_test.py index 92a367e4..22939be2 100755 --- a/apis/pypad/tests/pad_test.py +++ b/apis/pypad/tests/pad_test.py @@ -6,7 +6,7 @@ # # Exercise every PAD accessor method of 'pypad.Update' for each update. # -# (C) Copyright 2018 Fred Gleason +# (C) Copyright 2018-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -22,7 +22,10 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -import pypad +try: + from rivendellaudio import pypad +except ModuleNotFoundError: + import pypad # Rivendell v3.x style def ProcessPad(update): print diff --git a/apis/rivwebpyapi/pyproject.toml b/apis/pyproject.toml similarity index 100% rename from apis/rivwebpyapi/pyproject.toml rename to apis/pyproject.toml diff --git a/apis/rivwebpyapi/Makefile.am b/apis/rivwebpyapi/Makefile.am index 79b6bfde..ad40cd92 100644 --- a/apis/rivwebpyapi/Makefile.am +++ b/apis/rivwebpyapi/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for Python binding for the Rivendell Web API ## -## (C) Copyright 2021 Fred Gleason +## (C) Copyright 2021-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU Lesser General Public License as @@ -23,38 +23,13 @@ SUBDIRS = api\ tests -all: @PYPI@ - -pypi: - rm -rf pypi - ../../helpers/build_pypi_package.sh rivwebpyapi - cp pypi/dist/* . - cp pypi/src/rivwebpyapi.egg-info/* . - rm -rf pypi - -post-pypi: - python3 -m twine upload --repository pypi *.tar.gz *.whl - -EXTRA_DIST = pyproject.toml\ - setup.cfg.in - CLEANFILES = *~\ *.idb\ *ilk\ *.obj\ *.pdb\ *.qm\ - *.tar.gz\ - *.whl\ - PKG-INFO\ - SOURCES.txt\ - dependency_links.txt\ - moc_*\ - not-zip-safe\ - requires.txt\ - top_level.txt - -DISTCLEANFILES = setup.cfg + moc_* MAINTAINERCLEANFILES = *~\ *.tar.gz\ diff --git a/apis/rivwebpyapi/api/Makefile.am b/apis/rivwebpyapi/api/Makefile.am index cd993da2..1c52f38b 100644 --- a/apis/rivwebpyapi/api/Makefile.am +++ b/apis/rivwebpyapi/api/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for Python binding for the Rivendell Web API ## -## (C) Copyright 2021 Fred Gleason +## (C) Copyright 2021-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU Lesser General Public License as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -rivendelldir = $(pyexecdir)/rivwebpyapi +rivendelldir = $(pyexecdir)/rivendell rivendell_PYTHON = rivwebpyapi.py CLEANFILES = *~\ diff --git a/apis/rivwebpyapi/setup.cfg.in b/apis/rivwebpyapi/setup.cfg.in deleted file mode 100644 index b5613803..00000000 --- a/apis/rivwebpyapi/setup.cfg.in +++ /dev/null @@ -1,30 +0,0 @@ -[metadata] -name=rivwebpyapi -version=@RIVWEBPYAPI_VERSION@ -author=Fred Gleason -author_email=fredg@paravelsystems.com -description=Python 3 interface for accessing the Rivendell Web API -long_description=This is a Python 3 language binding for the Rivendell Web API. - - Example scripts for testing and exercising the API can be found in the - [Rivendell sources](https://github.com/ElvishArtisan/rivendell/tree/qt5) - in 'apis/rivwebpyapi/tests/'. -long_description_content_type=text/markdown -url=https://github.com/ElvishArtisan/rivendell -project_urls= - Bug Tracker=https://github.com/ElvishArtisan/rivendell/issues -classifiers= - Programming Language :: Python :: 3 - License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2) - Operating System :: OS Independent - -[options] -package_dir= - =src -packages=find: -python_requires = >=3.6 -install_requires = - requests >= 2.14.2 - -[options.packages.find] -where=src diff --git a/apis/rivwebpyapi/tests/add_cart.py b/apis/rivwebpyapi/tests/add_cart.py index 3d1f5926..6e924bcd 100755 --- a/apis/rivwebpyapi/tests/add_cart.py +++ b/apis/rivwebpyapi/tests/add_cart.py @@ -6,7 +6,7 @@ # # Test the AddCart Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/add_cut.py b/apis/rivwebpyapi/tests/add_cut.py index ffcaba90..ef8250d0 100755 --- a/apis/rivwebpyapi/tests/add_cut.py +++ b/apis/rivwebpyapi/tests/add_cut.py @@ -6,7 +6,7 @@ # # Test the AddCut Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/add_log.py b/apis/rivwebpyapi/tests/add_log.py index 9b4d59f1..da2834dd 100755 --- a/apis/rivwebpyapi/tests/add_log.py +++ b/apis/rivwebpyapi/tests/add_log.py @@ -6,7 +6,7 @@ # # Test the AddLog Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/assign_sched_code.py b/apis/rivwebpyapi/tests/assign_sched_code.py index 9dcde1f9..d55cf2b6 100755 --- a/apis/rivwebpyapi/tests/assign_sched_code.py +++ b/apis/rivwebpyapi/tests/assign_sched_code.py @@ -6,7 +6,7 @@ # # Test the AssignSchedCode Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/audio_info.py b/apis/rivwebpyapi/tests/audio_info.py index f6c58e9d..f3981157 100755 --- a/apis/rivwebpyapi/tests/audio_info.py +++ b/apis/rivwebpyapi/tests/audio_info.py @@ -6,7 +6,7 @@ # # Test the AudioInfo Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/audio_store.py b/apis/rivwebpyapi/tests/audio_store.py index cba34fed..f36a9950 100755 --- a/apis/rivwebpyapi/tests/audio_store.py +++ b/apis/rivwebpyapi/tests/audio_store.py @@ -6,7 +6,7 @@ # # Test the AudioStore Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/delete_audio.py b/apis/rivwebpyapi/tests/delete_audio.py index e60b3b8e..eff9f7e5 100755 --- a/apis/rivwebpyapi/tests/delete_audio.py +++ b/apis/rivwebpyapi/tests/delete_audio.py @@ -6,7 +6,7 @@ # # Test the DeleteAudio Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/delete_log.py b/apis/rivwebpyapi/tests/delete_log.py index 272f716b..7cea96e3 100755 --- a/apis/rivwebpyapi/tests/delete_log.py +++ b/apis/rivwebpyapi/tests/delete_log.py @@ -6,7 +6,7 @@ # # Test the DeleteLog Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/edit_cart.py b/apis/rivwebpyapi/tests/edit_cart.py index b22cff18..754128ab 100755 --- a/apis/rivwebpyapi/tests/edit_cart.py +++ b/apis/rivwebpyapi/tests/edit_cart.py @@ -6,7 +6,7 @@ # # Test the EditCart Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/edit_cut.py b/apis/rivwebpyapi/tests/edit_cut.py index 54c73cc7..e9269031 100755 --- a/apis/rivwebpyapi/tests/edit_cut.py +++ b/apis/rivwebpyapi/tests/edit_cut.py @@ -6,7 +6,7 @@ # # Test the EditCut Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/export.py b/apis/rivwebpyapi/tests/export.py index 71572cfd..23378b0a 100755 --- a/apis/rivwebpyapi/tests/export.py +++ b/apis/rivwebpyapi/tests/export.py @@ -6,7 +6,7 @@ # # Test the Export Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/export_peaks.py b/apis/rivwebpyapi/tests/export_peaks.py index 942c839e..ed3aa358 100755 --- a/apis/rivwebpyapi/tests/export_peaks.py +++ b/apis/rivwebpyapi/tests/export_peaks.py @@ -6,7 +6,7 @@ # # Test the ExportPeaks Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/get_podcast.py b/apis/rivwebpyapi/tests/get_podcast.py index c7001065..382c7c8f 100755 --- a/apis/rivwebpyapi/tests/get_podcast.py +++ b/apis/rivwebpyapi/tests/get_podcast.py @@ -6,7 +6,7 @@ # # Test the GetPodcast Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/import.py b/apis/rivwebpyapi/tests/import.py index df552820..90ff3b19 100755 --- a/apis/rivwebpyapi/tests/import.py +++ b/apis/rivwebpyapi/tests/import.py @@ -6,7 +6,7 @@ # # Test the Import Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_cart.py b/apis/rivwebpyapi/tests/list_cart.py index 2e35171c..50c3def8 100755 --- a/apis/rivwebpyapi/tests/list_cart.py +++ b/apis/rivwebpyapi/tests/list_cart.py @@ -6,7 +6,7 @@ # # Test the ListCart Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_cart_sched_codes.py b/apis/rivwebpyapi/tests/list_cart_sched_codes.py index 9cfc3af4..39ad919d 100755 --- a/apis/rivwebpyapi/tests/list_cart_sched_codes.py +++ b/apis/rivwebpyapi/tests/list_cart_sched_codes.py @@ -6,7 +6,7 @@ # # Test the ListCartSchedCodes Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_carts.py b/apis/rivwebpyapi/tests/list_carts.py index 5480ef05..7b37a048 100755 --- a/apis/rivwebpyapi/tests/list_carts.py +++ b/apis/rivwebpyapi/tests/list_carts.py @@ -6,7 +6,7 @@ # # Test the ListCarts Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_cut.py b/apis/rivwebpyapi/tests/list_cut.py index e540fac0..344c8ef7 100755 --- a/apis/rivwebpyapi/tests/list_cut.py +++ b/apis/rivwebpyapi/tests/list_cut.py @@ -6,7 +6,7 @@ # # Test the ListCut Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_cuts.py b/apis/rivwebpyapi/tests/list_cuts.py index 746ef04d..620563fb 100755 --- a/apis/rivwebpyapi/tests/list_cuts.py +++ b/apis/rivwebpyapi/tests/list_cuts.py @@ -6,7 +6,7 @@ # # Test the ListCuts Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_group.py b/apis/rivwebpyapi/tests/list_group.py index 5a567296..14762b04 100755 --- a/apis/rivwebpyapi/tests/list_group.py +++ b/apis/rivwebpyapi/tests/list_group.py @@ -6,7 +6,7 @@ # # Access the 'ListGroup' call. # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_groups.py b/apis/rivwebpyapi/tests/list_groups.py index 38b46446..40d5572c 100755 --- a/apis/rivwebpyapi/tests/list_groups.py +++ b/apis/rivwebpyapi/tests/list_groups.py @@ -6,7 +6,7 @@ # # Access the 'ListGroups' call. # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_log.py b/apis/rivwebpyapi/tests/list_log.py index da4d75f4..2453eb5b 100755 --- a/apis/rivwebpyapi/tests/list_log.py +++ b/apis/rivwebpyapi/tests/list_log.py @@ -6,7 +6,7 @@ # # Test the ListLog Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_logs.py b/apis/rivwebpyapi/tests/list_logs.py index be7a6df6..2a0573f5 100755 --- a/apis/rivwebpyapi/tests/list_logs.py +++ b/apis/rivwebpyapi/tests/list_logs.py @@ -6,7 +6,7 @@ # # Test the ListLogs Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_scheduler_codes.py b/apis/rivwebpyapi/tests/list_scheduler_codes.py index d96ec791..0451a25d 100755 --- a/apis/rivwebpyapi/tests/list_scheduler_codes.py +++ b/apis/rivwebpyapi/tests/list_scheduler_codes.py @@ -6,7 +6,7 @@ # # Test the ListSchedulerCodes Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_services.py b/apis/rivwebpyapi/tests/list_services.py index cf8401d4..4bd7381f 100755 --- a/apis/rivwebpyapi/tests/list_services.py +++ b/apis/rivwebpyapi/tests/list_services.py @@ -6,7 +6,7 @@ # # Test the ListServices Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/list_system_settings.py b/apis/rivwebpyapi/tests/list_system_settings.py index db1d6516..2de4ac2c 100755 --- a/apis/rivwebpyapi/tests/list_system_settings.py +++ b/apis/rivwebpyapi/tests/list_system_settings.py @@ -6,7 +6,7 @@ # # Test the ListSystemSettings Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/lock_log.py b/apis/rivwebpyapi/tests/lock_log.py index 2c936a9e..aaaf9a8e 100755 --- a/apis/rivwebpyapi/tests/lock_log.py +++ b/apis/rivwebpyapi/tests/lock_log.py @@ -6,7 +6,7 @@ # # Test the LockLog Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/post_image.py b/apis/rivwebpyapi/tests/post_image.py index e0d47b57..f71de4bd 100755 --- a/apis/rivwebpyapi/tests/post_image.py +++ b/apis/rivwebpyapi/tests/post_image.py @@ -6,7 +6,7 @@ # # Test the PostImage Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/post_podcast.py b/apis/rivwebpyapi/tests/post_podcast.py index b8df6f2e..b6a86708 100755 --- a/apis/rivwebpyapi/tests/post_podcast.py +++ b/apis/rivwebpyapi/tests/post_podcast.py @@ -6,7 +6,7 @@ # # Test the PostPodcast Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/post_rss.py b/apis/rivwebpyapi/tests/post_rss.py index c2edada6..cb713e2e 100755 --- a/apis/rivwebpyapi/tests/post_rss.py +++ b/apis/rivwebpyapi/tests/post_rss.py @@ -6,7 +6,7 @@ # # Test the PostRss Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/rehash.py b/apis/rivwebpyapi/tests/rehash.py index e75b5370..374db7dc 100755 --- a/apis/rivwebpyapi/tests/rehash.py +++ b/apis/rivwebpyapi/tests/rehash.py @@ -6,7 +6,7 @@ # # Test the Rehash Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/remove_cart.py b/apis/rivwebpyapi/tests/remove_cart.py index 026d597b..4d7789b1 100755 --- a/apis/rivwebpyapi/tests/remove_cart.py +++ b/apis/rivwebpyapi/tests/remove_cart.py @@ -6,7 +6,7 @@ # # Test the RemoveCart Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/remove_cut.py b/apis/rivwebpyapi/tests/remove_cut.py index 459f00b3..5e56d0d4 100755 --- a/apis/rivwebpyapi/tests/remove_cut.py +++ b/apis/rivwebpyapi/tests/remove_cut.py @@ -6,7 +6,7 @@ # # Test the RemoveCut Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/remove_image.py b/apis/rivwebpyapi/tests/remove_image.py index cae355f1..d0b82257 100755 --- a/apis/rivwebpyapi/tests/remove_image.py +++ b/apis/rivwebpyapi/tests/remove_image.py @@ -6,7 +6,7 @@ # # Test the RemoveImage Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/remove_podcast.py b/apis/rivwebpyapi/tests/remove_podcast.py index fc782e7d..cf01c8f2 100755 --- a/apis/rivwebpyapi/tests/remove_podcast.py +++ b/apis/rivwebpyapi/tests/remove_podcast.py @@ -6,7 +6,7 @@ # # Test the RemovePodcast Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/remove_rss.py b/apis/rivwebpyapi/tests/remove_rss.py index cfeef20d..87d12746 100755 --- a/apis/rivwebpyapi/tests/remove_rss.py +++ b/apis/rivwebpyapi/tests/remove_rss.py @@ -6,7 +6,7 @@ # # Test the RemoveRss Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/save_log.py b/apis/rivwebpyapi/tests/save_log.py index a600e049..74a92364 100755 --- a/apis/rivwebpyapi/tests/save_log.py +++ b/apis/rivwebpyapi/tests/save_log.py @@ -6,7 +6,7 @@ # # Test the SaveLog Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/save_podcast.py b/apis/rivwebpyapi/tests/save_podcast.py index 22a4c978..5cb42982 100755 --- a/apis/rivwebpyapi/tests/save_podcast.py +++ b/apis/rivwebpyapi/tests/save_podcast.py @@ -6,7 +6,7 @@ # # Test the SavePodcast Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/trim_audio.py b/apis/rivwebpyapi/tests/trim_audio.py index 2f14a191..1a3539f9 100755 --- a/apis/rivwebpyapi/tests/trim_audio.py +++ b/apis/rivwebpyapi/tests/trim_audio.py @@ -6,7 +6,7 @@ # # Test the TrimAudio Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/rivwebpyapi/tests/unassign_sched_code.py b/apis/rivwebpyapi/tests/unassign_sched_code.py index d278d250..7ba36df2 100755 --- a/apis/rivwebpyapi/tests/unassign_sched_code.py +++ b/apis/rivwebpyapi/tests/unassign_sched_code.py @@ -6,7 +6,7 @@ # # Test the UnassignSchedCode Web API call # -# (C) Copyright 2021 Fred Gleason +# (C) Copyright 2021-2022 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 2 as @@ -25,7 +25,7 @@ import getpass import sys -from rivwebpyapi import rivwebpyapi +from rivendellaudio import rivwebpyapi def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) diff --git a/apis/setup.cfg.in b/apis/setup.cfg.in new file mode 100644 index 00000000..35848318 --- /dev/null +++ b/apis/setup.cfg.in @@ -0,0 +1,50 @@ +@GENERATED_SCRIPT_FILE_WARNING@ + +[metadata] +name=rivendellaudio +version=@PYTHONAPI_VERSION@ +author=Fred Gleason +author_email=fredg@paravelsystems.com +description=Python 3 interface to the Rivendell Radio Automation System +long_description=This is a Python 3 interface for the Rivendell Radio + Automation System. It contains the following modules: + + - PyPAD. A system for processing Program Associated Data (PAD) generated + by Rivendell. + + Example plug-ins for processing PAD updates can be found in the + [Rivendell sources](https://github.com/ElvishArtisan/rivendell/tree/qt5) + in 'apis/pypad/tests/'. + + - Web API. Classes for remotely interacting with Rivendell objects, + including + * Carts + * Cuts + * Groups + * Logs + * Podcasts + * Scheduler Codes + + Example scripts for testing and exercising the API can be found in the + [Rivendell sources](https://github.com/ElvishArtisan/rivendell/tree/qt5) + in 'apis/rivwebpyapi/tests/'. +long_description_content_type=text/markdown +url=https://github.com/ElvishArtisan/rivendell +project_urls= + Bug Tracker=https://github.com/ElvishArtisan/rivendell/issues +classifiers= + Programming Language :: Python :: 3 + License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2) + Operating System :: OS Independent + +[options] +package_dir= + =src +packages=find: +python_requires = >=3.6 +install_requires = + mysqlclient >= 1.3.12 + requests >= 2.14.2 + +[options.packages.find] +where=src diff --git a/autogen.sh b/autogen.sh index 538bd53b..26c362fe 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## Adapted from './autogen.sh' in the Jack Audio Connection Kit. ## Copyright (C) 2001-2003 Paul Davis, et al. @@ -26,7 +26,7 @@ DATESTAMP=`date +%a,\ %d\ %b\ %Y\ %T\ %z` sed s/@VERSION@/`cat versions/PACKAGE_VERSION`/ < debian/control.src > debian/control sed s/@VERSION@/`cat versions/PACKAGE_VERSION`/ < debian/changelog.src | sed "s/@DATESTAMP@/$DATESTAMP/" > debian/changelog -sed s/@RIVWEBPYAPI_VERSION@/`cat versions/RIVWEBPYAPI_VERSION`/ < debian/rules.src > debian/rules +sed s/@PYTHONAPI_VERSION@/`cat versions/PYTHONAPI_VERSION`/ < debian/rules.src > debian/rules mkdir -p m4 diff --git a/configure.ac b/configure.ac index 1cf13197..9bbe4d65 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_CONFIG_MACRO_DIR([m4]) # # API Versioning # -AC_SUBST(RIVWEBPYAPI_VERSION,m4_esyscmd(cat versions/RIVWEBPYAPI_VERSION)) +AC_SUBST(PYTHONAPI_VERSION,m4_esyscmd(cat versions/PYTHONAPI_VERSION)) RIVWEBCAPI_CURRENT=m4_esyscmd(cat versions/RIVWEBCAPI_CURRENT) RIVWEBCAPI_REVISION=m4_esyscmd(cat versions/RIVWEBCAPI_REVISION) RIVWEBCAPI_AGE=m4_esyscmd(cat versions/RIVWEBCAPI_AGE) @@ -340,22 +340,6 @@ else AC_ARG_VAR(pyexecdir,[the Python extension modules directory]) fi -# -# Check for PyPI Module Build Chain -# -AR_PYTHON_MODULE([build],[BUILD_FOUND=yes],[]) -AR_PYTHON_MODULE([twine],[TWINE_FOUND=yes],[]) -if test $BUILD_FOUND ; then - if test $TWINE_FOUND ; then - PYPI_FOUND=yes - AC_SUBST(PYPI,pypi) - else - AC_SUBST(PYPI,"") - fi -else - AC_SUBST(PYPI,"") -fi - # # Check for FLAC # @@ -604,6 +588,7 @@ AC_CONFIG_FILES([rivendell.spec \ helpers/install_python.sh \ helpers/rdi18n_helper.sh \ LICENSES/Makefile \ + apis/setup.cfg \ apis/Makefile \ apis/pypad/Makefile \ apis/pypad/api/Makefile \ @@ -613,7 +598,6 @@ AC_CONFIG_FILES([rivendell.spec \ apis/rivwebcapi/rivwebcapi.pc \ apis/rivwebcapi/rivwebcapi/Makefile \ apis/rivwebcapi/tests/Makefile \ - apis/rivwebpyapi/setup.cfg \ apis/rivwebpyapi/Makefile \ apis/rivwebpyapi/api/Makefile \ apis/rivwebpyapi/tests/Makefile \ @@ -733,11 +717,6 @@ AC_MSG_NOTICE("| Update I18N Data ... Yes |") else AC_MSG_NOTICE("| Update I18N Data ... No |") fi -if test $PYPI_FOUND ; then -AC_MSG_NOTICE("| PyPI Module Build Chain Detected ... Yes |") -else -AC_MSG_NOTICE("| PyPI Module Build Chain Detected ... No |") -fi AC_MSG_NOTICE("| |") AC_MSG_NOTICE("| Configured Audio Drivers: |") if test -z $USING_ALSA ; then diff --git a/helpers/Makefile.am b/helpers/Makefile.am index bb705ace..ecbbac5e 100644 --- a/helpers/Makefile.am +++ b/helpers/Makefile.am @@ -2,7 +2,7 @@ ## ## helper/ Automake.am for Rivendell ## -## (C) Copyright 2003-2021 Fred Gleason +## (C) Copyright 2003-2022 Fred Gleason ## ## Use automake to process this into a Makefile.in ## @@ -33,8 +33,7 @@ dist_cwrap_SOURCES = cwrap.cpp cwrap.h dist_jsmin_SOURCES = jsmin.c -EXTRA_DIST = build_pypi_package.sh\ - c_file_warning\ +EXTRA_DIST = c_file_warning\ install_python.sh.in\ rdi18n_helper.sh.in\ rdpack.sh\ diff --git a/helpers/build_pypi_package.sh b/helpers/build_pypi_package.sh deleted file mode 100755 index ce47b39e..00000000 --- a/helpers/build_pypi_package.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# -# (C) Copyright 2021 Fred Gleason -# -# Build a PyPI package. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PKG_NAME=$1 - -rm -rf pypi -mkdir -p pypi/src/$PKG_NAME -touch pypi/src/$PKG_NAME/__init__.py -cp api/$PKG_NAME.py pypi/src/$PKG_NAME/ -cp ../../LICENSES/LGPLv2.txt pypi/LICENSE -cp pyproject.toml pypi/ -cp setup.cfg pypi/ - -mkdir -p pypi/tests -cp tests/*.py pypi/tests/ - -python3 -m build pypi - diff --git a/versions/Makefile.am b/versions/Makefile.am index 991bb300..36e60d5f 100644 --- a/versions/Makefile.am +++ b/versions/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2021 Fred Gleason +## (C) Copyright 2021-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +19,9 @@ ## Use automake to process this into a Makefile.in EXTRA_DIST = PACKAGE_VERSION\ + PYPAD_VERSION\ + PYTHONAPI_VERSION\ README.txt\ - RIVWEBPYAPI_VERSION\ RIVWEBCAPI_AGE\ RIVWEBCAPI_CURRENT\ RIVWEBCAPI_REVISION diff --git a/versions/RIVWEBPYAPI_VERSION b/versions/PYTHONAPI_VERSION similarity index 100% rename from versions/RIVWEBPYAPI_VERSION rename to versions/PYTHONAPI_VERSION diff --git a/versions/README.txt b/versions/README.txt index 039ef891..30f4b548 100644 --- a/versions/README.txt +++ b/versions/README.txt @@ -27,5 +27,6 @@ RIVWEBCAPI_AGE # 6. If any interfaces have been removed since the last public release, # then set 'RIVWEBCAPI_AGE' to 0. -RIVWEBPYAPI_VERSION - Version string for rivwebpyapi. - See PEP 440 [https://www.python.org/dev/peps/pep-0440/]. +PYTHONAPI_VERSION - Version string for the Python components beneath '/apis/'. + See PEP 440 [https://www.python.org/dev/peps/pep-0440/] + for formatting rules.