[skip travis] update setup and version
This commit is contained in:
parent
d59e0e44ad
commit
94a538facb
3 changed files with 190 additions and 87 deletions
127
setup.py
127
setup.py
|
@ -1,62 +1,21 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# coding: utf-8
|
# coding: utf-8
|
||||||
|
|
||||||
from __future__ import print_function
|
from setuptools import setup, Command
|
||||||
|
|
||||||
import os.path
|
import os.path
|
||||||
import warnings
|
import warnings
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
try:
|
|
||||||
from setuptools import setup, Command
|
|
||||||
setuptools_available = True
|
|
||||||
except ImportError:
|
|
||||||
from distutils.core import setup, Command
|
|
||||||
setuptools_available = False
|
|
||||||
from distutils.spawn import spawn
|
from distutils.spawn import spawn
|
||||||
|
|
||||||
try:
|
|
||||||
# This will create an exe that needs Microsoft Visual C++ 2008
|
|
||||||
# Redistributable Package
|
|
||||||
import py2exe
|
|
||||||
except ImportError:
|
|
||||||
if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
|
|
||||||
print('Cannot import py2exe', file=sys.stderr)
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
py2exe_options = {
|
|
||||||
'bundle_files': 1,
|
|
||||||
'compressed': 1,
|
|
||||||
'optimize': 2,
|
|
||||||
'dist_dir': '.',
|
|
||||||
'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
|
|
||||||
}
|
|
||||||
|
|
||||||
# Get the version from youtube_dl/version.py without importing the package
|
# Get the version from youtube_dl/version.py without importing the package
|
||||||
exec(compile(open('youtube_dl/version.py').read(),
|
exec(compile(open('youtube_dl/version.py').read(),
|
||||||
'youtube_dl/version.py', 'exec'))
|
'youtube_dl/version.py', 'exec'))
|
||||||
|
|
||||||
DESCRIPTION = 'YouTube video downloader'
|
DESCRIPTION = 'Media downloader supporting various sites such as youtube'
|
||||||
LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites'
|
LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites. Based on a more active community fork.'
|
||||||
|
|
||||||
py2exe_console = [{
|
|
||||||
'script': './youtube_dl/__main__.py',
|
|
||||||
'dest_base': 'youtube-dl',
|
|
||||||
'version': __version__,
|
|
||||||
'description': DESCRIPTION,
|
|
||||||
'comments': LONG_DESCRIPTION,
|
|
||||||
'product_name': 'youtube-dl',
|
|
||||||
'product_version': __version__,
|
|
||||||
}]
|
|
||||||
|
|
||||||
py2exe_params = {
|
|
||||||
'console': py2exe_console,
|
|
||||||
'options': {'py2exe': py2exe_options},
|
|
||||||
'zipfile': None
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
|
if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
|
||||||
params = py2exe_params
|
print("inv")
|
||||||
else:
|
else:
|
||||||
files_spec = [
|
files_spec = [
|
||||||
('etc/bash_completion.d', ['youtube-dl.bash-completion']),
|
('etc/bash_completion.d', ['youtube-dl.bash-completion']),
|
||||||
|
@ -78,10 +37,10 @@ else:
|
||||||
params = {
|
params = {
|
||||||
'data_files': data_files,
|
'data_files': data_files,
|
||||||
}
|
}
|
||||||
if setuptools_available:
|
#if setuptools_available:
|
||||||
params['entry_points'] = {'console_scripts': ['youtube-dl = youtube_dl:main']}
|
params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dl:main']}
|
||||||
else:
|
#else:
|
||||||
params['scripts'] = ['bin/youtube-dl']
|
# params['scripts'] = ['bin/youtube-dlc']
|
||||||
|
|
||||||
class build_lazy_extractors(Command):
|
class build_lazy_extractors(Command):
|
||||||
description = 'Build the extractor lazy loading module'
|
description = 'Build the extractor lazy loading module'
|
||||||
|
@ -100,49 +59,45 @@ class build_lazy_extractors(Command):
|
||||||
)
|
)
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='youtube_dl',
|
name="youtube_dlc",
|
||||||
version=__version__,
|
version=__version__,
|
||||||
|
maintainer="Tom-Oliver Heidel",
|
||||||
|
maintainer_email="theidel@uni-bremen.de",
|
||||||
description=DESCRIPTION,
|
description=DESCRIPTION,
|
||||||
long_description=LONG_DESCRIPTION,
|
long_description=LONG_DESCRIPTION,
|
||||||
url='https://github.com/ytdl-org/youtube-dl',
|
# long_description_content_type="text/markdown",
|
||||||
author='Ricardo Garcia',
|
url="https://github.com/blackjack4494/youtube-dlc",
|
||||||
author_email='ytdl@yt-dl.org',
|
# packages=setuptools.find_packages(),
|
||||||
maintainer='Sergey M.',
|
packages=[
|
||||||
maintainer_email='dstftw@gmail.com',
|
|
||||||
license='Unlicense',
|
|
||||||
packages=[
|
|
||||||
'youtube_dl',
|
'youtube_dl',
|
||||||
'youtube_dl.extractor', 'youtube_dl.downloader',
|
'youtube_dl.extractor', 'youtube_dl.downloader',
|
||||||
'youtube_dl.postprocessor'],
|
'youtube_dl.postprocessor'],
|
||||||
|
|
||||||
# Provokes warning on most systems (why?!)
|
|
||||||
# test_suite = 'nose.collector',
|
|
||||||
# test_requires = ['nosetest'],
|
|
||||||
|
|
||||||
classifiers=[
|
classifiers=[
|
||||||
'Topic :: Multimedia :: Video',
|
"Topic :: Multimedia :: Video",
|
||||||
'Development Status :: 5 - Production/Stable',
|
"Development Status :: 5 - Production/Stable",
|
||||||
'Environment :: Console',
|
"Environment :: Console",
|
||||||
'License :: Public Domain',
|
"Programming Language :: Python",
|
||||||
'Programming Language :: Python',
|
"Programming Language :: Python :: 2",
|
||||||
'Programming Language :: Python :: 2',
|
"Programming Language :: Python :: 2.6",
|
||||||
'Programming Language :: Python :: 2.6',
|
"Programming Language :: Python :: 2.7",
|
||||||
'Programming Language :: Python :: 2.7',
|
"Programming Language :: Python :: 3",
|
||||||
'Programming Language :: Python :: 3',
|
"Programming Language :: Python :: 3.2",
|
||||||
'Programming Language :: Python :: 3.2',
|
"Programming Language :: Python :: 3.3",
|
||||||
'Programming Language :: Python :: 3.3',
|
"Programming Language :: Python :: 3.4",
|
||||||
'Programming Language :: Python :: 3.4',
|
"Programming Language :: Python :: 3.5",
|
||||||
'Programming Language :: Python :: 3.5',
|
"Programming Language :: Python :: 3.6",
|
||||||
'Programming Language :: Python :: 3.6',
|
"Programming Language :: Python :: 3.7",
|
||||||
'Programming Language :: Python :: 3.7',
|
"Programming Language :: Python :: 3.8",
|
||||||
'Programming Language :: Python :: 3.8',
|
"Programming Language :: Python :: Implementation",
|
||||||
'Programming Language :: Python :: Implementation',
|
"Programming Language :: Python :: Implementation :: CPython",
|
||||||
'Programming Language :: Python :: Implementation :: CPython',
|
"Programming Language :: Python :: Implementation :: IronPython",
|
||||||
'Programming Language :: Python :: Implementation :: IronPython',
|
"Programming Language :: Python :: Implementation :: Jython",
|
||||||
'Programming Language :: Python :: Implementation :: Jython',
|
"Programming Language :: Python :: Implementation :: PyPy",
|
||||||
'Programming Language :: Python :: Implementation :: PyPy',
|
"License :: Public Domain",
|
||||||
|
"Operating System :: OS Independent",
|
||||||
],
|
],
|
||||||
|
python_requires='>=2.6',
|
||||||
cmdclass={'build_lazy_extractors': build_lazy_extractors},
|
|
||||||
|
cmdclass={'build_lazy_extractors': build_lazy_extractors},
|
||||||
**params
|
**params
|
||||||
)
|
)
|
148
setup_original.py
Normal file
148
setup_original.py
Normal file
|
@ -0,0 +1,148 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
# coding: utf-8
|
||||||
|
|
||||||
|
from __future__ import print_function
|
||||||
|
|
||||||
|
import os.path
|
||||||
|
import warnings
|
||||||
|
import sys
|
||||||
|
|
||||||
|
try:
|
||||||
|
from setuptools import setup, Command
|
||||||
|
setuptools_available = True
|
||||||
|
except ImportError:
|
||||||
|
from distutils.core import setup, Command
|
||||||
|
setuptools_available = False
|
||||||
|
from distutils.spawn import spawn
|
||||||
|
|
||||||
|
try:
|
||||||
|
# This will create an exe that needs Microsoft Visual C++ 2008
|
||||||
|
# Redistributable Package
|
||||||
|
import py2exe
|
||||||
|
except ImportError:
|
||||||
|
if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
|
||||||
|
print('Cannot import py2exe', file=sys.stderr)
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
py2exe_options = {
|
||||||
|
'bundle_files': 1,
|
||||||
|
'compressed': 1,
|
||||||
|
'optimize': 2,
|
||||||
|
'dist_dir': '.',
|
||||||
|
'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
|
||||||
|
}
|
||||||
|
|
||||||
|
# Get the version from youtube_dl/version.py without importing the package
|
||||||
|
exec(compile(open('youtube_dl/version.py').read(),
|
||||||
|
'youtube_dl/version.py', 'exec'))
|
||||||
|
|
||||||
|
DESCRIPTION = 'Media downloader supporting various sites such as youtube'
|
||||||
|
LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites. Based on a more active community fork.'
|
||||||
|
|
||||||
|
py2exe_console = [{
|
||||||
|
'script': './youtube_dl/__main__.py',
|
||||||
|
'dest_base': 'youtube-dl',
|
||||||
|
'version': __version__,
|
||||||
|
'description': DESCRIPTION,
|
||||||
|
'comments': LONG_DESCRIPTION,
|
||||||
|
'product_name': 'youtube-dlc',
|
||||||
|
'product_version': __version__,
|
||||||
|
}]
|
||||||
|
|
||||||
|
py2exe_params = {
|
||||||
|
'console': py2exe_console,
|
||||||
|
'options': {'py2exe': py2exe_options},
|
||||||
|
'zipfile': None
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
|
||||||
|
params = py2exe_params
|
||||||
|
else:
|
||||||
|
files_spec = [
|
||||||
|
('etc/bash_completion.d', ['youtube-dl.bash-completion']),
|
||||||
|
('etc/fish/completions', ['youtube-dl.fish']),
|
||||||
|
('share/doc/youtube_dl', ['README.txt']),
|
||||||
|
('share/man/man1', ['youtube-dl.1'])
|
||||||
|
]
|
||||||
|
root = os.path.dirname(os.path.abspath(__file__))
|
||||||
|
data_files = []
|
||||||
|
for dirname, files in files_spec:
|
||||||
|
resfiles = []
|
||||||
|
for fn in files:
|
||||||
|
if not os.path.exists(fn):
|
||||||
|
warnings.warn('Skipping file %s since it is not present. Type make to build all automatically generated files.' % fn)
|
||||||
|
else:
|
||||||
|
resfiles.append(fn)
|
||||||
|
data_files.append((dirname, resfiles))
|
||||||
|
|
||||||
|
params = {
|
||||||
|
'data_files': data_files,
|
||||||
|
}
|
||||||
|
if setuptools_available:
|
||||||
|
params['entry_points'] = {'console_scripts': ['youtube-dl = youtube_dl:main']}
|
||||||
|
else:
|
||||||
|
params['scripts'] = ['bin/youtube-dl']
|
||||||
|
|
||||||
|
class build_lazy_extractors(Command):
|
||||||
|
description = 'Build the extractor lazy loading module'
|
||||||
|
user_options = []
|
||||||
|
|
||||||
|
def initialize_options(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def finalize_options(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def run(self):
|
||||||
|
spawn(
|
||||||
|
[sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dl/extractor/lazy_extractors.py'],
|
||||||
|
dry_run=self.dry_run,
|
||||||
|
)
|
||||||
|
|
||||||
|
setup(
|
||||||
|
name='youtube_dlc',
|
||||||
|
version=__version__,
|
||||||
|
description=DESCRIPTION,
|
||||||
|
long_description=LONG_DESCRIPTION,
|
||||||
|
url='https://github.com/blackjack4494/youtube-dlc',
|
||||||
|
author='',
|
||||||
|
author_email='theidel@uni-bremen.de',
|
||||||
|
maintainer='Tom-Oliver Heidel',
|
||||||
|
maintainer_email='theidel@uni-bremen.de',
|
||||||
|
license='Unlicense',
|
||||||
|
packages=[
|
||||||
|
'youtube_dl',
|
||||||
|
'youtube_dl.extractor', 'youtube_dl.downloader',
|
||||||
|
'youtube_dl.postprocessor'],
|
||||||
|
|
||||||
|
# Provokes warning on most systems (why?!)
|
||||||
|
# test_suite = 'nose.collector',
|
||||||
|
# test_requires = ['nosetest'],
|
||||||
|
|
||||||
|
classifiers=[
|
||||||
|
'Topic :: Multimedia :: Video',
|
||||||
|
'Development Status :: 5 - Production/Stable',
|
||||||
|
'Environment :: Console',
|
||||||
|
'License :: Public Domain',
|
||||||
|
'Programming Language :: Python',
|
||||||
|
'Programming Language :: Python :: 2',
|
||||||
|
'Programming Language :: Python :: 2.6',
|
||||||
|
'Programming Language :: Python :: 2.7',
|
||||||
|
'Programming Language :: Python :: 3',
|
||||||
|
'Programming Language :: Python :: 3.2',
|
||||||
|
'Programming Language :: Python :: 3.3',
|
||||||
|
'Programming Language :: Python :: 3.4',
|
||||||
|
'Programming Language :: Python :: 3.5',
|
||||||
|
'Programming Language :: Python :: 3.6',
|
||||||
|
'Programming Language :: Python :: 3.7',
|
||||||
|
'Programming Language :: Python :: 3.8',
|
||||||
|
'Programming Language :: Python :: Implementation',
|
||||||
|
'Programming Language :: Python :: Implementation :: CPython',
|
||||||
|
'Programming Language :: Python :: Implementation :: IronPython',
|
||||||
|
'Programming Language :: Python :: Implementation :: Jython',
|
||||||
|
'Programming Language :: Python :: Implementation :: PyPy',
|
||||||
|
],
|
||||||
|
|
||||||
|
cmdclass={'build_lazy_extractors': build_lazy_extractors},
|
||||||
|
**params
|
||||||
|
)
|
|
@ -1,3 +1,3 @@
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
__version__ = '2020.07.28'
|
__version__ = '2020.08.31'
|
||||||
|
|
Loading…
Reference in a new issue