Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat): Windows support #85

Merged
merged 24 commits into from
Aug 4, 2021
Merged

(feat): Windows support #85

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
49f70fb
Windows support using an artificial FIFO.
mariocynicys Jul 23, 2021
c9d275e
invoking both processes as shell because it doesn't work on windows f…
mariocynicys Jul 23, 2021
1a79cfb
tests tested from windows
mariocynicys Jul 23, 2021
3d2c926
adding pywin32api to the prerequisites list
mariocynicys Jul 29, 2021
87f9559
to be tested on windows
mariocynicys Jul 30, 2021
a8cac17
moving the windows logic to the OutputStream class, also splitting pi…
mariocynicys Jul 30, 2021
22d907f
minor edits1
mariocynicys Jul 30, 2021
222471c
minor edits2
mariocynicys Jul 30, 2021
8fff654
minor edits3
mariocynicys Jul 30, 2021
0b875c1
amend to this
mariocynicys Aug 1, 2021
eac2d66
replace the ipc pipe with a file pipe when transcoding is skipped
mariocynicys Aug 2, 2021
0a8905d
style edit
mariocynicys Aug 2, 2021
5e52c41
dropping shell=True
mariocynicys Aug 2, 2021
30987f4
style edits
mariocynicys Aug 2, 2021
c5a1201
style edits
mariocynicys Aug 2, 2021
78b3210
irrelevant comment
mariocynicys Aug 2, 2021
f4c6619
to be tested on windows
mariocynicys Aug 3, 2021
9708518
add pywin32 as an installtion requisite for Windows
mariocynicys Aug 3, 2021
d52d65d
Merge branch 'windows-new' into conflicts
mariocynicys Aug 4, 2021
1f5f0b4
removing the {dir} placeholder from the output file templates
mariocynicys Aug 4, 2021
f42bbc0
a stream must be software acc to apply these args to it
mariocynicys Aug 4, 2021
6917446
print the runtime error content
mariocynicys Aug 4, 2021
e1e285f
Merge pull request #3 from meryacine/conflicts
mariocynicys Aug 4, 2021
d30dc73
renaming a var
mariocynicys Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,13 @@
# limitations under the License.

import base64
import os
import setuptools

import streamer

with open('README.md', 'r') as f:
long_description = f.read()

install_prerequisites = ['PyYAML']
if os.name == 'nt':
install_prerequisites.append('pypiwin32')

setuptools.setup(
name='shaka-streamer',
version=streamer.__version__,
Expand All @@ -34,13 +29,17 @@
long_description_content_type='text/markdown',
url='https://github.com/google/shaka-streamer',
packages=setuptools.find_packages(),
install_requires=install_prerequisites,
install_requires=[
'PyYAML',
'pywin32;platform_system=="Windows"',
joeyparrish marked this conversation as resolved.
Show resolved Hide resolved
],
scripts=['shaka-streamer'],
classifiers=[
'Programming Language :: Python :: 3',
'License :: OSI Approved :: Apache Software License',
'Operating System :: POSIX :: Linux',
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove the OS classifiers now since we already support the three of them?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't find any docs from pypi indicating one way or the other is best. Let's leave them for now. Thanks!

],
# Python 3.5 tested in Ubuntu 16.04 LTS (Xenial Xerus).
python_requires='>=3.5',
Expand Down