Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
219 changes: 95 additions & 124 deletions Jenkinsfile

Large diffs are not rendered by default.

22 changes: 20 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ lint = [
"pydocstyle"
]
tox = ["tox"]
test = ["coverage[toml]", "gcovr", "pytest"]
tox-uv = [
{include-group = "tox"},
"tox-uv-bare"
]
test = ["coverage[toml]", "gcovr;os_name!= 'nt'", "pytest"]
conan = ["conan>=2.0", "cmake<4.0"]
dev = [
{include-group = "conan"},
Expand Down Expand Up @@ -154,6 +158,19 @@ before-all = [
'uv run --only-group=conan --with ninja --isolated conan install conanfile.py -pr:h {package}/ci/cibuildwheel/conan_profiles/Linux/linux_build_profile.ini --build missing -of /tmp/ciwheelbuilder/uiucprescon_orc/tmp --conf=tools.cmake.cmaketoolchain:generator=Ninja',

]

[tool.commitizen]
name = "cz_conventional_commits"
tag_format = "v$version"
version_scheme = "pep440"
version_provider = "pep621"
update_changelog_on_bump = true
major_version_zero = true
changelog_merge_prerelease = true
pre_bump_hooks = [
"uv lock"
]

[tool.cibuildwheel.linux.environment]
PYTHONFAULTHANDLER="True"
CONAN_USER_HOME="/tmp/conan/manylinux"
Expand All @@ -179,4 +196,5 @@ default = true
[[tool.uv.index]]
name = "uiuc_prescon_python"
url = "https://nexus.library.illinois.edu/repository/uiuc_prescon_python/simple"
explicit = true
explicit = true

6 changes: 2 additions & 4 deletions scripts/build_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ function Build-DockerImage {
"--build-arg CHOCOLATEY_SOURCE",
"--build-arg UV_INDEX_URL",
"--build-arg UV_EXTRA_INDEX_URL",
"--build-arg PIP_EXTRA_INDEX_URL",
"--build-arg PIP_INDEX_URL",
"--build-arg CONAN_CENTER_PROXY_V2_URL",
"--build-arg UV_CACHE_DIR=c:/users/containeradministrator/appdata/local/uv",
"-t", $ImageName,
Expand Down Expand Up @@ -57,7 +55,7 @@ function Build-Wheel {
$venv = "${containerCacheDir}\venv"

$UV_TOOL_DIR = "${containerCacheDir}\uvtools"
$UV_PYTHON_INSTALL_DIR = "${containerCacheDir}\uvpython"
$UV_PYTHON_CACHE_DIR = "${containerCacheDir}\uvpython"

# This makes a symlink copy of the files mounted in the source. Any changes to the files will not affect outside the container
$createShallowCopy = "foreach (`$item in `$(Get-ChildItem -Path $containerSourcePath)) { `
Expand All @@ -76,7 +74,7 @@ function Build-Wheel {
"--mount type=bind,source=$(Resolve-Path $projectRootDirectory),target=${containerSourcePath}",
"--mount type=bind,source=$(Resolve-Path $outputDirectory),target=${containerDistPath}",
"-e UV_TOOL_DIR=${UV_TOOL_DIR}",
"-e UV_PYTHON_INSTALL_DIR=${UV_PYTHON_INSTALL_DIR}",
"-e UV_PYTHON_CACHE_DIR=${UV_PYTHON_CACHE_DIR}",
'--entrypoint', 'powershell',
$DockerImageName
"-c",
Expand Down
38 changes: 13 additions & 25 deletions scripts/resources/windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,32 +32,20 @@ ARG VS_DevPowershellArguments='-arch=amd64'
RUN c:/scripts/install_msvc.ps1 -InstallPath ${Env:VS_INSTALL_PATH} -VSConfigFile c:/setup/config.vsconfig -DevCmdArguments ${Env:VS_DevCmdArguments} -DevPowershellArguments ${Env:VS_DevPowershellArguments} -VSVersion ${Env:VS_VERSION}; `
Write-Host "Note: Exporting This layer can take a while."

ARG CHOCOLATEY_SOURCE
ARG ChocolateyEnvironmentDebug=false
ARG chocolateyVersion
COPY scripts/resources/windows/chocolatey/install.ps1 c:/choco/install.ps1
COPY scripts/resources/windows/chocolatey/get_latest_chocolatey_url.ps1 c:/choco/get_latest_chocolatey_url.ps1
COPY scripts/resources/windows/chocolatey/packages.config choco/packages.config
COPY scripts/resources/windows/chocolatey/verifyenv.ps1 c:/verifyenv.ps1
RUN Set-ExecutionPolicy Bypass -Scope Process -Force; `
$chocolateyDownloadUrl = c:/choco/get_latest_chocolatey_url.ps1 -packageRepo $env:CHOCOLATEY_SOURCE; `
c:/choco/install.ps1 -ChocolateyDownloadUrl $chocolateyDownloadUrl;`
. $profile;`
if( -not ([string]::IsNullOrEmpty($Env:CHOCOLATEY_SOURCE ))) `
{ `
Write-Host "Adding $env:CHOCOLATEY_SOURCE to chocolatey sources" ; `
choco source add -n=CHOCOLATEY_SOURCE --priority=1 -s=\"${env:CHOCOLATEY_SOURCE}\"; `
}; `
Write-Host "Disabling Showing Download Progress" ; `
choco feature disable -n=showDownloadProgress ; `
choco sources ; `
choco install -y --stoponfirstfailure --no-progress --verbose choco/packages.config ;`
refreshenv ; `
choco cache remove --confirm;`
Write-Host "Finished install packages with Chocolatey"; `
COPY scripts/resources/windows/scoop c:/scoopinstall
RUN irm get.scoop.sh -outfile 'install.ps1' ; `
.\install.ps1 -RunAsAdmin ; `
Remove-Item -Path ".\install.ps1" ; `
scoop install git ; `
scoop bucket add versions ; `
scoop import c:/scoopinstall/scoopfile.json ; `
scoop cache show ; `
Write-Host "Cleaning up cache" ;`
scoop cache clean ; `
Write-Host "Cleaning up cache - Done" ;`
Write-Host "Verifying installed packages" ;`
c:/verifyenv.ps1

c:/scoopinstall/verifyenv.ps1 ;`
Write-Host "Verifying installed packages - Done"

RUN New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" `
-Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
Expand Down
19 changes: 0 additions & 19 deletions scripts/resources/windows/chocolatey/get_latest_chocolatey_url.ps1

This file was deleted.

Loading
Loading