diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e99d6424..5744c890 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,7 @@ - + + - @@ -111,11 +111,19 @@ - + + + + + + + + + - - - - - - + + - - @@ -395,11 +361,11 @@ + + - - @@ -412,22 +378,6 @@ diff --git a/continuous_integration/scripts/build_package.ps1 b/continuous_integration/scripts/build_package.ps1 new file mode 100644 index 00000000..9fdbb015 --- /dev/null +++ b/continuous_integration/scripts/build_package.ps1 @@ -0,0 +1,23 @@ +# This Powershell script builds the python package. + +$total_step = 2 +$script = Split-Path $PSCommandPath -Leaf +Write-Output "Script: $( $script )." +$script_folder = $PSScriptRoot +$ci_folder = Split-Path -Path $script_folder -Parent +$project_folder = Split-Path -Path $ci_folder -Parent +Write-Output "Script: $( $script ). project_folder = $( $project_folder )" +Set-Location $project_folder + +$current_step = 1 +$command = "python -m pip install --upgrade build" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +Invoke-Expression -Command $command + +$current_step = 2 +$command = "python -m build" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +Invoke-Expression -Command $command + + + diff --git a/continuous_integration/scripts/build_windows_run_build.ps1 b/continuous_integration/scripts/build_windows_run_build.ps1 deleted file mode 100644 index 984f28de..00000000 --- a/continuous_integration/scripts/build_windows_run_build.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -Set-Location $Env:USERPROFILE\PycharmProjects\punctilious -python -m pip install --upgrade build -python -m build \ No newline at end of file diff --git a/continuous_integration/scripts/distribute_package_to_pypi.ps1 b/continuous_integration/scripts/distribute_package_to_pypi.ps1 new file mode 100644 index 00000000..57c4bb97 --- /dev/null +++ b/continuous_integration/scripts/distribute_package_to_pypi.ps1 @@ -0,0 +1,20 @@ +# This Powershell script deploys the python package to PyPI. + +$total_step = 2 +$script = Split-Path $PSCommandPath -Leaf +Write-Output "Script: $( $script )." +$script_folder = $PSScriptRoot +$ci_folder = Split-Path -Path $script_folder -Parent +$project_folder = Split-Path -Path $ci_folder -Parent +Write-Output "Script: $( $script ). project_folder = $( $project_folder )" +Set-Location $project_folder + +$current_step = 1 +$command = "python -m pip install --upgrade twine" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +Invoke-Expression -Command $command + +$current_step = 2 +$command = "python -m twine upload --repository pypi dist/*" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +Invoke-Expression -Command $command diff --git a/continuous_integration/scripts/distribute_windows_upload_to_pypi.ps1 b/continuous_integration/scripts/distribute_windows_upload_to_pypi.ps1 deleted file mode 100644 index 589a4198..00000000 --- a/continuous_integration/scripts/distribute_windows_upload_to_pypi.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -Set-Location $Env:USERPROFILE\PycharmProjects\punctilious -python -m pip install --upgrade twine -python -m twine upload --repository pypi dist/* \ No newline at end of file diff --git a/continuous_integration/scripts/increment_package_version_patch.ps1 b/continuous_integration/scripts/increment_package_version_patch.ps1 new file mode 100644 index 00000000..ed75176b --- /dev/null +++ b/continuous_integration/scripts/increment_package_version_patch.ps1 @@ -0,0 +1,29 @@ +# This Powershell script increments the python package patch-level version. + +$total_step = 2 +$script = Split-Path $PSCommandPath -Leaf +Write-Output "Script: $( $script )." +$script_folder = $PSScriptRoot +$ci_folder = Split-Path -Path $script_folder -Parent +$project_folder = Split-Path -Path $ci_folder -Parent +Write-Output "Script: $( $script ). project_folder = $( $project_folder )" +Set-Location $project_folder + +$current_step = 1 +$command = "pip install --upgrade bumpver" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +Invoke-Expression -Command $command + +$current_step = 2 +$command = "python -m bumpver update --patch" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +Invoke-Expression -Command $command + + + + + + + + + diff --git a/continuous_integration/scripts/prebuild_windows_increment_version_patch.ps1 b/continuous_integration/scripts/prebuild_windows_increment_version_patch.ps1 deleted file mode 100644 index 881462f1..00000000 --- a/continuous_integration/scripts/prebuild_windows_increment_version_patch.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -Set-Location $Env:USERPROFILE\PycharmProjects\punctilious -pip install --upgrade bumpver -python -m bumpver update --patch \ No newline at end of file diff --git a/continuous_integration/scripts/release_patch.ps1 b/continuous_integration/scripts/release_patch.ps1 new file mode 100644 index 00000000..aaac86ac --- /dev/null +++ b/continuous_integration/scripts/release_patch.ps1 @@ -0,0 +1,35 @@ +# This Powershell script: +# 1. increments the patch-level version, +# 2. builds the documentation, +# 3. builds the package, +# 4. releases the package to PyPI. + +$total_step = 4 +$script = Split-Path $PSCommandPath -Leaf +Write-Output "Script: $( $script )." +$script_folder = $PSScriptRoot +$ci_folder = Split-Path -Path $script_folder -Parent +$project_folder = Split-Path -Path $ci_folder -Parent +Write-Output "Script: $( $script ). project_folder = $( $project_folder )" +Set-Location $project_folder + +$current_step = 1 +$command = "increment_package_version_patch.ps1" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +& $PSScriptRoot\increment_package_version_patch.ps1 + +$current_step = 2 +$command = "build_docs.ps1" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +& $PSScriptRoot\build_docs.ps1 + +$current_step = 3 +$command = "build_package.ps1" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +& $PSScriptRoot\build_package.ps1 + +$current_step = 4 +$command = "release_package.ps1" +Write-Output "Script: $( $script ). Step: $( $current_step ) / $( $total_step ). $( $command )" +& $PSScriptRoot\release_package.ps1 + diff --git a/continuous_integration/scripts/start_venv.ps1 b/continuous_integration/scripts/start_venv.ps1 index f0291f33..9356f168 100644 --- a/continuous_integration/scripts/start_venv.ps1 +++ b/continuous_integration/scripts/start_venv.ps1 @@ -5,8 +5,7 @@ $script = Split-Path $PSCommandPath -Leaf $environment_directory = $EnvironmentDirectory if ($environment_directory -eq "") { - #$environment_directory = "$( $PSScriptRoot )\python-virtual-environment-$( New-Guid )" - $environment_directory = "python-virtual-environment-$( New-Guid )" + $environment_directory = [System.IO.Path]::GetTempPath() + "python-virtual-environment-$( New-Guid )" } $current_step = 1 diff --git a/docs/source/conf.py b/docs/source/conf.py index 28f30f31..afb08e54 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -22,7 +22,7 @@ project = 'punctilious' copyright = '2023, David Doret' author = 'David Doret' -release = "1.0.8" +release = "1.0.9" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/pyproject.toml b/pyproject.toml index 7df8df79..d8ea9ffe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "punctilious" -version = "1.0.8" +version = "1.0.9" authors = [{ name = "David Doret", email = "david.doret@icloud.com" }] keywords = ["math", "mathematics", "proof", "proof assistant", "math proof assistant", "formal system", ] description = "A human-friendly and developer-friendly math proof assistant" @@ -40,7 +40,7 @@ addopts = [ "--import-mode=importlib", ] [tool.bumpver] -current_version = "1.0.8" +current_version = "1.0.9" version_pattern = "MAJOR.MINOR.PATCH" commit_message = "bump version {old_version} -> {new_version}" tag_message = "v{new_version}" diff --git a/src/punctilious/__init__.py b/src/punctilious/__init__.py index 50b3e53d..a809f944 100644 --- a/src/punctilious/__init__.py +++ b/src/punctilious/__init__.py @@ -1,7 +1,7 @@ """Punctilious: punctilious/__init__.py """ -__version__ = "1.0.8" +__version__ = "1.0.9" from punctilious.plaintext import force_plaintext, Plaintext, unidecode from punctilious.repm import monospace, prnt, serif_bold diff --git a/src/sample/__init__.py b/src/sample/__init__.py index cd6c1df3..f4aa553c 100644 --- a/src/sample/__init__.py +++ b/src/sample/__init__.py @@ -1,2 +1,2 @@ """This python module contains sample python scripts that illustrate *punctilious* usage.""" -__version__ = "1.0.8" +__version__ = "1.0.9" diff --git a/src/theory/__init__.py b/src/theory/__init__.py index 52a722d2..2c13d26b 100644 --- a/src/theory/__init__.py +++ b/src/theory/__init__.py @@ -1,4 +1,4 @@ """This python module contains mathematical theories formalized with *punctilious*.""" -__version__ = "1.0.8" +__version__ = "1.0.9" from theory.theory_tao_2006_the_peano_axioms import Tao2006ThePeanoAxioms