From 79e3ace473b5c0bbcc456260e3651954984fe543 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 15 Dec 2021 20:27:13 -0500 Subject: [PATCH] 2021-12-15 Fred Gleason * Renamed the 'rivwebpyapi.rivwebpyapi()' class to 'rivwebpyapi.Site()'. * Added 'make pypi' and 'make post-pypi' targets to 'apis/rivwebpyapi/Makefile.am'. Signed-off-by: Fred Gleason --- ChangeLog | 5 +++ RIVWEBPYAPI_VERSION | 1 + apis/rivwebpyapi/Makefile.am | 16 +++++++++ apis/rivwebpyapi/api/Makefile.am | 2 +- apis/rivwebpyapi/api/rivwebpyapi.py | 2 +- apis/rivwebpyapi/pyproject.toml | 6 ++++ apis/rivwebpyapi/setup.cfg.in | 24 +++++++++++++ apis/rivwebpyapi/tests/add_cart.py | 8 +++-- apis/rivwebpyapi/tests/add_cut.py | 8 +++-- apis/rivwebpyapi/tests/add_log.py | 8 +++-- apis/rivwebpyapi/tests/assign_sched_code.py | 8 +++-- apis/rivwebpyapi/tests/audio_info.py | 8 +++-- apis/rivwebpyapi/tests/audio_store.py | 8 +++-- apis/rivwebpyapi/tests/delete_audio.py | 8 +++-- apis/rivwebpyapi/tests/delete_log.py | 8 +++-- apis/rivwebpyapi/tests/edit_cart.py | 8 +++-- apis/rivwebpyapi/tests/edit_cut.py | 8 +++-- apis/rivwebpyapi/tests/export.py | 8 +++-- apis/rivwebpyapi/tests/export_peaks.py | 8 +++-- apis/rivwebpyapi/tests/get_podcast.py | 8 +++-- apis/rivwebpyapi/tests/import.py | 8 +++-- apis/rivwebpyapi/tests/list_cart.py | 8 +++-- .../tests/list_cart_sched_codes.py | 8 +++-- apis/rivwebpyapi/tests/list_carts.py | 10 +++--- apis/rivwebpyapi/tests/list_cut.py | 8 +++-- apis/rivwebpyapi/tests/list_cuts.py | 8 +++-- apis/rivwebpyapi/tests/list_group.py | 8 +++-- apis/rivwebpyapi/tests/list_groups.py | 8 +++-- apis/rivwebpyapi/tests/list_log.py | 8 +++-- apis/rivwebpyapi/tests/list_logs.py | 8 +++-- .../rivwebpyapi/tests/list_scheduler_codes.py | 8 +++-- apis/rivwebpyapi/tests/list_services.py | 8 +++-- .../rivwebpyapi/tests/list_system_settings.py | 8 +++-- apis/rivwebpyapi/tests/lock_log.py | 8 +++-- apis/rivwebpyapi/tests/post_image.py | 8 +++-- apis/rivwebpyapi/tests/post_podcast.py | 8 +++-- apis/rivwebpyapi/tests/post_rss.py | 8 +++-- apis/rivwebpyapi/tests/rehash.py | 8 +++-- apis/rivwebpyapi/tests/remove_cart.py | 8 +++-- apis/rivwebpyapi/tests/remove_cut.py | 8 +++-- apis/rivwebpyapi/tests/remove_image.py | 8 +++-- apis/rivwebpyapi/tests/remove_podcast.py | 8 +++-- apis/rivwebpyapi/tests/remove_rss.py | 8 +++-- apis/rivwebpyapi/tests/save_log.py | 12 ++++--- apis/rivwebpyapi/tests/save_podcast.py | 8 +++-- apis/rivwebpyapi/tests/trim_audio.py | 8 +++-- apis/rivwebpyapi/tests/unassign_sched_code.py | 8 +++-- configure.ac | 3 ++ helpers/Makefile.am | 3 +- helpers/build_pypi_package.sh | 36 +++++++++++++++++++ 50 files changed, 298 insertions(+), 126 deletions(-) create mode 100644 RIVWEBPYAPI_VERSION create mode 100644 apis/rivwebpyapi/pyproject.toml create mode 100644 apis/rivwebpyapi/setup.cfg.in create mode 100755 helpers/build_pypi_package.sh diff --git a/ChangeLog b/ChangeLog index 44908b05..458ce7fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22803,3 +22803,8 @@ 1.3 to 'LICENSES/GFDL.txt'. 2021-12-15 Fred Gleason * Added the derived file warning to 'rivwebpyapi.spec.in'. +2021-12-15 Fred Gleason + * Renamed the 'rivwebpyapi.rivwebpyapi()' class to + 'rivwebpyapi.Site()'. + * Added 'make pypi' and 'make post-pypi' targets to + 'apis/rivwebpyapi/Makefile.am'. diff --git a/RIVWEBPYAPI_VERSION b/RIVWEBPYAPI_VERSION new file mode 100644 index 00000000..fac5e899 --- /dev/null +++ b/RIVWEBPYAPI_VERSION @@ -0,0 +1 @@ +4.0.0b6 \ No newline at end of file diff --git a/apis/rivwebpyapi/Makefile.am b/apis/rivwebpyapi/Makefile.am index 3a848b7c..59a67f57 100644 --- a/apis/rivwebpyapi/Makefile.am +++ b/apis/rivwebpyapi/Makefile.am @@ -23,14 +23,30 @@ SUBDIRS = api\ tests +pypi: + rm -rf pypi + ../../helpers/build_pypi_package.sh rivwebpyapi + cp pypi/dist/* . + rm -rf pypi + +post-pypi: + python3 -m twine upload --repository testpypi *.tar.gz *.whl + +EXTRA_DIST = pyproject.toml\ + setup.cfg.in + CLEANFILES = *~\ *.idb\ *ilk\ *.obj\ *.pdb\ *.qm\ + *.tar.gz\ + *.whl\ moc_* +DISTCLEANFILES = setup.cfg + MAINTAINERCLEANFILES = *~\ *.tar.gz\ aclocal.m4\ diff --git a/apis/rivwebpyapi/api/Makefile.am b/apis/rivwebpyapi/api/Makefile.am index 617f7b52..cd993da2 100644 --- a/apis/rivwebpyapi/api/Makefile.am +++ b/apis/rivwebpyapi/api/Makefile.am @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -rivendelldir = $(pyexecdir) +rivendelldir = $(pyexecdir)/rivwebpyapi rivendell_PYTHON = rivwebpyapi.py CLEANFILES = *~\ diff --git a/apis/rivwebpyapi/api/rivwebpyapi.py b/apis/rivwebpyapi/api/rivwebpyapi.py index b9156ed8..8f89be1d 100755 --- a/apis/rivwebpyapi/api/rivwebpyapi.py +++ b/apis/rivwebpyapi/api/rivwebpyapi.py @@ -479,7 +479,7 @@ class SystemSettings(RivendellType): def __init__(self,values={}): super().__init__(SYSTEM_SETTINGS_FIELDS,values) -class rivwebpyapi(object): +class Site(object): """ Create a 'RivWebPyApi' object for accessing the Web API. """ diff --git a/apis/rivwebpyapi/pyproject.toml b/apis/rivwebpyapi/pyproject.toml new file mode 100644 index 00000000..c3871ad1 --- /dev/null +++ b/apis/rivwebpyapi/pyproject.toml @@ -0,0 +1,6 @@ +[build-system] +requires=[ + "setuptools>=42", + "wheel" +] +build-backend="setuptools.build_meta" diff --git a/apis/rivwebpyapi/setup.cfg.in b/apis/rivwebpyapi/setup.cfg.in new file mode 100644 index 00000000..66cb698d --- /dev/null +++ b/apis/rivwebpyapi/setup.cfg.in @@ -0,0 +1,24 @@ +[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=str: This is a Python 3 language binding for the Rivendell Web API. +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 + +[options.packages.find] +where=src diff --git a/apis/rivwebpyapi/tests/add_cart.py b/apis/rivwebpyapi/tests/add_cart.py index df725989..3d1f5926 100755 --- a/apis/rivwebpyapi/tests/add_cart.py +++ b/apis/rivwebpyapi/tests/add_cart.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -73,9 +75,9 @@ if(cart_number==0): # # Get the cut list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - cart=webapi.AddCart(group_name=group_name,cart_type=cart_type,cart_number=cart_number) + cart=site.AddCart(group_name=group_name,cart_type=cart_type,cart_number=cart_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/add_cut.py b/apis/rivwebpyapi/tests/add_cut.py index af84447b..ffcaba90 100755 --- a/apis/rivwebpyapi/tests/add_cut.py +++ b/apis/rivwebpyapi/tests/add_cut.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -62,9 +64,9 @@ if(not cart_number): # # Get the cut list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - cut=webapi.AddCut(cart_number=cart_number) + cut=site.AddCut(cart_number=cart_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/add_log.py b/apis/rivwebpyapi/tests/add_log.py index b218b30c..9b4d59f1 100755 --- a/apis/rivwebpyapi/tests/add_log.py +++ b/apis/rivwebpyapi/tests/add_log.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(not service_name): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.AddLog(service_name=service_name,log_name=log_name) + site.AddLog(service_name=service_name,log_name=log_name) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/assign_sched_code.py b/apis/rivwebpyapi/tests/assign_sched_code.py index c0febfa8..9dcde1f9 100755 --- a/apis/rivwebpyapi/tests/assign_sched_code.py +++ b/apis/rivwebpyapi/tests/assign_sched_code.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(not sched_code): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.AssignSchedCode(cart_number=cart_number,sched_code=sched_code) + site.AssignSchedCode(cart_number=cart_number,sched_code=sched_code) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/audio_info.py b/apis/rivwebpyapi/tests/audio_info.py index 405bba82..f6c58e9d 100755 --- a/apis/rivwebpyapi/tests/audio_info.py +++ b/apis/rivwebpyapi/tests/audio_info.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(cut_number==0): # # Get the code list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - info=webapi.AudioInfo(cart_number=cart_number,cut_number=cut_number) + info=site.AudioInfo(cart_number=cart_number,cut_number=cut_number) except rivwebpyapi.RivWebPyError as err: print('*** ERROR ***') print('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/audio_store.py b/apis/rivwebpyapi/tests/audio_store.py index 39371def..cba34fed 100755 --- a/apis/rivwebpyapi/tests/audio_store.py +++ b/apis/rivwebpyapi/tests/audio_store.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -55,9 +57,9 @@ if((not url)or(not username)): # # Get the settings # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - setting=webapi.AudioStore() + setting=site.AudioStore() except rivwebpyapi.RivWebPyError as err: print('*** ERROR ***') print('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/delete_audio.py b/apis/rivwebpyapi/tests/delete_audio.py index 513bb9d3..e60b3b8e 100755 --- a/apis/rivwebpyapi/tests/delete_audio.py +++ b/apis/rivwebpyapi/tests/delete_audio.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(cut_number==0): # # Get the code list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.DeleteAudio(cart_number=cart_number,cut_number=cut_number) + site.DeleteAudio(cart_number=cart_number,cut_number=cut_number) except rivwebpyapi.RivWebPyError as err: print('*** ERROR ***') print('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/delete_log.py b/apis/rivwebpyapi/tests/delete_log.py index af93ffdd..272f716b 100755 --- a/apis/rivwebpyapi/tests/delete_log.py +++ b/apis/rivwebpyapi/tests/delete_log.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -61,9 +63,9 @@ if(not log_name): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.DeleteLog(log_name=log_name) + site.DeleteLog(log_name=log_name) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/edit_cart.py b/apis/rivwebpyapi/tests/edit_cart.py index c7448e96..b22cff18 100755 --- a/apis/rivwebpyapi/tests/edit_cart.py +++ b/apis/rivwebpyapi/tests/edit_cart.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -70,12 +72,12 @@ if(cart_number==0): # # Get the cart list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) cart=rivwebpyapi.Cart() cart.setValues(values) try: - cart=webapi.EditCart(cart_number=cart_number,values=cart.values()) + cart=site.EditCart(cart_number=cart_number,values=cart.values()) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/edit_cut.py b/apis/rivwebpyapi/tests/edit_cut.py index dbffee08..54c73cc7 100755 --- a/apis/rivwebpyapi/tests/edit_cut.py +++ b/apis/rivwebpyapi/tests/edit_cut.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -76,12 +78,12 @@ if(cut_number==0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) cut=rivwebpyapi.Cut() cut.setValues(values) try: - cut=webapi.EditCut(cart_number=cart_number,cut_number=cut_number, + cut=site.EditCut(cart_number=cart_number,cut_number=cut_number, values=cut.values()) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') diff --git a/apis/rivwebpyapi/tests/export.py b/apis/rivwebpyapi/tests/export.py index b2a1ec4a..71572cfd 100755 --- a/apis/rivwebpyapi/tests/export.py +++ b/apis/rivwebpyapi/tests/export.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -110,9 +112,9 @@ if(end_point<0): # # Get the code list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.Export(filename=filename,cart_number=cart_number, + site.Export(filename=filename,cart_number=cart_number, cut_number=cut_number, audio_format=audio_format,channels=channels, sample_rate=sample_rate,bit_rate=bit_rate,quality=quality, diff --git a/apis/rivwebpyapi/tests/export_peaks.py b/apis/rivwebpyapi/tests/export_peaks.py index 7878c2a1..942c839e 100755 --- a/apis/rivwebpyapi/tests/export_peaks.py +++ b/apis/rivwebpyapi/tests/export_peaks.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(cut_number==0): # # Get the peak data # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - peak_data=webapi.ExportPeaks(cart_number=cart_number,cut_number=cut_number) + peak_data=site.ExportPeaks(cart_number=cart_number,cut_number=cut_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/get_podcast.py b/apis/rivwebpyapi/tests/get_podcast.py index e5385f29..c7001065 100755 --- a/apis/rivwebpyapi/tests/get_podcast.py +++ b/apis/rivwebpyapi/tests/get_podcast.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(not filename): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.GetPodcast(cast_id=cast_id,filename=filename) + site.GetPodcast(cast_id=cast_id,filename=filename) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/import.py b/apis/rivwebpyapi/tests/import.py index ba13b107..df552820 100755 --- a/apis/rivwebpyapi/tests/import.py +++ b/apis/rivwebpyapi/tests/import.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -92,9 +94,9 @@ if(not filename): # # Get the code list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - result=webapi.Import(filename=filename,cart_number=cart_number, + result=site.Import(filename=filename,cart_number=cart_number, cut_number=cut_number,channels=channels, normalization_level=normalization_level, autotrim_level=autotrim_level, diff --git a/apis/rivwebpyapi/tests/list_cart.py b/apis/rivwebpyapi/tests/list_cart.py index 4a172441..2e35171c 100755 --- a/apis/rivwebpyapi/tests/list_cart.py +++ b/apis/rivwebpyapi/tests/list_cart.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -62,9 +64,9 @@ if(cart_number==0): # # Get the cart list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - cart=webapi.ListCart(cart_number=cart_number,include_cuts=include_cuts) + cart=site.ListCart(cart_number=cart_number,include_cuts=include_cuts) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_cart_sched_codes.py b/apis/rivwebpyapi/tests/list_cart_sched_codes.py index 4baba612..9cfc3af4 100755 --- a/apis/rivwebpyapi/tests/list_cart_sched_codes.py +++ b/apis/rivwebpyapi/tests/list_cart_sched_codes.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -62,9 +64,9 @@ if(cart_number==0): # # Get the code list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - codes=webapi.ListCartSchedCodes(cart_number=cart_number) + codes=site.ListCartSchedCodes(cart_number=cart_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_carts.py b/apis/rivwebpyapi/tests/list_carts.py index e81d290c..5480ef05 100755 --- a/apis/rivwebpyapi/tests/list_carts.py +++ b/apis/rivwebpyapi/tests/list_carts.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -69,10 +71,10 @@ if((not url)or(not username)): # # Get the cart list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - carts=webapi.ListCarts(group_name=group_name,filter_string=filter_string, - cart_type=cart_type,include_cuts=include_cuts) + carts=site.ListCarts(group_name=group_name,filter_string=filter_string, + cart_type=cart_type,include_cuts=include_cuts) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_cut.py b/apis/rivwebpyapi/tests/list_cut.py index f6856034..e540fac0 100755 --- a/apis/rivwebpyapi/tests/list_cut.py +++ b/apis/rivwebpyapi/tests/list_cut.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -68,9 +70,9 @@ if(cut_number==0): # # Get the cut list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - cut=webapi.ListCut(cart_number=cart_number,cut_number=cut_number) + cut=site.ListCut(cart_number=cart_number,cut_number=cut_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_cuts.py b/apis/rivwebpyapi/tests/list_cuts.py index fe6fb3d3..746ef04d 100755 --- a/apis/rivwebpyapi/tests/list_cuts.py +++ b/apis/rivwebpyapi/tests/list_cuts.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -62,9 +64,9 @@ if(cart_number==0): # # Get the cut list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - cuts=webapi.ListCuts(cart_number=cart_number) + cuts=site.ListCuts(cart_number=cart_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_group.py b/apis/rivwebpyapi/tests/list_group.py index e3e3227d..5a567296 100755 --- a/apis/rivwebpyapi/tests/list_group.py +++ b/apis/rivwebpyapi/tests/list_group.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -59,9 +61,9 @@ if(not group_name): # # Get the group list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - grp=webapi.ListGroup(group_name=group_name) + grp=site.ListGroup(group_name=group_name) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_groups.py b/apis/rivwebpyapi/tests/list_groups.py index 42d75834..38b46446 100755 --- a/apis/rivwebpyapi/tests/list_groups.py +++ b/apis/rivwebpyapi/tests/list_groups.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -54,9 +56,9 @@ if((not url)or(not username)): # # Get the group list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - groups=webapi.ListGroups() + groups=site.ListGroups() except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_log.py b/apis/rivwebpyapi/tests/list_log.py index e0682a27..da4d75f4 100755 --- a/apis/rivwebpyapi/tests/list_log.py +++ b/apis/rivwebpyapi/tests/list_log.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -64,9 +66,9 @@ if(not log_name): # # Get the log list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - loglines=webapi.ListLog(log_name=log_name) + loglines=site.ListLog(log_name=log_name) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_logs.py b/apis/rivwebpyapi/tests/list_logs.py index bf9e7968..be7a6df6 100755 --- a/apis/rivwebpyapi/tests/list_logs.py +++ b/apis/rivwebpyapi/tests/list_logs.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -70,9 +72,9 @@ if((not url)or(not username)): # # Get the log list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - logs=webapi.ListLogs(service_name=service_name,log_name=log_name, + logs=site.ListLogs(service_name=service_name,log_name=log_name, trackable=trackable,filter_string=filter_string, recent=recent) except rivwebpyapi.RivWebPyError as err: diff --git a/apis/rivwebpyapi/tests/list_scheduler_codes.py b/apis/rivwebpyapi/tests/list_scheduler_codes.py index 2c1d3e0c..d96ec791 100755 --- a/apis/rivwebpyapi/tests/list_scheduler_codes.py +++ b/apis/rivwebpyapi/tests/list_scheduler_codes.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -57,9 +59,9 @@ if((not url)or(not username)): # # Get the code list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - codes=webapi.ListSchedulerCodes() + codes=site.ListSchedulerCodes() except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_services.py b/apis/rivwebpyapi/tests/list_services.py index d3db3c61..cf8401d4 100755 --- a/apis/rivwebpyapi/tests/list_services.py +++ b/apis/rivwebpyapi/tests/list_services.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -57,9 +59,9 @@ if((not url)or(not username)): # # Get the services list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - services=webapi.ListServices(trackable=trackable) + services=site.ListServices(trackable=trackable) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/list_system_settings.py b/apis/rivwebpyapi/tests/list_system_settings.py index cd339aa0..db1d6516 100755 --- a/apis/rivwebpyapi/tests/list_system_settings.py +++ b/apis/rivwebpyapi/tests/list_system_settings.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -57,9 +59,9 @@ if((not url)or(not username)): # # Get the code list # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - settings=webapi.ListSystemSettings() + settings=site.ListSystemSettings() except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/lock_log.py b/apis/rivwebpyapi/tests/lock_log.py index 55d99191..2c936a9e 100755 --- a/apis/rivwebpyapi/tests/lock_log.py +++ b/apis/rivwebpyapi/tests/lock_log.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -76,9 +78,9 @@ if((operation!='CREATE')and(not guid)): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - lock=webapi.LockLog(log_name=log_name,operation=operation,guid=guid) + lock=site.LockLog(log_name=log_name,operation=operation,guid=guid) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/post_image.py b/apis/rivwebpyapi/tests/post_image.py index ab1cbc92..e0d47b57 100755 --- a/apis/rivwebpyapi/tests/post_image.py +++ b/apis/rivwebpyapi/tests/post_image.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -61,9 +63,9 @@ if(image_id<0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.PostImage(image_id=image_id) + site.PostImage(image_id=image_id) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/post_podcast.py b/apis/rivwebpyapi/tests/post_podcast.py index bbbd7029..b8df6f2e 100755 --- a/apis/rivwebpyapi/tests/post_podcast.py +++ b/apis/rivwebpyapi/tests/post_podcast.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -61,9 +63,9 @@ if(cast_id<0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.PostPodcast(cast_id=cast_id) + site.PostPodcast(cast_id=cast_id) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/post_rss.py b/apis/rivwebpyapi/tests/post_rss.py index aa248045..c2edada6 100755 --- a/apis/rivwebpyapi/tests/post_rss.py +++ b/apis/rivwebpyapi/tests/post_rss.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -61,9 +63,9 @@ if(feed_id<0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.PostRss(feed_id=feed_id) + site.PostRss(feed_id=feed_id) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/rehash.py b/apis/rivwebpyapi/tests/rehash.py index c8b1283f..e75b5370 100755 --- a/apis/rivwebpyapi/tests/rehash.py +++ b/apis/rivwebpyapi/tests/rehash.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(cut_number==0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.Rehash(cart_number=cart_number,cut_number=cut_number) + site.Rehash(cart_number=cart_number,cut_number=cut_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/remove_cart.py b/apis/rivwebpyapi/tests/remove_cart.py index 01edd3ea..026d597b 100755 --- a/apis/rivwebpyapi/tests/remove_cart.py +++ b/apis/rivwebpyapi/tests/remove_cart.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -61,9 +63,9 @@ if(cart_number==0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.RemoveCart(cart_number=cart_number) + site.RemoveCart(cart_number=cart_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/remove_cut.py b/apis/rivwebpyapi/tests/remove_cut.py index 9f3eb6cf..459f00b3 100755 --- a/apis/rivwebpyapi/tests/remove_cut.py +++ b/apis/rivwebpyapi/tests/remove_cut.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(cut_number==0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.RemoveCut(cart_number=cart_number,cut_number=cut_number) + site.RemoveCut(cart_number=cart_number,cut_number=cut_number) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/remove_image.py b/apis/rivwebpyapi/tests/remove_image.py index f1144983..cae355f1 100755 --- a/apis/rivwebpyapi/tests/remove_image.py +++ b/apis/rivwebpyapi/tests/remove_image.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -61,9 +63,9 @@ if(image_id<0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.RemoveImage(image_id=image_id) + site.RemoveImage(image_id=image_id) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/remove_podcast.py b/apis/rivwebpyapi/tests/remove_podcast.py index f8688f3a..fc782e7d 100755 --- a/apis/rivwebpyapi/tests/remove_podcast.py +++ b/apis/rivwebpyapi/tests/remove_podcast.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -61,9 +63,9 @@ if(cast_id<0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.RemovePodcast(cast_id=cast_id) + site.RemovePodcast(cast_id=cast_id) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/remove_rss.py b/apis/rivwebpyapi/tests/remove_rss.py index ae7d9256..cfeef20d 100755 --- a/apis/rivwebpyapi/tests/remove_rss.py +++ b/apis/rivwebpyapi/tests/remove_rss.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -61,9 +63,9 @@ if(feed_id<0): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.RemoveRss(feed_id=feed_id) + site.RemoveRss(feed_id=feed_id) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/save_log.py b/apis/rivwebpyapi/tests/save_log.py index 68a705a1..a600e049 100755 --- a/apis/rivwebpyapi/tests/save_log.py +++ b/apis/rivwebpyapi/tests/save_log.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -70,13 +72,13 @@ if(from_log_name==to_log_name): eprint('"--from-log-name" and "--to-log_name" must be different') sys.exit(1) -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) # # Get the "from" log # try: - log_header=webapi.ListLogs(log_name=from_log_name)[0] + log_header=site.ListLogs(log_name=from_log_name)[0] except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR Calling ListLogs() ***') eprint('Response Code: '+str(err.responseCode)) @@ -86,7 +88,7 @@ except rivwebpyapi.RivWebPyError as err: sys.exit(1) try: - log_lines=webapi.ListLog(log_name=from_log_name) + log_lines=site.ListLog(log_name=from_log_name) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR Calling ListLog() ***') eprint('Response Code: '+str(err.responseCode)) @@ -99,7 +101,7 @@ except rivwebpyapi.RivWebPyError as err: # Save "to" log # try: - webapi.SaveLog(log_name=to_log_name,header_values=log_header,line_values=log_lines) + site.SaveLog(log_name=to_log_name,header_values=log_header,line_values=log_lines) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR Calling SaveLog() ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/save_podcast.py b/apis/rivwebpyapi/tests/save_podcast.py index ebfcca31..22a4c978 100755 --- a/apis/rivwebpyapi/tests/save_podcast.py +++ b/apis/rivwebpyapi/tests/save_podcast.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(not filename): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.SavePodcast(cast_id=cast_id,filename=filename) + site.SavePodcast(cast_id=cast_id,filename=filename) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/apis/rivwebpyapi/tests/trim_audio.py b/apis/rivwebpyapi/tests/trim_audio.py index e304f99b..2f14a191 100755 --- a/apis/rivwebpyapi/tests/trim_audio.py +++ b/apis/rivwebpyapi/tests/trim_audio.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -73,9 +75,9 @@ if(trim_level==1700): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - result=webapi.TrimAudio(cart_number=cart_number,cut_number=cut_number, + result=site.TrimAudio(cart_number=cart_number,cut_number=cut_number, trim_level=trim_level) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') diff --git a/apis/rivwebpyapi/tests/unassign_sched_code.py b/apis/rivwebpyapi/tests/unassign_sched_code.py index 165a3a20..d278d250 100755 --- a/apis/rivwebpyapi/tests/unassign_sched_code.py +++ b/apis/rivwebpyapi/tests/unassign_sched_code.py @@ -23,8 +23,10 @@ # import getpass -import rivwebpyapi import sys + +from rivwebpyapi import rivwebpyapi + def eprint(*args,**kwargs): print(*args,file=sys.stderr,**kwargs) @@ -67,9 +69,9 @@ if(not sched_code): # # Execute # -webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password) +site=rivwebpyapi.Site(url=url,username=username,password=password) try: - webapi.UnassignSchedCode(cart_number=cart_number,sched_code=sched_code) + site.UnassignSchedCode(cart_number=cart_number,sched_code=sched_code) except rivwebpyapi.RivWebPyError as err: eprint('*** ERROR ***') eprint('Response Code: '+str(err.responseCode)) diff --git a/configure.ac b/configure.ac index 46fdd765..243892c2 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,8 @@ AC_SUBST(RPM_RELEASE,1) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR([m4]) +AC_SUBST(RIVWEBPYAPI_VERSION,m4_esyscmd(cat RIVWEBPYAPI_VERSION)) + # # API Library Versioning # @@ -612,6 +614,7 @@ 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 \ diff --git a/helpers/Makefile.am b/helpers/Makefile.am index 5990e37c..bb705ace 100644 --- a/helpers/Makefile.am +++ b/helpers/Makefile.am @@ -33,7 +33,8 @@ dist_cwrap_SOURCES = cwrap.cpp cwrap.h dist_jsmin_SOURCES = jsmin.c -EXTRA_DIST = c_file_warning\ +EXTRA_DIST = build_pypi_package.sh\ + 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 new file mode 100755 index 00000000..ce47b39e --- /dev/null +++ b/helpers/build_pypi_package.sh @@ -0,0 +1,36 @@ +#!/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 +