Skip to content

Commit

Permalink
Merge pull request #211 from daviddoret/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
daviddoret authored Sep 21, 2023
2 parents fcd12dc + f188503 commit bca7caf
Show file tree
Hide file tree
Showing 14 changed files with 147 additions and 84 deletions.
100 changes: 33 additions & 67 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions continuous_integration/scripts/build_package.ps1
Original file line number Diff line number Diff line change
@@ -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



3 changes: 0 additions & 3 deletions continuous_integration/scripts/build_windows_run_build.ps1

This file was deleted.

20 changes: 20 additions & 0 deletions continuous_integration/scripts/distribute_package_to_pypi.ps1
Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

29 changes: 29 additions & 0 deletions continuous_integration/scripts/increment_package_version_patch.ps1
Original file line number Diff line number Diff line change
@@ -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









This file was deleted.

35 changes: 35 additions & 0 deletions continuous_integration/scripts/release_patch.ps1
Original file line number Diff line number Diff line change
@@ -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

3 changes: 1 addition & 2 deletions continuous_integration/scripts/start_venv.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "punctilious"
version = "1.0.8"
version = "1.0.9"
authors = [{ name = "David Doret", email = "[email protected]" }]
keywords = ["math", "mathematics", "proof", "proof assistant", "math proof assistant", "formal system", ]
description = "A human-friendly and developer-friendly math proof assistant"
Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion src/punctilious/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sample/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""This python module contains sample python scripts that illustrate *punctilious* usage."""
__version__ = "1.0.8"
__version__ = "1.0.9"
2 changes: 1 addition & 1 deletion src/theory/__init__.py
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit bca7caf

Please sign in to comment.