diff --git a/doc-test.bat b/doc-test.bat index 404c26e..e4637e4 100644 --- a/doc-test.bat +++ b/doc-test.bat @@ -19,7 +19,7 @@ set "PYTHON_VERSION=%1" set "MODE=%2" set "PROJECT_NAME=greater_tables_project" REM set "PROJECT_REPO=https://github.com/mynl/%PROJECT_NAME%.git" -set "PROJECT_REPO=c:\s\telos\python\greater_tables_project" +set "PROJECT_REPO=c:\s\telos\python\%PROJECT_NAME%" set "BUILD_DIR=C:\tmp\%PROJECT_NAME%_rtd_build_%1" set "VENV_DIR=%BUILD_DIR%\venv" set "HTML_OUTPUT_DIR=%BUILD_DIR%\html" @@ -44,20 +44,15 @@ if /i "%MODE%"=="new" ( pushd "%BUILD_DIR%" -:: --- Fetch latest changes --- -echo Fetching latest changes... -git fetch origin --force --prune --prune-tags --depth 50 refs/heads/master:refs/remotes/origin/master -if %ERRORLEVEL% NEQ 0 ( - echo Git fetch failed. Exiting. - exit /b %ERRORLEVEL% -) - -:: --- Checkout master branch --- -echo Checking out master branch... -git checkout --force origin/master -if %ERRORLEVEL% NEQ 0 ( - echo Git checkout failed. Exiting. - exit /b %ERRORLEVEL% +if /i "%MODE%"=="refresh" ( + echo Updating local clone from "%PROJECT_REPO%"... + git remote add source "%PROJECT_REPO%" 2>nul + git fetch source + git reset --hard source/master + if %ERRORLEVEL% NEQ 0 ( + echo Git update failed. Exiting. + exit /b %ERRORLEVEL% + ) ) :: --- Setup Virtual Environment --- @@ -117,7 +112,7 @@ if %ERRORLEVEL% NEQ 0 ( echo. echo HTML documentation built successfully in "%HTML_OUTPUT_DIR%" -echo run cd "%HTML_OUTPUT_DIR%" && python -m http.server %PORT% +echo run cd "%HTML_OUTPUT_DIR%" ^&^& python -m http.server %PORT% echo to serve the documentation. :: --- Launch Web Server and Open Docs --- diff --git a/docs/versions.rst b/docs/versions.rst index f6f6561..f2ead92 100644 --- a/docs/versions.rst +++ b/docs/versions.rst @@ -11,6 +11,12 @@ Versions and Change Log .. TODO * self.padl and r / 12 in make html width adj s/b elsewhere + +5.2.0 +------ +* Adjusted logging to standard. +* Updated doc-test batch file to standard. + 5.1.0 ------ * Added gtfont, a rust text to point size utility using fontdue https://docs.rs/fontdue/latest/fontdue/index.html. diff --git a/greater_tables/__init__.py b/greater_tables/__init__.py index f939213..0edcab0 100644 --- a/greater_tables/__init__.py +++ b/greater_tables/__init__.py @@ -5,4 +5,4 @@ __version__ = '5.2.0' from . core import GT from . fabrications import Fabricator from . etcher import Etcher -from . gtlogging import setup_logging \ No newline at end of file +from . gtlogging import setup_logging diff --git a/pyproject.toml b/pyproject.toml index 38d5917..ace2d93 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,8 +23,9 @@ dependencies = [ classifiers = [ "Development Status :: 4 - Beta", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", "Topic :: Office/Business" ]