Compare commits

..

5 Commits

Author SHA1 Message Date
21d060be6a Updated CI config to match server CI
All checks were successful
csvbyname/pipeline/head This commit looks good
2024-11-14 20:48:06 +00:00
be4d665301 Updated pipeline to take advantage of latest build container image
All checks were successful
ydeng/csvbyname/pipeline/head This commit looks good
2023-05-03 08:32:04 -05:00
9e59bc097c Fixed typo in argument help
All checks were successful
ydeng/csvbyname/pipeline/head This commit looks good
2023-04-23 15:28:10 -05:00
2edd8a2093 Bumped package version
All checks were successful
ydeng/csvbyname/pipeline/head This commit looks good
2023-04-23 14:56:48 -05:00
7a400457fe Fixed double line breaks in output on Windows
All checks were successful
ydeng/csvbyname/pipeline/head This commit looks good
2023-04-23 14:56:29 -05:00
7 changed files with 40 additions and 14 deletions

View File

@@ -0,0 +1,22 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/python
{
"name": "Python 3",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye"
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "pip3 install --user -r requirements.txt",
// Configure tool-specific properties.
// "customizations": {},
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}

22
Jenkinsfile vendored
View File

@@ -1,15 +1,15 @@
pipeline { pipeline {
agent any agent {
kubernetes {
cloud 'rsys-devel'
defaultContainer 'pip'
inheritFrom 'pip'
}
}
stages { stages {
stage("clean") {
steps {
sh 'rm -rf ./dist/*'
}
}
stage("install") { stage("install") {
steps { steps {
sh 'mamba env update --file environment.yml' sh 'pip install -r requirements.txt'
sh 'echo "mamba activate csvbyname" >> ~/.bashrc'
} }
} }
stage("build") { stage("build") {
@@ -17,7 +17,7 @@ pipeline {
sh "python -m build" sh "python -m build"
} }
} }
stage("test") { stage("test installation") {
steps { steps {
sh "pip install dist/*.whl" sh "pip install dist/*.whl"
sh "csvbyname -h" sh "csvbyname -h"
@@ -25,7 +25,7 @@ pipeline {
} }
stage("archive") { stage("archive") {
steps { steps {
archiveArtifacts artifacts: 'dist/*.tar.gz, dist/*.whl' archiveArtifacts artifacts: 'dist/*.tar.gz, dist/*.whl', fingerprint: true, followSymlinks: false, onlyIfSuccessful: true
} }
} }
stage("publish package") { stage("publish package") {
@@ -33,7 +33,7 @@ pipeline {
branch '**/main' branch '**/main'
} }
steps { steps {
withCredentials([usernamePassword(credentialsId: 'rs-git-package-registry-ydeng', passwordVariable: 'PASS', usernameVariable: 'USER')]) { withCredentials([usernamePassword(credentialsId: '4d6f64be-d26d-4f95-8de3-b6a9b0beb311', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
sh "python -m twine upload --repository-url https://git.reslate.systems/api/packages/${USER}/pypi -u ${USER} -p ${PASS} --non-interactive --disable-progress-bar --verbose dist/*" sh "python -m twine upload --repository-url https://git.reslate.systems/api/packages/${USER}/pypi -u ${USER} -p ${PASS} --non-interactive --disable-progress-bar --verbose dist/*"
} }
} }

View File

@@ -69,7 +69,7 @@ def main():
"-n", "-n",
"--output-basename", "--output-basename",
help='Adds a column called "basename" to the resulting CSV where it is just ' help='Adds a column called "basename" to the resulting CSV where it is just '
"The base name of the path instead of the entire path. This is not guaranteed " "the base name of the path instead of the entire path. This is not guaranteed "
"to be unique.", "to be unique.",
default=False, default=False,
required=False, required=False,

View File

@@ -77,7 +77,7 @@ def write_collected_to_csv(
property_keys: Iterable[str], property_keys: Iterable[str],
output_basename: bool, output_basename: bool,
): ):
with open(output_path, "w") as output_fd: with open(output_path, "w", newline="", encoding="utf-8") as output_fd:
s_property_keys = sorted(property_keys) s_property_keys = sorted(property_keys)
header = ["path"] header = ["path"]
if output_basename: if output_basename:

View File

@@ -6,3 +6,4 @@ dependencies:
- pytest=7.2.2 - pytest=7.2.2
- twine=4.0.2 - twine=4.0.2
- python=3.11 - python=3.11
prefix: ./env

3
requirements.txt Normal file
View File

@@ -0,0 +1,3 @@
build
pytest
twine

View File

@@ -1,6 +1,6 @@
[metadata] [metadata]
name = csvbyname name = csvbyname
version = 0.0.5 version = 0.0.6
author = Harrison author = Harrison
[options] [options]