1
0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-04 16:49:42 +00:00

Merge pull request #321 from jwodder/no-pandoc

Remove the need for pandoc
This commit is contained in:
deadc0de
2021-10-05 20:38:10 +02:00
committed by GitHub
3 changed files with 6 additions and 12 deletions

View File

@@ -13,10 +13,8 @@ jobs:
python-version: 3.8 python-version: 3.8
- name: Install Tools - name: Install Tools
run: | run: |
sudo apt update
sudo apt -y install python3-pypandoc pandoc
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install setuptools wheel twine pypandoc pip install setuptools wheel twine
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Build and Publish - name: Build and Publish
env: env:

View File

@@ -16,8 +16,7 @@ jobs:
run: | run: |
export MAGIC=$SNAP/usr/share/file/magic.mgc export MAGIC=$SNAP/usr/share/file/magic.mgc
sudo apt update sudo apt update
sudo apt -y install git pandoc python3-pip python3-setuptools sudo apt -y install git python3-pip python3-setuptools
sudo pip3 install pypandoc
sudo apt -y install snapd sudo apt -y install snapd
sudo snap install snapcraft --classic sudo snap install snapcraft --classic
echo "$SNAP_TOKEN" | snapcraft login --with - echo "$SNAP_TOKEN" | snapcraft login --with -

View File

@@ -1,17 +1,13 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
from codecs import open
from os import path from os import path
from dotdrop.version import __version__ as VERSION from dotdrop.version import __version__ as VERSION
readme = 'README.md' readme = 'README.md'
here = path.abspath(path.dirname(__file__)) here = path.abspath(path.dirname(__file__))
try: def read_readme(f):
from pypandoc import convert_file with open(f, encoding="utf-8") as fp:
read_readme = lambda f: convert_file(f, 'rst') return fp.read()
except ImportError:
print('\n[WARNING] pypandoc not found, could not convert \"{}\"\n'.format(readme))
read_readme = lambda f: open(f, 'r').read()
REQUIRES_PYTHON = '>=3' REQUIRES_PYTHON = '>=3'
@@ -21,6 +17,7 @@ setup(
description='Save your dotfiles once, deploy them everywhere', description='Save your dotfiles once, deploy them everywhere',
long_description=read_readme(readme), long_description=read_readme(readme),
long_description_content_type="text/markdown; variant=GFM",
url='https://github.com/deadc0de6/dotdrop', url='https://github.com/deadc0de6/dotdrop',
download_url = 'https://github.com/deadc0de6/dotdrop/archive/v'+VERSION+'.tar.gz', download_url = 'https://github.com/deadc0de6/dotdrop/archive/v'+VERSION+'.tar.gz',