1
0

Compare commits

..

No commits in common. "d60dfde9c88a99c49f3b742f41c428a60f65f304" and "2b9c4cda7a4f170d8706a29128388a10bcf878e6" have entirely different histories.

4 changed files with 10 additions and 30 deletions

View File

@ -10,24 +10,11 @@ on:
paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml'] paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml']
jobs: jobs:
Package-Python-And-Publish: Package:
runs-on: ubuntu-latest uses: jmaa/workflows/.gitea/workflows/python-package.yaml@v6.21
container: with:
image: node:21-bookworm REGISTRY_DOMAIN: gitfub.space
steps: REGISTRY_ORGANIZATION: jmaa
- name: Setting up Python ${{ env.PYTHON_VERSION }} for ${{runner.arch}} ${{runner.os}} secrets:
run: | PIPY_REPO_USER: ${{ secrets.PIPY_REPO_USER }}
apt-get update PIPY_REPO_PASS: ${{ secrets.PIPY_REPO_PASS }}
apt-get install -y python3 python3-pip
- name: Check out repository code
if: success()
uses: actions/checkout@v3
- name: Installing Python Dependencies
if: success()
run: python3 -m pip install --upgrade pip setuptools wheel build twine pytest --break-system-packages
- name: Build
if: success()
run: python3 -m build
- name: Publish
if: success()
run: python3 -m twine upload --repository-url "https://gitfub.space/api/packages/jmaa/pypi" -u ${{ secrets.PIPY_REPO_USER }} -p ${{ secrets.PIPY_REPO_PASS }} dist/*

View File

@ -2,7 +2,6 @@
<!-- THIS IS AN AUTOGENERATED FILE! --> <!-- THIS IS AN AUTOGENERATED FILE! -->
<!-- MANUAL CHANGES CAN AND WILL BE OVERWRITTEN! --> <!-- MANUAL CHANGES CAN AND WILL BE OVERWRITTEN! -->
# Markdown Message Conversion # Markdown Message Conversion
![Test program/library](https://gitfub.space/Jmaa/libpurple-to-markdown/actions/workflows/python-test.yml/badge.svg) ![Test program/library](https://gitfub.space/Jmaa/libpurple-to-markdown/actions/workflows/python-test.yml/badge.svg)
@ -83,12 +82,10 @@ pip install -r requirements.txt
Full list of requirements: Full list of requirements:
- [beautifulsoup4](https://pypi.org/project/beautifulsoup4/) - [beautifulsoup4](https://pypi.org/project/beautifulsoup4/)
## Contributing ## Contributing
Feel free to submit pull requests. Please follow the [Code Conventions](CONVENTIONS.md) when doing so. Feel free to submit pull requests. Please follow the [Code Conventions](CONVENTIONS.md) when doing so.
### Testing ### Testing
Testing requires the [pytest](https://docs.pytest.org/en/stable/) library. Testing requires the [pytest](https://docs.pytest.org/en/stable/) library.
@ -105,7 +102,6 @@ Test coverage can be run using the [`pytest-cov`](https://pypi.org/project/pytes
pytest --cov=libpurple_to_markdown test pytest --cov=libpurple_to_markdown test
``` ```
## License ## License
``` ```

View File

@ -1 +1 @@
__version__ = '0.1.12' __version__ = '0.1.11'

View File

@ -78,7 +78,6 @@ python -m libpurple_to_markdown LOG_DIRECTORY --output OUTPUT_FOLDER --skip-this
PACKAGE_DESCRIPTION_SHORT = """ PACKAGE_DESCRIPTION_SHORT = """
Conversion script from various messaging formats to markdown.""".strip() Conversion script from various messaging formats to markdown.""".strip()
def parse_version_file(text: str) -> str: def parse_version_file(text: str) -> str:
text = re.sub('^#.*', '', text, flags=re.MULTILINE) text = re.sub('^#.*', '', text, flags=re.MULTILINE)
match = re.match(r'^\s*__version__\s*=\s*(["\'])([\d\.]+)\1$', text) match = re.match(r'^\s*__version__\s*=\s*(["\'])([\d\.]+)\1$', text)
@ -87,17 +86,14 @@ def parse_version_file(text: str) -> str:
raise Exception(msg) raise Exception(msg)
return match.group(2) return match.group(2)
with open(PACKAGE_NAME + '/_version.py') as f: with open(PACKAGE_NAME + '/_version.py') as f:
version = parse_version_file(f.read()) version = parse_version_file(f.read())
REQUIREMENTS_MAIN = [ REQUIREMENTS_MAIN = [
'beautifulsoup4', 'beautifulsoup4',
] ]
REQUIREMENTS_TEST = [] REQUIREMENTS_TEST = []
setup( setup(
name=PACKAGE_NAME, name=PACKAGE_NAME,
version=version, version=version,
@ -107,6 +103,7 @@ setup(
author='Jon Michael Aanes', author='Jon Michael Aanes',
author_email='jonjmaa@gmail.com', author_email='jonjmaa@gmail.com',
url='https://gitfub.space/Jmaa/' + PACKAGE_NAME, url='https://gitfub.space/Jmaa/' + PACKAGE_NAME,
packages=[PACKAGE_NAME],
install_requires=REQUIREMENTS_MAIN, install_requires=REQUIREMENTS_MAIN,
extras_require={ extras_require={
'test': REQUIREMENTS_TEST, 'test': REQUIREMENTS_TEST,