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.

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

Rewrite vsrepo/vsrupdate #189

Draft
wants to merge 62 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
383c872
Update setup files, add typing
Setsugennoao Sep 12, 2022
7eac55f
Move vsrepo, vsrupdate to their own folder
Setsugennoao Sep 12, 2022
b2ae7d9
vsrepo: format and fix typing
Setsugennoao Sep 12, 2022
4a39c6a
Add utils submodule
Setsugennoao Sep 12, 2022
c6605e8
Add basic types from vspackages3.json
Setsugennoao Sep 12, 2022
8ca2fee
Remove __all__ when developing
Setsugennoao Sep 12, 2022
1f5ba13
Add descriptors
Setsugennoao Sep 12, 2022
f7b1144
Fix types and add members to VSPackage
Setsugennoao Sep 12, 2022
b2259ff
Add iter to VSPackages (proxies packages)
Setsugennoao Sep 12, 2022
dbdf46b
Add VSPackages.from_file
Setsugennoao Sep 12, 2022
09ba19c
Update, fix and simplify Descriptors, typing
Setsugennoao Sep 13, 2022
c780953
Add utils, rename type to pkg_type
Setsugennoao Sep 13, 2022
6d8f9f7
Make VSpackage release type bound
Setsugennoao Sep 13, 2022
b74417d
Utilize new types in main vsrepo file
Setsugennoao Sep 13, 2022
2d88a2c
Minor typos
Setsugennoao Sep 13, 2022
b6f34d9
Rename VSPackageRelease => VSPackageRel
Setsugennoao Sep 13, 2022
e713e4e
Add VSPackage.is_type, VSPackages.packages_from_type
Setsugennoao Sep 13, 2022
4a8986e
Fix package_json_path
Setsugennoao Sep 18, 2022
dd0a5dc
Remove overloads
Setsugennoao Sep 18, 2022
3b3f111
Raise on invalid vspackagetype
Setsugennoao Sep 18, 2022
f2819de
Change TypedDicts into dataclasses
Setsugennoao Sep 18, 2022
5ed5c3b
Add get_release
Setsugennoao Sep 18, 2022
421dcd0
Reflect types changes in main script
Setsugennoao Sep 18, 2022
b813537
Add utils.net
Setsugennoao Sep 18, 2022
20221b1
Add utils' site, installations submodules
Setsugennoao Sep 18, 2022
19836e5
Create InstallationInfo
Setsugennoao Sep 18, 2022
94741f5
Move get_vapoursynth_version, get_vapoursynth_api_version
Setsugennoao Sep 18, 2022
a206a65
Add utils.packages, InstalledPackages
Setsugennoao Sep 18, 2022
f8d87d3
Return None from VSPackageRel.get_release
Setsugennoao Sep 18, 2022
a1c0da4
Add get_latest_installable_release_with_index, get_latest_installable…
Setsugennoao Sep 18, 2022
7874088
Reflect types changes in main vsrepo file
Setsugennoao Sep 18, 2022
95d3581
Clean up print statements
Setsugennoao Sep 18, 2022
67303d4
Add InstallFileResult
Setsugennoao Sep 18, 2022
d4310f5
Add overloads to InstalledPackages methods with `required`
Setsugennoao Sep 18, 2022
b841d17
Add InstallPackageResult
Setsugennoao Sep 18, 2022
5681d12
Fix f-strings
Setsugennoao Sep 18, 2022
7b20471
Move get_install_path, get_pyton_name to VSPackage
Setsugennoao Sep 18, 2022
5051831
Merge branch 'vapoursynth:master' into rewrite
Setsugennoao Sep 18, 2022
1880df7
Clean up `main` code for [un]install/upgrade
Setsugennoao Sep 18, 2022
9348a34
Use pathlib instead of os.path
Setsugennoao Sep 18, 2022
09ec2a8
Minor updates
Setsugennoao Sep 19, 2022
237e6d6
Rename sanitize_dict, add sanitize_value
Setsugennoao Sep 19, 2022
6fe323d
Remove packages_from_type
Setsugennoao Sep 19, 2022
96a94bd
Add VSPackageRel.from_dict
Setsugennoao Sep 19, 2022
25e4d17
Clean up platform releases
Setsugennoao Sep 19, 2022
a8d79b9
Merge branch 'apiv4' into rewrite
Setsugennoao Sep 19, 2022
4421303
Remove last bits of os.path
Setsugennoao Sep 19, 2022
d95e248
Add py.typed files
Setsugennoao Sep 19, 2022
3c3453a
Update detect_installed_packages readability
Setsugennoao Sep 19, 2022
eb1af36
Switch to single quotes
Setsugennoao Sep 19, 2022
637af52
Move utils
Setsugennoao Sep 19, 2022
e3dabe9
Move functions to actions and monkey patch variables
Setsugennoao Sep 19, 2022
e33e3de
Create .gitignore
Setsugennoao Sep 20, 2022
410244d
Update main function
Setsugennoao Sep 20, 2022
c12b13d
Make argv a str too
Setsugennoao Sep 20, 2022
27f7427
Add VSRepoNamespace
Setsugennoao Sep 20, 2022
781c2b9
Fix package print format string
Setsugennoao Sep 20, 2022
b8d3bb1
Merge remote-tracking branch 'upstream/master' into rewrite
Setsugennoao Oct 5, 2022
f452658
Merge remote-tracking branch 'upstream/master' into rewrite
Setsugennoao Nov 11, 2022
b0cce2a
Merge branch 'vapoursynth:master' into rewrite
Setsugennoao Nov 11, 2022
9fe53ec
Merge branch 'vapoursynth:master' into rewrite
Setsugennoao Jan 6, 2023
03e00d3
Merge branch 'vapoursynth:master' into rewrite
Setsugennoao Jan 6, 2023
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
47 changes: 47 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[flake8]
count = True
ignore = W503
max-line-length = 120
exclude = stubs/*
show-source = True
statistics = True


[mypy]
mypy_path = ./stubs/

python_version = 3.8

ignore_missing_imports = False

disallow_any_generics = True

disallow_untyped_defs = True
disallow_incomplete_defs = True
check_untyped_defs = True
disallow_untyped_decorators = True

no_implicit_optional = True
strict_optional = True

warn_redundant_casts = True
warn_unused_ignores = True
warn_no_return = True
warn_return_any = True
warn_unreachable = True

show_none_errors = True
ignore_errors = False
disable_error_code=valid-type

allow_untyped_globals = False
allow_redefinition = False
implicit_reexport = False
strict_equality = True

show_error_context = False
show_column_numbers = True
show_error_codes = True
color_output = True
error_summary = True
pretty = True
88 changes: 47 additions & 41 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,50 +1,56 @@
from setuptools import setup, find_packages
from os import path
#!/usr/bin/env python3

import platform
from pathlib import Path

modules = []
packages = [
"vsgenstubs", "vsgenstubs4"
]
requirements = []
entrypoints = [
"vsgenstubs=vsgenstubs:main",
"vsgenstubs4=vsgenstubs4:main",
]

if platform.platform().startswith("Windows"):
modules.extend(["vsrepo", "vsrupdate"])
entrypoints.extend([
"vsrepo=vsrepo:noop",
"vsrupdate=vsrupdate:noop"
])
requirements.append("tqdm")

here = path.abspath(path.dirname(__file__))
with open(path.join(here, 'README.md'), encoding='utf-8') as f:
long_description = f.read()

setup(
name="vsrepo",
version="50",
description="A simple package repository for VapourSynth.",
long_description = long_description,
long_description_content_type = "text/markdown",
url="http://www.vapoursynth.com/",
author = "Myrsloik",
packages=packages,
py_modules = modules,
import setuptools

package_name = 'vsrepo'

is_windows = platform.platform().startswith('Windows')

packages = ['vsgenstubs', 'vsgenstubs4']
modules = requirements = []

if is_windows:
modules = ['vsrepo', 'vsrupdate']
requirements = ['tqdm']

entrypoints = [*packages, *modules]


setuptools.setup(
name=package_name,
version='50',
author='Myrsloik',
author_email='fredrik.mellbin@gmail.com',
description='A simple package repository for VapourSynth',
long_description=Path('README.md').read_text(),
long_description_content_type='text/markdown',
url='https://www.vapoursynth.com/',
project_urls={
'Issues': 'https://github.com/vapoursynth/vsrepo/issues',
'Source': 'https://github.com/vapoursynth/vsrepo'
},
install_requires=requirements,
python_requires='>=3.8',
py_modules=modules,
packages=[
*packages, *modules, 'utils'
],
include_package_data=True,
package_data={
package: ["*.pyi"] for package in packages
package: ['*.pyi', 'py.typed'] for package in packages
},
entry_points = {
'console_scripts': entrypoints
},
project_urls={
"Issues": "https://github.com/vapoursynth/vsrepo/issues",
"Source": "https://github.com/vapoursynth/vsrepo"
classifiers=[
'Programming Language :: Python :: 3',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
],
entry_points={
'console_scripts': [
f'{module}={module}:main'
for module in entrypoints
]
}
)
Empty file added vsgenstubs/py.typed
Empty file.
Empty file added vsgenstubs4/py.typed
Empty file.
Loading