py2docfx 0.1.9.dev1897607__py3-none-any.whl → 0.1.9.dev1926139__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- py2docfx/__main__.py +77 -22
- py2docfx/convert_prepare/environment.py +59 -19
- py2docfx/convert_prepare/generate_document.py +12 -5
- py2docfx/convert_prepare/get_source.py +5 -1
- py2docfx/convert_prepare/git.py +24 -20
- py2docfx/convert_prepare/package_info.py +15 -9
- py2docfx/convert_prepare/pip_utils.py +29 -8
- py2docfx/convert_prepare/post_process/merge_toc.py +5 -1
- py2docfx/convert_prepare/sphinx_caller.py +31 -14
- py2docfx/convert_prepare/tests/test_generate_document.py +6 -4
- py2docfx/convert_prepare/tests/test_get_source.py +6 -6
- py2docfx/convert_prepare/tests/test_params.py +1 -1
- py2docfx/convert_prepare/tests/test_sphinx_caller.py +5 -3
- py2docfx/convert_prepare/tests/utils.py +11 -0
- py2docfx/docfx_yaml/build_finished.py +11 -3
- py2docfx/docfx_yaml/convert_class.py +4 -2
- py2docfx/docfx_yaml/convert_enum.py +4 -2
- py2docfx/docfx_yaml/convert_module.py +4 -2
- py2docfx/docfx_yaml/convert_package.py +4 -2
- py2docfx/docfx_yaml/logger.py +68 -0
- py2docfx/docfx_yaml/process_doctree.py +6 -4
- py2docfx/docfx_yaml/translator.py +5 -7
- py2docfx/docfx_yaml/writer.py +10 -4
- py2docfx/docfx_yaml/yaml_builder.py +0 -1
- py2docfx/venv/basevenv/Lib/site-packages/_distutils_hack/__init__.py +2 -3
- py2docfx/venv/basevenv/Lib/site-packages/packaging/__init__.py +2 -2
- py2docfx/venv/basevenv/Lib/site-packages/packaging/_elffile.py +4 -4
- py2docfx/venv/basevenv/Lib/site-packages/packaging/_manylinux.py +1 -0
- py2docfx/venv/basevenv/Lib/site-packages/packaging/licenses/__init__.py +145 -0
- py2docfx/venv/basevenv/Lib/site-packages/packaging/licenses/_spdx.py +759 -0
- py2docfx/venv/basevenv/Lib/site-packages/packaging/markers.py +15 -9
- py2docfx/venv/basevenv/Lib/site-packages/packaging/metadata.py +83 -24
- py2docfx/venv/basevenv/Lib/site-packages/packaging/specifiers.py +19 -8
- py2docfx/venv/basevenv/Lib/site-packages/packaging/tags.py +78 -29
- py2docfx/venv/basevenv/Lib/site-packages/packaging/utils.py +33 -44
- py2docfx/venv/basevenv/Lib/site-packages/packaging/version.py +26 -7
- py2docfx/venv/basevenv/Lib/site-packages/pkg_resources/__init__.py +27 -32
- py2docfx/venv/basevenv/Lib/site-packages/pkg_resources/tests/test_pkg_resources.py +4 -4
- py2docfx/venv/basevenv/Lib/site-packages/pkg_resources/tests/test_resources.py +7 -7
- py2docfx/venv/basevenv/Lib/site-packages/pkg_resources/tests/test_working_set.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/__init__.py +7 -9
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/compat/py38.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/dir_util.py +3 -8
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_distutils/tests/test_dir_util.py +22 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_importlib.py +1 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_path.py +5 -8
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_reqs.py +2 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_shutil.py +53 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/__init__.py +2 -2
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/_elffile.py +4 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/_manylinux.py +1 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/licenses/__init__.py +145 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/licenses/_spdx.py +759 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/markers.py +15 -9
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/metadata.py +83 -24
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/specifiers.py +19 -8
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/tags.py +78 -29
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/utils.py +33 -44
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/packaging/version.py +26 -7
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/archive_util.py +6 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/build_meta.py +25 -19
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/__init__.py +9 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/_requirestxt.py +4 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/alias.py +3 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/bdist_egg.py +27 -13
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/bdist_rpm.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/bdist_wheel.py +43 -84
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/build.py +3 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/build_clib.py +2 -9
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/build_ext.py +15 -14
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/build_py.py +26 -30
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/develop.py +4 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/dist_info.py +3 -7
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/easy_install.py +57 -80
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/editable_wheel.py +21 -23
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/egg_info.py +32 -32
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/install.py +31 -13
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/install_egg_info.py +4 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/install_lib.py +10 -7
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/install_scripts.py +2 -2
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/rotate.py +6 -6
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/saveopts.py +2 -2
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/sdist.py +11 -10
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/command/setopt.py +3 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/config/_apply_pyprojecttoml.py +19 -14
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/config/expand.py +22 -16
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/config/pyprojecttoml.py +12 -10
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/config/setupcfg.py +39 -47
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/depends.py +26 -7
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/discovery.py +21 -14
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/dist.py +51 -47
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/errors.py +21 -26
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/extension.py +18 -6
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/glob.py +35 -15
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/installer.py +6 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/launch.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/logging.py +2 -2
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/modified.py +16 -6
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/monkey.py +5 -5
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/msvc.py +35 -24
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/namespaces.py +2 -2
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/package_index.py +42 -43
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/sandbox.py +19 -12
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/config/downloads/__init__.py +5 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/config/test_apply_pyprojecttoml.py +7 -6
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/config/test_expand.py +3 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/config/test_pyprojecttoml.py +2 -2
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py +21 -11
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/config/test_setupcfg.py +12 -16
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/integration/test_pip_install_sdist.py +10 -11
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_bdist_egg.py +7 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_bdist_wheel.py +10 -33
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_build_ext.py +2 -2
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_build_meta.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_build_py.py +6 -6
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_config_discovery.py +4 -4
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_core_metadata.py +171 -76
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_dist.py +11 -13
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_dist_info.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_distutils_adoption.py +44 -5
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_easy_install.py +32 -26
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_editable_install.py +10 -6
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_egg_info.py +15 -15
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_glob.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_logging.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_manifest.py +2 -8
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_packageindex.py +6 -17
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_setuptools.py +4 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_shutil_wrapper.py +23 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_wheel.py +29 -20
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/tests/test_windows_wrappers.py +3 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/unicode_utils.py +3 -3
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/warnings.py +5 -2
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/wheel.py +4 -4
- py2docfx/venv/basevenv/Lib/site-packages/wheel/__init__.py +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/wheel/_bdist_wheel.py +9 -0
- py2docfx/venv/basevenv/Lib/site-packages/wheel/bdist_wheel.py +17 -2
- py2docfx/venv/basevenv/Lib/site-packages/wheel/cli/convert.py +279 -220
- py2docfx/venv/basevenv/Lib/site-packages/wheel/util.py +0 -9
- py2docfx/venv/venv1/Lib/site-packages/_distutils_hack/__init__.py +2 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/_enum_meta.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/_pipeline_client.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/azure/core/_pipeline_client_async.py +5 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/_version.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/credentials.py +6 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/exceptions.py +13 -5
- py2docfx/venv/venv1/Lib/site-packages/azure/core/messaging.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/paging.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/__init__.py +16 -5
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/_base.py +15 -4
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/_base_async.py +20 -10
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/_tools.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_authentication.py +55 -19
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_authentication_async.py +46 -15
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_custom_hook.py +8 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_distributed_tracing.py +9 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_redirect.py +9 -2
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_redirect_async.py +4 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_retry.py +27 -8
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_retry_async.py +6 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_sensitive_header_cleanup_policy.py +4 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_universal.py +6 -10
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/policies/_utils.py +101 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/transport/__init__.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/transport/_aiohttp.py +9 -2
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/transport/_base.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/transport/_base_async.py +7 -5
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/transport/_requests_asyncio.py +0 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/transport/_requests_basic.py +11 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/pipeline/transport/_requests_trio.py +11 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/polling/_async_poller.py +5 -2
- py2docfx/venv/venv1/Lib/site-packages/azure/core/polling/_poller.py +4 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/polling/async_base_polling.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/polling/base_polling.py +47 -16
- py2docfx/venv/venv1/Lib/site-packages/azure/core/rest/_helpers.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/rest/_http_response_impl.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/rest/_requests_basic.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/serialization.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/settings.py +15 -3
- py2docfx/venv/venv1/Lib/site-packages/azure/core/tracing/_abstract_span.py +15 -5
- py2docfx/venv/venv1/Lib/site-packages/azure/core/tracing/common.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/tracing/decorator.py +12 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/tracing/decorator_async.py +24 -4
- py2docfx/venv/venv1/Lib/site-packages/azure/core/tracing/ext/opencensus_span/__init__.py +119 -110
- py2docfx/venv/venv1/Lib/site-packages/azure/core/tracing/ext/opencensus_span/_version.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/utils/_pipeline_transport_rest_shared.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/azure/core/utils/_pipeline_transport_rest_shared_async.py +10 -1
- py2docfx/venv/venv1/Lib/site-packages/google/api/client_pb2.py +41 -39
- py2docfx/venv/venv1/Lib/site-packages/google/api/error_reason_pb2.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/google/api/httpbody_pb2.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/google/api/metric_pb2.py +17 -11
- py2docfx/venv/venv1/Lib/site-packages/google/api_core/client_options.py +17 -13
- py2docfx/venv/venv1/Lib/site-packages/google/api_core/protobuf_helpers.py +1 -3
- py2docfx/venv/venv1/Lib/site-packages/google/api_core/version.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/google/auth/_default.py +4 -0
- py2docfx/venv/venv1/Lib/site-packages/google/auth/compute_engine/_metadata.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/google/auth/iam.py +25 -8
- py2docfx/venv/venv1/Lib/site-packages/google/auth/impersonated_credentials.py +34 -16
- py2docfx/venv/venv1/Lib/site-packages/google/auth/transport/_requests_base.py +2 -1
- py2docfx/venv/venv1/Lib/site-packages/google/auth/transport/requests.py +2 -3
- py2docfx/venv/venv1/Lib/site-packages/google/auth/version.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/google/oauth2/_client.py +10 -2
- py2docfx/venv/venv1/Lib/site-packages/google/oauth2/service_account.py +1 -0
- py2docfx/venv/venv1/Lib/site-packages/jwt/__init__.py +3 -2
- py2docfx/venv/venv1/Lib/site-packages/jwt/algorithms.py +31 -16
- py2docfx/venv/venv1/Lib/site-packages/jwt/api_jws.py +19 -8
- py2docfx/venv/venv1/Lib/site-packages/jwt/api_jwt.py +75 -19
- py2docfx/venv/venv1/Lib/site-packages/jwt/exceptions.py +8 -0
- py2docfx/venv/venv1/Lib/site-packages/jwt/help.py +4 -1
- py2docfx/venv/venv1/Lib/site-packages/jwt/jwks_client.py +4 -2
- py2docfx/venv/venv1/Lib/site-packages/jwt/utils.py +7 -10
- py2docfx/venv/venv1/Lib/site-packages/msal/application.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/msal/managed_identity.py +5 -3
- py2docfx/venv/venv1/Lib/site-packages/pkg_resources/__init__.py +27 -32
- py2docfx/venv/venv1/Lib/site-packages/pkg_resources/tests/test_pkg_resources.py +4 -4
- py2docfx/venv/venv1/Lib/site-packages/pkg_resources/tests/test_resources.py +7 -7
- py2docfx/venv/venv1/Lib/site-packages/pkg_resources/tests/test_working_set.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/proto/enums.py +3 -1
- py2docfx/venv/venv1/Lib/site-packages/proto/marshal/collections/repeated.py +7 -2
- py2docfx/venv/venv1/Lib/site-packages/proto/marshal/compat.py +18 -21
- py2docfx/venv/venv1/Lib/site-packages/proto/marshal/rules/message.py +7 -3
- py2docfx/venv/venv1/Lib/site-packages/proto/message.py +6 -35
- py2docfx/venv/venv1/Lib/site-packages/proto/version.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/__init__.py +7 -9
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/compat/py38.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/dir_util.py +3 -8
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_distutils/tests/test_dir_util.py +22 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_importlib.py +1 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_path.py +5 -8
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_reqs.py +2 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_shutil.py +53 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/__init__.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/_elffile.py +4 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/_manylinux.py +1 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/licenses/__init__.py +145 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/licenses/_spdx.py +759 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/markers.py +15 -9
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/metadata.py +83 -24
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/specifiers.py +19 -8
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/tags.py +78 -29
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/utils.py +33 -44
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/packaging/version.py +26 -7
- py2docfx/venv/venv1/Lib/site-packages/setuptools/archive_util.py +6 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/build_meta.py +25 -19
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/__init__.py +9 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/_requirestxt.py +4 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/alias.py +3 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/bdist_egg.py +27 -13
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/bdist_rpm.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/bdist_wheel.py +43 -84
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/build.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/build_clib.py +2 -9
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/build_ext.py +15 -14
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/build_py.py +26 -30
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/develop.py +4 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/dist_info.py +3 -7
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/easy_install.py +57 -80
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/editable_wheel.py +21 -23
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/egg_info.py +32 -32
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/install.py +31 -13
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/install_egg_info.py +4 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/install_lib.py +10 -7
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/install_scripts.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/rotate.py +6 -6
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/saveopts.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/sdist.py +11 -10
- py2docfx/venv/venv1/Lib/site-packages/setuptools/command/setopt.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/config/_apply_pyprojecttoml.py +19 -14
- py2docfx/venv/venv1/Lib/site-packages/setuptools/config/expand.py +22 -16
- py2docfx/venv/venv1/Lib/site-packages/setuptools/config/pyprojecttoml.py +12 -10
- py2docfx/venv/venv1/Lib/site-packages/setuptools/config/setupcfg.py +39 -47
- py2docfx/venv/venv1/Lib/site-packages/setuptools/depends.py +26 -7
- py2docfx/venv/venv1/Lib/site-packages/setuptools/discovery.py +21 -14
- py2docfx/venv/venv1/Lib/site-packages/setuptools/dist.py +51 -47
- py2docfx/venv/venv1/Lib/site-packages/setuptools/errors.py +21 -26
- py2docfx/venv/venv1/Lib/site-packages/setuptools/extension.py +18 -6
- py2docfx/venv/venv1/Lib/site-packages/setuptools/glob.py +35 -15
- py2docfx/venv/venv1/Lib/site-packages/setuptools/installer.py +6 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/launch.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/logging.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/modified.py +16 -6
- py2docfx/venv/venv1/Lib/site-packages/setuptools/monkey.py +5 -5
- py2docfx/venv/venv1/Lib/site-packages/setuptools/msvc.py +35 -24
- py2docfx/venv/venv1/Lib/site-packages/setuptools/namespaces.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/package_index.py +42 -43
- py2docfx/venv/venv1/Lib/site-packages/setuptools/sandbox.py +19 -12
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/config/downloads/__init__.py +5 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/config/test_apply_pyprojecttoml.py +7 -6
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/config/test_expand.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/config/test_pyprojecttoml.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py +21 -11
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/config/test_setupcfg.py +12 -16
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/integration/test_pip_install_sdist.py +10 -11
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_bdist_egg.py +7 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_bdist_wheel.py +10 -33
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_build_ext.py +2 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_build_meta.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_build_py.py +6 -6
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_config_discovery.py +4 -4
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_core_metadata.py +171 -76
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_dist.py +11 -13
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_dist_info.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_distutils_adoption.py +44 -5
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_easy_install.py +32 -26
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_editable_install.py +10 -6
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_egg_info.py +15 -15
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_glob.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_logging.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_manifest.py +2 -8
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_packageindex.py +6 -17
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_setuptools.py +4 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_shutil_wrapper.py +23 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_wheel.py +29 -20
- py2docfx/venv/venv1/Lib/site-packages/setuptools/tests/test_windows_wrappers.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/unicode_utils.py +3 -3
- py2docfx/venv/venv1/Lib/site-packages/setuptools/warnings.py +5 -2
- py2docfx/venv/venv1/Lib/site-packages/setuptools/wheel.py +4 -4
- py2docfx/venv/venv1/Lib/site-packages/wheel/__init__.py +1 -1
- py2docfx/venv/venv1/Lib/site-packages/wheel/_bdist_wheel.py +9 -0
- py2docfx/venv/venv1/Lib/site-packages/wheel/bdist_wheel.py +17 -2
- py2docfx/venv/venv1/Lib/site-packages/wheel/cli/convert.py +279 -220
- py2docfx/venv/venv1/Lib/site-packages/wheel/util.py +0 -9
- {py2docfx-0.1.9.dev1897607.dist-info → py2docfx-0.1.9.dev1926139.dist-info}/METADATA +1 -1
- {py2docfx-0.1.9.dev1897607.dist-info → py2docfx-0.1.9.dev1926139.dist-info}/RECORD +327 -385
- {py2docfx-0.1.9.dev1897607.dist-info → py2docfx-0.1.9.dev1926139.dist-info}/WHEEL +1 -1
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/__init__.py +0 -36
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/_adapters.py +0 -168
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/_common.py +0 -210
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/_itertools.py +0 -38
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/abc.py +0 -171
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/compat/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/compat/py38.py +0 -11
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/compat/py39.py +0 -10
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/functional.py +0 -81
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/future/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/future/adapters.py +0 -95
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/readers.py +0 -194
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/simple.py +0 -106
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/_path.py +0 -56
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/compat/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/compat/py312.py +0 -18
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/compat/py39.py +0 -10
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data01/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data01/subdirectory/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data02/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data02/one/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data02/two/__init__.py +0 -0
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_compatibilty_files.py +0 -104
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_contents.py +0 -43
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_custom.py +0 -47
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_files.py +0 -117
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_functional.py +0 -242
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_open.py +0 -89
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_path.py +0 -65
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_read.py +0 -97
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_reader.py +0 -145
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_resource.py +0 -241
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/util.py +0 -164
- py2docfx/venv/basevenv/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/zip.py +0 -32
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/__init__.py +0 -36
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/_adapters.py +0 -168
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/_common.py +0 -210
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/_itertools.py +0 -38
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/abc.py +0 -171
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/compat/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/compat/py38.py +0 -11
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/compat/py39.py +0 -10
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/functional.py +0 -81
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/future/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/future/adapters.py +0 -95
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/readers.py +0 -194
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/simple.py +0 -106
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/_path.py +0 -56
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/compat/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/compat/py312.py +0 -18
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/compat/py39.py +0 -10
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data01/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data01/subdirectory/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data02/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data02/one/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/data02/two/__init__.py +0 -0
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_compatibilty_files.py +0 -104
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_contents.py +0 -43
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_custom.py +0 -47
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_files.py +0 -117
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_functional.py +0 -242
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_open.py +0 -89
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_path.py +0 -65
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_read.py +0 -97
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_reader.py +0 -145
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/test_resource.py +0 -241
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/util.py +0 -164
- py2docfx/venv/venv1/Lib/site-packages/setuptools/_vendor/importlib_resources/tests/zip.py +0 -32
- /py2docfx/convert_prepare/conf_templates/{master_doc.rst_t → root_doc.rst_t} +0 -0
- {py2docfx-0.1.9.dev1897607.dist-info → py2docfx-0.1.9.dev1926139.dist-info}/top_level.txt +0 -0
py2docfx/__main__.py
CHANGED
@@ -1,11 +1,13 @@
|
|
1
1
|
from __future__ import annotations # Avoid A | B annotation break under <= py3.9
|
2
2
|
import asyncio
|
3
3
|
import argparse
|
4
|
+
import logging
|
4
5
|
import os
|
5
6
|
import sys
|
6
7
|
import shutil
|
7
8
|
|
8
9
|
from py2docfx import PACKAGE_ROOT
|
10
|
+
from py2docfx.docfx_yaml.logger import get_logger
|
9
11
|
from py2docfx.convert_prepare.constants import SOURCE_REPO, TARGET_REPO, DIST_TEMP
|
10
12
|
from py2docfx.convert_prepare.generate_document import generate_document
|
11
13
|
from py2docfx.convert_prepare.get_source import YAML_OUTPUT_ROOT
|
@@ -14,11 +16,6 @@ from py2docfx.convert_prepare.params import load_file_params, load_command_param
|
|
14
16
|
from py2docfx.convert_prepare.package_info import PackageInfo
|
15
17
|
import py2docfx.convert_prepare.environment as py2docfxEnvironment
|
16
18
|
|
17
|
-
|
18
|
-
print("Adding yaml extension to path")
|
19
|
-
sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),'docfx_yaml'))
|
20
|
-
os.chdir(PACKAGE_ROOT)
|
21
|
-
|
22
19
|
def get_parser() -> argparse.ArgumentParser:
|
23
20
|
parser = argparse.ArgumentParser(
|
24
21
|
description=(
|
@@ -144,26 +141,40 @@ def get_parser() -> argparse.ArgumentParser:
|
|
144
141
|
help="""A list containing relative paths to the root of the package of files/directories
|
145
142
|
excluded when generating documents, should follow fnmatch-style.""",
|
146
143
|
)
|
144
|
+
|
145
|
+
parser.add_argument(
|
146
|
+
"--verbose",
|
147
|
+
action="store_true",
|
148
|
+
help="""Increase output verbosity. Cannot be used together with --show-warning""",
|
149
|
+
)
|
150
|
+
|
151
|
+
parser.add_argument(
|
152
|
+
"--show-warning",
|
153
|
+
action="store_true",
|
154
|
+
help="""Show warning message. Cannot be used together with --verbose""",
|
155
|
+
)
|
147
156
|
return parser
|
148
157
|
|
149
158
|
|
150
159
|
def parse_command_line_args(argv) -> (
|
151
|
-
list[PackageInfo], list[PackageInfo], str, str, str | os.PathLike, bool):
|
160
|
+
list[PackageInfo], list[PackageInfo], str, str, str | os.PathLike, bool, bool):
|
152
161
|
parser = get_parser()
|
153
162
|
args = parser.parse_args(argv)
|
154
163
|
|
155
164
|
github_token = args.github_token
|
156
165
|
ado_token = args.ado_token
|
157
166
|
output_root = args.output_root
|
167
|
+
verbose = args.verbose
|
168
|
+
show_warning = args.show_warning
|
158
169
|
|
159
170
|
if args.param_file_path:
|
160
171
|
(package_info_list, required_packages) = load_file_params(args.param_file_path)
|
161
172
|
return (list(package_info_list), list(required_packages), github_token,
|
162
|
-
ado_token, output_root)
|
173
|
+
ado_token, output_root, verbose, show_warning)
|
163
174
|
elif args.param_json:
|
164
175
|
(package_info_list, required_packages) = load_command_params(args.param_json)
|
165
176
|
return (package_info_list, required_packages, github_token,
|
166
|
-
ado_token, output_root)
|
177
|
+
ado_token, output_root, verbose, show_warning)
|
167
178
|
else:
|
168
179
|
package_info = PackageInfo()
|
169
180
|
if not args.install_type:
|
@@ -194,11 +205,11 @@ def parse_command_line_args(argv) -> (
|
|
194
205
|
package_info.folder = args.folder
|
195
206
|
if not package_info.url:
|
196
207
|
if not package_info.folder:
|
197
|
-
|
198
|
-
|
199
|
-
)
|
208
|
+
msg = "When install_type is source_code, folder or url should be provided"
|
209
|
+
raise ValueError(msg)
|
200
210
|
else:
|
201
|
-
|
211
|
+
msg = f"Read source code from local folder: {package_info.folder}"
|
212
|
+
logging.info(msg)
|
202
213
|
|
203
214
|
if package_info.install_type == PackageInfo.InstallType.DIST_FILE:
|
204
215
|
package_info.location = args.location
|
@@ -208,7 +219,7 @@ def parse_command_line_args(argv) -> (
|
|
208
219
|
"None",
|
209
220
|
condition="When install_type is dist_file",
|
210
221
|
)
|
211
|
-
return ([package_info], [], github_token, ado_token, output_root)
|
222
|
+
return ([package_info], [], github_token, ado_token, output_root, verbose, show_warning)
|
212
223
|
|
213
224
|
async def donwload_package_generate_documents(
|
214
225
|
package_info_list: list[PackageInfo],
|
@@ -216,6 +227,8 @@ async def donwload_package_generate_documents(
|
|
216
227
|
output_doc_folder: os.PathLike | None,
|
217
228
|
github_token: str, ado_token: str, required_package_list: list):
|
218
229
|
|
230
|
+
docfx_logger = get_logger(__name__)
|
231
|
+
|
219
232
|
start_num = len(required_package_list)
|
220
233
|
env_prepare_tasks = []
|
221
234
|
env_remove_tasks = []
|
@@ -229,12 +242,16 @@ async def donwload_package_generate_documents(
|
|
229
242
|
py2docfxEnvironment.prepare_base_venv(required_package_list, github_token, ado_token))
|
230
243
|
|
231
244
|
for idx, package in enumerate(package_info_list):
|
245
|
+
os.environ['PROCESSING_PACKAGE_NAME'] = package.name
|
232
246
|
package_number = start_num + idx
|
233
|
-
|
247
|
+
msg = f"Processing package {package.name}, env_prepare_tasks: {len(env_prepare_tasks)}"
|
248
|
+
docfx_logger.info(msg)
|
249
|
+
|
234
250
|
try:
|
235
251
|
await env_prepare_tasks[idx]
|
236
252
|
except Exception as e:
|
237
|
-
|
253
|
+
msg = f"Failed to setup venv for package {package.name}: {e}"
|
254
|
+
docfx_logger.error(msg)
|
238
255
|
raise
|
239
256
|
|
240
257
|
generate_document(package, output_root,
|
@@ -249,7 +266,10 @@ async def donwload_package_generate_documents(
|
|
249
266
|
|
250
267
|
if idx + py2docfxEnvironment.VENV_BUFFER < len(package_info_list):
|
251
268
|
buffer_package_idx = idx + py2docfxEnvironment.VENV_BUFFER
|
252
|
-
|
269
|
+
|
270
|
+
msg = f"Creating venv {buffer_package_idx}"
|
271
|
+
docfx_logger.info(msg)
|
272
|
+
|
253
273
|
env_prepare_tasks.append(
|
254
274
|
asyncio.create_task(py2docfxEnvironment.prepare_venv(buffer_package_idx,
|
255
275
|
package_info_list[buffer_package_idx],
|
@@ -262,7 +282,8 @@ async def donwload_package_generate_documents(
|
|
262
282
|
py2docfxEnvironment.remove_environment(idx-1)))
|
263
283
|
|
264
284
|
if idx > py2docfxEnvironment.VENV_BUFFER and env_remove_tasks[idx-py2docfxEnvironment.VENV_BUFFER] != None:
|
265
|
-
|
285
|
+
msg = f"Removing venv {idx-py2docfxEnvironment.VENV_BUFFER}"
|
286
|
+
docfx_logger.info(msg)
|
266
287
|
await env_remove_tasks[idx-py2docfxEnvironment.VENV_BUFFER]
|
267
288
|
|
268
289
|
if output_doc_folder:
|
@@ -295,24 +316,58 @@ def temp_folder_clean_up(folder_list: list[str | os.PathLike]) -> None:
|
|
295
316
|
if os.path.exists(folder):
|
296
317
|
shutil.rmtree(folder)
|
297
318
|
|
298
|
-
def
|
299
|
-
|
300
|
-
|
319
|
+
def decide_global_log_level(verbose: bool, show_warning: bool) -> None:
|
320
|
+
if verbose and show_warning:
|
321
|
+
raise ValueError("Cannot use --verbose and --show-warning at the same time")
|
322
|
+
if verbose:
|
323
|
+
os.environ['LOG_LEVEL'] = 'INFO'
|
324
|
+
return
|
325
|
+
if show_warning:
|
326
|
+
os.environ['LOG_LEVEL'] = 'WARNING'
|
327
|
+
return
|
328
|
+
|
329
|
+
# Default log level
|
330
|
+
os.environ['LOG_LEVEL'] = 'ERROR'
|
301
331
|
|
332
|
+
def prepare_log_folder() -> None:
|
333
|
+
if not os.path.exists('logs'):
|
334
|
+
os.makedirs('logs')
|
335
|
+
os.makedirs(os.path.join('logs', 'package_logs'))
|
336
|
+
else:
|
337
|
+
shutil.rmtree('logs')
|
338
|
+
os.makedirs('logs')
|
339
|
+
os.makedirs(os.path.join('logs', 'package_logs'))
|
340
|
+
|
341
|
+
def main(argv) -> int:
|
302
342
|
# TODO: may need to purge pip cache
|
303
343
|
(package_info_list,
|
304
344
|
required_package_list,
|
305
345
|
github_token, ado_token,
|
306
|
-
output_root
|
346
|
+
output_root, verbose,
|
347
|
+
show_warning) = parse_command_line_args(argv)
|
307
348
|
|
349
|
+
decide_global_log_level(verbose, show_warning)
|
350
|
+
prepare_log_folder()
|
351
|
+
|
352
|
+
docfx_logger = get_logger(__name__)
|
353
|
+
|
354
|
+
msg = "Adding yaml extension to path"
|
355
|
+
docfx_logger.info(msg)
|
356
|
+
|
357
|
+
sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),'docfx_yaml'))
|
358
|
+
os.chdir(PACKAGE_ROOT)
|
308
359
|
output_doc_folder = prepare_out_dir(output_root)
|
360
|
+
|
361
|
+
clean_up_folder_list = [py2docfxEnvironment.VENV_DIR, DIST_TEMP, SOURCE_REPO, TARGET_REPO]
|
362
|
+
temp_folder_clean_up(clean_up_folder_list)
|
309
363
|
|
310
364
|
try:
|
311
365
|
asyncio.run(donwload_package_generate_documents(
|
312
366
|
package_info_list, output_root, output_doc_folder,
|
313
367
|
github_token, ado_token, required_package_list))
|
314
368
|
except Exception as e:
|
315
|
-
|
369
|
+
msg = f"An error occurred: {e}"
|
370
|
+
docfx_logger.error(msg)
|
316
371
|
raise
|
317
372
|
return 0
|
318
373
|
|
@@ -1,17 +1,19 @@
|
|
1
1
|
import subprocess
|
2
2
|
import asyncio
|
3
3
|
import os
|
4
|
+
import sys
|
4
5
|
from py2docfx import PACKAGE_ROOT
|
5
6
|
from py2docfx.convert_prepare.package_info import PackageInfo
|
6
7
|
from py2docfx.convert_prepare.get_source import get_source
|
7
8
|
from py2docfx.convert_prepare import pip_utils
|
9
|
+
from py2docfx.docfx_yaml.logger import get_logger
|
8
10
|
|
9
11
|
REQUIREMENT_MODULES = ["setuptools", "sphinx==6.1.3", "pyyaml", "jinja2==3.0.3", "wheel"]
|
10
12
|
VENV_REQUIREMENT_MODULES = ["setuptools", "wheel"] # to support running setup.py in venv
|
11
13
|
VENV_DIR = "venv"
|
12
14
|
VENV_BUFFER = 10
|
13
15
|
VENV_DELETE_BUFFER = 10
|
14
|
-
PIP_INSTALL_COMMAND = ["-m", "pip", "install", "--upgrade"]
|
16
|
+
PIP_INSTALL_COMMAND = ["-m", "pip", "install", "--upgrade"]
|
15
17
|
|
16
18
|
PIP_INSTALL_VENV_COMMON_OPTIONS = [
|
17
19
|
"--quiet",
|
@@ -26,7 +28,7 @@ def install_converter_requirements(executable: str):
|
|
26
28
|
https://apidrop.visualstudio.com/Content%20CI/_git/ReferenceAutomation?path=/Python/InstallPackage.ps1&line=15&lineEnd=35&lineStartColumn=1&lineEndColumn=87&lineStyle=plain&_a=contents
|
27
29
|
"""
|
28
30
|
pip_install_cmd = [executable, "-m", "pip", "install", "--upgrade"]
|
29
|
-
|
31
|
+
docfx_logger = get_logger(__name__)
|
30
32
|
pip_install_common_options = [
|
31
33
|
"--no-cache-dir",
|
32
34
|
"--quiet",
|
@@ -36,7 +38,8 @@ def install_converter_requirements(executable: str):
|
|
36
38
|
]
|
37
39
|
|
38
40
|
for module in REQUIREMENT_MODULES:
|
39
|
-
|
41
|
+
msg = f"<CI INFO>: Upgrading {module}..."
|
42
|
+
docfx_logger.info(msg)
|
40
43
|
subprocess.run(
|
41
44
|
pip_install_cmd + [module] + pip_install_common_options, check=True
|
42
45
|
)
|
@@ -44,7 +47,8 @@ def install_converter_requirements(executable: str):
|
|
44
47
|
async def install_venv_requirements(venv_num: int):
|
45
48
|
venv_exe = get_venv_exe(venv_num)
|
46
49
|
pip_cmd = ["-m", "pip", "install", "--upgrade"]+ VENV_REQUIREMENT_MODULES
|
47
|
-
await(await asyncio.create_subprocess_exec(venv_exe, *pip_cmd)).wait()
|
50
|
+
# await(await asyncio.create_subprocess_exec(venv_exe, *pip_cmd)).wait()
|
51
|
+
await pip_utils.run_async_subprocess(venv_exe, pip_cmd)
|
48
52
|
|
49
53
|
def get_venv_path(venv_num: int) -> str:
|
50
54
|
return os.path.join(PACKAGE_ROOT, VENV_DIR, "venv"+str(venv_num))
|
@@ -53,20 +57,36 @@ def get_base_venv_path() -> str:
|
|
53
57
|
return os.path.join(PACKAGE_ROOT, VENV_DIR, "basevenv")
|
54
58
|
|
55
59
|
def get_venv_exe(venv_num: int) -> str:
|
56
|
-
|
60
|
+
if os.name == 'nt':
|
61
|
+
return os.path.join(get_venv_path(venv_num), "Scripts", "python.exe")
|
62
|
+
else:
|
63
|
+
return os.path.join(get_venv_path(venv_num), "bin", "python3")
|
57
64
|
|
58
65
|
def get_base_venv_exe() -> str:
|
59
|
-
|
66
|
+
if os.name == 'nt':
|
67
|
+
return os.path.join(get_base_venv_path(), "Scripts", "python.exe")
|
68
|
+
else:
|
69
|
+
return os.path.join(get_base_venv_path(), "bin", "python3")
|
60
70
|
|
61
71
|
def get_venv_package_path(venv_num: int) -> str:
|
62
|
-
|
72
|
+
if os.name == 'nt': # Windows
|
73
|
+
return os.path.join(get_venv_path(venv_num), "Lib", "site-packages")
|
74
|
+
else: # Linux and other Unix-like systems
|
75
|
+
python_version = f"python{sys.version_info.major}.{sys.version_info.minor}" # venv version should be same as native
|
76
|
+
return os.path.join(get_venv_path(venv_num), "lib", python_version, "site-packages")
|
63
77
|
|
64
78
|
def get_base_venv_sphinx_build_path() -> str:
|
65
|
-
|
79
|
+
if os.name == 'nt': # Windows
|
80
|
+
return os.path.join(get_base_venv_path(), "Lib", "site-packages", "sphinx", "cmd", "build.py")
|
81
|
+
else: # Linux and other Unix-like systems
|
82
|
+
python_version = f"python{sys.version_info.major}.{sys.version_info.minor}" # venv version should be same as native
|
83
|
+
return os.path.join(get_base_venv_path(), "lib", python_version, "site-packages", "sphinx", "cmd", "build.py")
|
84
|
+
|
66
85
|
|
67
86
|
async def install_converter_requirement_async(executable: str):
|
68
87
|
pip_cmd = PIP_INSTALL_COMMAND + PIP_INSTALL_VENV_COMMON_OPTIONS + REQUIREMENT_MODULES
|
69
|
-
await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
|
88
|
+
# await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
|
89
|
+
await pip_utils.run_async_subprocess(executable, pip_cmd)
|
70
90
|
|
71
91
|
async def install_required_packages(
|
72
92
|
executable: str, required_package_list: list[PackageInfo], github_token: str, ado_token: str):
|
@@ -76,32 +96,49 @@ async def install_required_packages(
|
|
76
96
|
# get_source(package, idx, vststoken=ado_token, githubtoken=github_token)
|
77
97
|
package_name, options = package.get_install_command()
|
78
98
|
pip_cmd = PIP_INSTALL_COMMAND + PIP_INSTALL_VENV_COMMON_OPTIONS + options + [package_name]
|
79
|
-
await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
|
99
|
+
# await(await asyncio.create_subprocess_exec(executable, *pip_cmd)).wait()
|
100
|
+
await pip_utils.run_async_subprocess(executable, pip_cmd)
|
80
101
|
|
81
102
|
async def create_environment(venv_path: int):
|
82
|
-
|
103
|
+
if os.name == 'nt':
|
104
|
+
await (await asyncio.create_subprocess_exec("python", "-m", "venv", venv_path)).wait()
|
105
|
+
else: # On linux the default command name is
|
106
|
+
await (await asyncio.create_subprocess_exec("python3", "-m", "venv", venv_path)).wait()
|
83
107
|
|
84
108
|
async def prepare_base_venv(required_package_list: list[PackageInfo], github_token: str, ado_token: str):
|
85
|
-
|
109
|
+
docfx_logger = get_logger(__name__)
|
110
|
+
|
111
|
+
msg = f"<CI INFO>: Creating basevenv..."
|
112
|
+
docfx_logger.info(msg)
|
86
113
|
await create_environment(get_base_venv_path())
|
87
|
-
|
114
|
+
|
115
|
+
msg = f"<CI INFO>: Installing converter requirements in ..."
|
116
|
+
docfx_logger.info(msg)
|
88
117
|
await install_converter_requirement_async(get_base_venv_exe())
|
89
|
-
|
118
|
+
|
119
|
+
msg = f"<CI INFO>: Installing required packages in basevenv..."
|
120
|
+
docfx_logger.info(msg)
|
90
121
|
await install_required_packages(get_base_venv_exe(), required_package_list, github_token, ado_token)
|
91
|
-
|
122
|
+
|
123
|
+
msg = f"<CI INFO>: basevenv setup complete."
|
124
|
+
docfx_logger.info(msg)
|
92
125
|
|
93
126
|
async def prepare_venv(venv_num: int, package_info: PackageInfo, package_number: int, github_token: str, ado_token: str):
|
127
|
+
docfx_logger = get_logger(__name__)
|
94
128
|
await create_environment(get_venv_path(venv_num))
|
95
129
|
await install_venv_requirements(venv_num)
|
96
130
|
get_source(get_venv_exe(venv_num), package_info, package_number, vststoken=ado_token, githubtoken=github_token)
|
97
131
|
package_name, options = package_info.get_install_command()
|
98
132
|
await pip_utils.install_in_exe_async(get_venv_exe(venv_num), package_name, options)
|
99
|
-
|
133
|
+
msg = f"<CI INFO>: venv{venv_num} setup complete."
|
134
|
+
docfx_logger.info(msg)
|
100
135
|
|
101
136
|
async def remove_environment(venv_num: int):
|
137
|
+
docfx_logger = get_logger(__name__)
|
102
138
|
venv_path = get_venv_path(venv_num)
|
103
139
|
if os.path.exists(venv_path):
|
104
|
-
|
140
|
+
msg = f"<CI INFO>: Removing venv{venv_num}..."
|
141
|
+
docfx_logger.info(msg)
|
105
142
|
# Create a subprocess to run the shell command for removing the directory
|
106
143
|
process = await asyncio.create_subprocess_shell(
|
107
144
|
f'rm -rf {venv_path}' if os.name != 'nt' else f'rmdir /S /Q {venv_path}',
|
@@ -110,6 +147,9 @@ async def remove_environment(venv_num: int):
|
|
110
147
|
)
|
111
148
|
stdout, stderr = await process.communicate()
|
112
149
|
if process.returncode == 0:
|
113
|
-
|
150
|
+
msg = f"<CI INFO>: venv{venv_num} removed."
|
151
|
+
docfx_logger.info(msg)
|
114
152
|
else:
|
115
|
-
|
153
|
+
msg = f"<CI ERROR>: Failed to remove venv{venv_num}. Error: {stderr.decode()}"
|
154
|
+
docfx_logger.error(msg)
|
155
|
+
raise RuntimeError()
|
@@ -1,7 +1,7 @@
|
|
1
1
|
from __future__ import annotations # Avoid A | B annotation break under <= py3.9
|
2
2
|
import os
|
3
3
|
import sys
|
4
|
-
|
4
|
+
from py2docfx.docfx_yaml.logger import get_logger
|
5
5
|
from py2docfx.convert_prepare.generate_conf import generate_conf
|
6
6
|
from py2docfx.convert_prepare.git import checkout
|
7
7
|
from py2docfx.convert_prepare.package_info import PackageInfo
|
@@ -11,6 +11,7 @@ from py2docfx.convert_prepare.subpackage import merge_subpackage_files
|
|
11
11
|
CONF_TEMPLATE_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "conf_templates")
|
12
12
|
|
13
13
|
def generate_document(pkg: PackageInfo, output_root: str | os.PathLike, sphinx_build_path: str, extra_package_path: str, executable=sys.executable):
|
14
|
+
docfx_logger = get_logger(__name__)
|
14
15
|
# Copy manual written RST from target doc repo
|
15
16
|
package_paths = pkg.path
|
16
17
|
if output_root:
|
@@ -29,14 +30,20 @@ def generate_document(pkg: PackageInfo, output_root: str | os.PathLike, sphinx_b
|
|
29
30
|
if pkg.install_type == pkg.InstallType.SOURCE_CODE and getattr(pkg, "branch", None):
|
30
31
|
checkout(package_paths.source_folder, pkg.branch)
|
31
32
|
|
32
|
-
|
33
|
+
msg = f"<CI INFO>: Generating RST files for {pkg.name}."
|
34
|
+
docfx_logger.info(msg)
|
35
|
+
|
33
36
|
subpackages_rst_record = run_apidoc(package_paths.doc_folder, package_paths.source_folder,
|
34
37
|
exclude_paths, pkg)
|
35
38
|
|
36
|
-
|
39
|
+
msg = f"<CI INFO>: Listing RST files:"
|
40
|
+
docfx_logger.info(msg)
|
37
41
|
for rst_file in os.listdir(package_paths.doc_folder):
|
38
|
-
|
39
|
-
|
42
|
+
docfx_logger.info(rst_file)
|
43
|
+
|
44
|
+
msg = "<CI INFO>: Running Sphinx build..."
|
45
|
+
docfx_logger.info(msg)
|
46
|
+
|
40
47
|
generate_conf(pkg, package_paths.doc_folder, CONF_TEMPLATE_DIR)
|
41
48
|
run_converter(package_paths.doc_folder, package_paths.yaml_output_folder, sphinx_build_path, extra_package_path, executable=executable)
|
42
49
|
|
@@ -6,6 +6,7 @@ import sys
|
|
6
6
|
import py2docfx.convert_prepare.git as git
|
7
7
|
import py2docfx.convert_prepare.pip_utils as pip_utils
|
8
8
|
import py2docfx.convert_prepare.pack as pack
|
9
|
+
from py2docfx.docfx_yaml.logger import get_logger
|
9
10
|
from py2docfx.convert_prepare.constants import TARGET_REPO, SOURCE_REPO, DIST_TEMP
|
10
11
|
from py2docfx.convert_prepare.package_info import PackageInfo
|
11
12
|
from py2docfx.convert_prepare.source import Source
|
@@ -72,6 +73,7 @@ def update_package_info(executable: str, pkg: PackageInfo, source_folder: str):
|
|
72
73
|
)
|
73
74
|
|
74
75
|
def get_source(executable: str, pkg: PackageInfo, cnt: int, vststoken=None, githubtoken=None):
|
76
|
+
docfx_logger = get_logger(__name__)
|
75
77
|
path_cnt = str(cnt)
|
76
78
|
dist_dir = path.join(DIST_TEMP, path_cnt)
|
77
79
|
|
@@ -120,6 +122,8 @@ def get_source(executable: str, pkg: PackageInfo, cnt: int, vststoken=None, gith
|
|
120
122
|
os.listdir(dist_dir)[0]
|
121
123
|
)
|
122
124
|
else:
|
123
|
-
|
125
|
+
msg = f"Unknown install type: {pkg.install_type}"
|
126
|
+
docfx_logger.error(msg)
|
127
|
+
raise ValueError()
|
124
128
|
|
125
129
|
update_package_info(executable, pkg, source_folder)
|
py2docfx/convert_prepare/git.py
CHANGED
@@ -1,8 +1,9 @@
|
|
1
1
|
import re
|
2
2
|
import subprocess
|
3
3
|
|
4
|
-
|
4
|
+
from py2docfx.docfx_yaml.logger import get_logger
|
5
5
|
|
6
|
+
repoMap = {}
|
6
7
|
|
7
8
|
def clone(repo_location, branch, folder, extra_token=None):
|
8
9
|
"""
|
@@ -12,15 +13,16 @@ def clone(repo_location, branch, folder, extra_token=None):
|
|
12
13
|
replacing
|
13
14
|
https://apidrop.visualstudio.com/Content%20CI/_git/ReferenceAutomation?path=/Python/GetPackageCode.ps1&line=50&lineEnd=90&lineStartColumn=1&lineEndColumn=2&lineStyle=plain&_a=contents
|
14
15
|
"""
|
15
|
-
|
16
|
-
|
16
|
+
docfx_logger = get_logger(__name__)
|
17
|
+
msg = "<CI INFO>: Cloning repo: {}...".format(repo_location)
|
18
|
+
docfx_logger.info(msg)
|
17
19
|
|
18
20
|
global repoMap
|
19
21
|
|
20
22
|
if not test_url(repo_location, extra_token):
|
21
|
-
|
22
|
-
|
23
|
-
)
|
23
|
+
msg = "Git repo address {} is not a valid URL.".format(repo_location)
|
24
|
+
docfx_logger.error(msg)
|
25
|
+
raise ValueError()
|
24
26
|
else:
|
25
27
|
# Remove http(s):// from url to record. Further avoid dup-clone.
|
26
28
|
pureURL = re.sub("^\s*https?://", "", repo_location)
|
@@ -57,17 +59,17 @@ def clone(repo_location, branch, folder, extra_token=None):
|
|
57
59
|
]
|
58
60
|
subprocess.run(clone_params, check=True)
|
59
61
|
repoMap[pureURL] = folder
|
60
|
-
|
61
|
-
"<CI INFO>: Repo {} successfully cloned in {}...".format(
|
62
|
+
msg = "<CI INFO>: Repo {} successfully cloned in {}...".format(
|
62
63
|
repo_location, repoMap[pureURL]
|
63
64
|
)
|
64
|
-
)
|
65
|
+
docfx_logger.info(msg)
|
65
66
|
else:
|
66
67
|
raise ValueError(
|
67
68
|
"Branch {} doesn't exist in repo {}.".format(branch, repo_location)
|
68
69
|
)
|
69
70
|
else:
|
70
|
-
|
71
|
+
msg = "<CI INFO>: Repo already cloned in {}...".format(repoMap[pureURL])
|
72
|
+
docfx_logger.info(msg)
|
71
73
|
|
72
74
|
return repoMap[pureURL]
|
73
75
|
|
@@ -76,9 +78,12 @@ def test_url(url, extraHeader):
|
|
76
78
|
"""
|
77
79
|
Test if the url is a valid git repo url
|
78
80
|
"""
|
81
|
+
docfx_logger = get_logger(__name__)
|
79
82
|
params = ["git", "ls-remote", url]
|
80
83
|
if extraHeader:
|
81
|
-
|
84
|
+
msg = "Using extra header to test git repo url."
|
85
|
+
docfx_logger.info(msg)
|
86
|
+
|
82
87
|
params[1:1] = [
|
83
88
|
"-c",
|
84
89
|
"http.extraHeader=Authorization: Basic {}".format(extraHeader),
|
@@ -91,13 +96,13 @@ def test_url(url, extraHeader):
|
|
91
96
|
|
92
97
|
|
93
98
|
def convertBranch(repo_url, branch, extraHeader):
|
99
|
+
docfx_logger = get_logger(__name__)
|
94
100
|
result = branch
|
95
101
|
if not branch:
|
96
|
-
|
97
|
-
"Using empty branch of {}, going to use master branch instead.".format(
|
102
|
+
msg = "Using empty branch of {}, going to use master branch instead.".format(
|
98
103
|
repo_url
|
99
104
|
)
|
100
|
-
)
|
105
|
+
docfx_logger.info(msg)
|
101
106
|
result = "master"
|
102
107
|
if result == "master":
|
103
108
|
check_params = ["git", "ls-remote", "--heads", repo_url, "refs/heads/main"]
|
@@ -109,11 +114,10 @@ def convertBranch(repo_url, branch, extraHeader):
|
|
109
114
|
|
110
115
|
checkBr = subprocess.check_output(check_params)
|
111
116
|
if checkBr:
|
112
|
-
|
113
|
-
"Using master branch of {}, going to use main branch instead.".format(
|
117
|
+
msg = "Using master branch of {}, going to use main branch instead.".format(
|
114
118
|
repo_url
|
115
119
|
)
|
116
|
-
)
|
120
|
+
docfx_logger.info(msg)
|
117
121
|
result = "main"
|
118
122
|
return result
|
119
123
|
|
@@ -125,7 +129,7 @@ def checkout(folder, branch):
|
|
125
129
|
Replacing
|
126
130
|
https://apidrop.visualstudio.com/Content%20CI/_git/ReferenceAutomation?path=/Python/PyCommon.ps1&line=707&lineEnd=763&lineStartColumn=1&lineEndColumn=2&lineStyle=plain&_a=contents
|
127
131
|
"""
|
128
|
-
|
132
|
+
docfx_logger = get_logger(__name__)
|
129
133
|
remote = "origin"
|
130
134
|
|
131
135
|
if ":" in branch:
|
@@ -153,8 +157,8 @@ def checkout(folder, branch):
|
|
153
157
|
)
|
154
158
|
|
155
159
|
subprocess.run(["git", "-C", folder, "checkout", "--quiet", branch])
|
156
|
-
|
157
|
-
|
160
|
+
msg = "<CI INFO>: Switched to branch {}.".format(branch)
|
161
|
+
docfx_logger.info(msg)
|
158
162
|
|
159
163
|
|
160
164
|
def commit_and_push(repo_location, folder, extra_token=None):
|
@@ -1,6 +1,7 @@
|
|
1
1
|
from enum import Enum
|
2
2
|
import os
|
3
3
|
import re
|
4
|
+
from py2docfx.docfx_yaml.logger import get_logger
|
4
5
|
from py2docfx.convert_prepare.source import Source
|
5
6
|
from py2docfx.convert_prepare.package_info_extra_settings import extra_exclude_path_by_package
|
6
7
|
|
@@ -9,14 +10,13 @@ class PackageInfo:
|
|
9
10
|
PYPI = 1
|
10
11
|
SOURCE_CODE = 2
|
11
12
|
DIST_FILE = 3
|
12
|
-
|
13
13
|
path: Source
|
14
|
-
|
15
14
|
def __init__(self) -> None:
|
16
15
|
pass
|
17
|
-
|
16
|
+
|
18
17
|
@classmethod
|
19
18
|
def report_error(cls, name, value, condition=None):
|
19
|
+
docfx_logger = get_logger(__name__)
|
20
20
|
if condition:
|
21
21
|
message = "When {0}, found unexpected property of {1}, loaded value is: {2}".format(
|
22
22
|
condition, name, value
|
@@ -25,7 +25,8 @@ class PackageInfo:
|
|
25
25
|
message = "Found unexpected property of {0}, loaded value is: {1}".format(
|
26
26
|
name, value
|
27
27
|
)
|
28
|
-
|
28
|
+
docfx_logger.error(message)
|
29
|
+
raise ValueError()
|
29
30
|
|
30
31
|
@classmethod
|
31
32
|
def parse_from(cls, dict, reading_required_packages=False):
|
@@ -59,12 +60,14 @@ class PackageInfo:
|
|
59
60
|
package_info.folder = package_info_dict.get("folder", None)
|
60
61
|
|
61
62
|
if not package_info.url:
|
63
|
+
docfx_logger = get_logger(__name__)
|
62
64
|
if not package_info.folder:
|
63
|
-
|
64
|
-
|
65
|
-
)
|
65
|
+
msg = "When install_type is source_code, url or folder should be provided"
|
66
|
+
docfx_logger.error(msg)
|
67
|
+
raise ValueError()
|
66
68
|
else:
|
67
|
-
|
69
|
+
msg = f'Read source code from local folder: {package_info.folder}'
|
70
|
+
docfx_logger.info(msg)
|
68
71
|
|
69
72
|
prefer_source_distribution = package_info_dict.get(
|
70
73
|
"prefer_source_distribution", False
|
@@ -140,10 +143,13 @@ class PackageInfo:
|
|
140
143
|
return (packageInstallName, pipInstallExtraOptions)
|
141
144
|
|
142
145
|
def get_exluded_command(self) -> []:
|
146
|
+
docfx_logger = get_logger(__name__)
|
143
147
|
if hasattr(self, "path"):
|
144
148
|
code_location = self.path.source_folder
|
145
149
|
else:
|
146
|
-
|
150
|
+
msg = "Should set source code location before build documents"
|
151
|
+
docfx_logger.error(msg)
|
152
|
+
raise ValueError()
|
147
153
|
exclude_path = []
|
148
154
|
if code_location:
|
149
155
|
exclude_path.append(os.path.join(code_location, "build/*"))
|