Skip to content

Commit

Permalink
Merge pull request #19 from fredrik-corneliusson/17-add-simple-raw-ap…
Browse files Browse the repository at this point in the history
…i-to-make-commands-easier-to-call-from-scripts

17 add simple raw api to make commands easier to call from scripts
  • Loading branch information
fredrik-corneliusson authored Jun 12, 2024
2 parents 855ac42 + caf2d6e commit cea7f1d
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 28 deletions.
89 changes: 66 additions & 23 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,74 @@
# This workflow will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI

name: Upload Python Package

on:
release:
types: [created]
on: push

jobs:
deploy:

build:
name: Build distribution 📦
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install pypa/build
run: >-
python3 -m
pip install
build
--user
- name: Build a binary wheel and a source tarball
run: python3 -m build
- name: Store the distribution packages
uses: actions/upload-artifact@v3
with:
name: python-package-distributions
path: dist/

publish-to-pypi:
name: >-
Publish Python 🐍 distribution 📦 to PyPI
if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes
needs:
- build
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/click-web
permissions:
id-token: write # IMPORTANT: mandatory for trusted publishing

steps:
- name: Download all the dists
uses: actions/download-artifact@v3
with:
name: python-package-distributions
path: dist/
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1

publish-to-testpypi:
name: Publish Python 🐍 distribution 📦 to TestPyPI
needs:
- build
runs-on: ubuntu-latest

environment:
name: testpypi
url: https://test.pypi.org/p/click-web

permissions:
id-token: write # IMPORTANT: mandatory for trusted publishing

steps:
- name: Download all the dists
uses: actions/download-artifact@v3
with:
name: python-package-distributions
path: dist/
- name: Publish distribution 📦 to TestPyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
repository-url: https://test.pypi.org/legacy/
11 changes: 7 additions & 4 deletions click_web/resources/cmd_exec.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import logging
import os
import shlex
import shutil
import subprocess
import sys
Expand Down Expand Up @@ -176,16 +177,18 @@ def __init__(self, script_file_path: str, command):
self._parts = []
self.append(_get_python_interpreter())
self.append(script_file_path)
self.append(command)
for arg in shlex.split(command):
self.append(arg)

def append(self, part: str, secret: bool = False):
self._parts.append(part)

def get_commandline(self, obfuscate: bool = False) -> str:
def get_commandline(self, obfuscate: bool = False) -> List[str]:
"""
Return command line as string.
Return command line as a list of strings.
obfuscate - not supported for this implementation
"""
return " ".join(self._parts)
return self._parts

def get_download_field_infos(self):
return []
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

setup(
name='click-web',
version='0.8.4',
version='0.8.5',
url='https://github.com/fredrik-corneliusson/click-web',
author='Fredrik Corneliusson',
author_email='[email protected]',
Expand Down

0 comments on commit cea7f1d

Please sign in to comment.