Skip to content

Commit e52780f

Browse files
author
Nicklas Tegner
authored
Merge pull request #244 from NicklasTegner/poetry
poetry add build scripts
2 parents b2218c9 + 9b57012 commit e52780f

File tree

5 files changed

+82
-57
lines changed

5 files changed

+82
-57
lines changed

‎.travis.yml‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
language: python
2+
python:
3+
- "3.6"
4+
- "3.7"
5+
- "3.8"
6+
- "3.9"
7+
- "3.10.0"
8+
os: linux
9+
dist: bionic
210
sudo: false
3-
matrix:
4-
include:
5-
- python: 3.8
6-
env: TOXENV=py38
7-
- python: 3.7
8-
env: TOXENV=py37
9-
- python: 3.6
10-
env: TOXENV=py36
11-
- python: 3.5
12-
env: TOXENV=py35
13-
- python: 3.4
14-
env: TOXENV=py34
15-
allow_failures:
16-
- env: TOXENV=flake8
1711
addons:
1812
apt:
1913
packages:
@@ -26,14 +20,15 @@ addons:
2620
- texlive-latex-recommended
2721
- lmodern
2822
install:
29-
- travis_retry python -m pip install tox
23+
- travis_retry python -m pip install poetry
24+
- travis_retry poetry install
3025
# only download pandoc, the tests should work without a install of pypandoc
31-
- python -c "from pypandoc import download_pandoc as dp; dp(targetfolder='~/bin/');"
26+
- poetry run python -c "from pypandoc import download_pandoc as dp; dp(targetfolder='~/bin/');"
3227
- export PATH=~/bin:$PATH
3328

3429
script:
3530
- ~/bin/pandoc -v
36-
- tox
31+
- poetry run python tests.py
3732

3833
deploy:
3934
provider: pypi
@@ -43,4 +38,3 @@ deploy:
4338
on:
4439
tags: true
4540
repo: NicklasTegner/pypandoc
46-
condition: $TOXENV == py37

‎__init__.py‎

Whitespace-only changes.

‎appveyor.yml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ environment:
2525
PYTHON_VERSION: "3.8.x"
2626
PYTHON_ARCH: "64"
2727

28+
- PYTHON: "C:\\Python39-x64"
29+
PYTHON_VERSION: "3.9.9"
30+
PYTHON_ARCH: "64"
31+
32+
- PYTHON: "C:\\Python310-x64"
33+
PYTHON_VERSION: "3.10.1"
34+
PYTHON_ARCH: "64"
35+
36+
2837
install:
2938
# If there is a newer build queued for the same PR, cancel this one.
3039
# The AppVeyor 'rollout builds' option is supposed to serve the same
@@ -68,16 +77,18 @@ install:
6877
# about it being out of date.
6978
- "python -m pip install --disable-pip-version-check --user --upgrade pip"
7079
- "python -m pip install twine wheel"
80+
- "python -m pip install poetry"
81+
- "poetry install"
7182

7283
build_script:
73-
- "python --version"
74-
- "python setup.py download_pandoc"
75-
- "pypandoc\\files\\pandoc --version"
84+
- "poetry run python --version"
85+
- "poetry run python setup.py download_pandoc"
86+
- "poetry run pypandoc\\files\\pandoc --version"
7687

7788
test_script:
7889
# Run the project tests
79-
- "python --version"
80-
- "python tests.py"
90+
- "poetry run python --version"
91+
- "poetry run python tests.py"
8192

8293
after_test:
8394
# If tests are successful, create binary packages for the project.

‎pyproject.toml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
[tool.poetry]
2+
name = "pypandoc"
3+
version = "1.7.0"
4+
description = "Thin wrapper for pandoc"
5+
authors = ["NicklasTegner <NicklasMCHD@live.dk>"]
6+
license = "MIT"
7+
readme = "README.md"
8+
repository = "https://github.com/NicklasTegner/pypandoc"
9+
10+
classifiers = [
11+
'Development Status :: 4 - Beta',
12+
'Environment :: Console',
13+
'Intended Audience :: Developers',
14+
'Intended Audience :: System Administrators',
15+
'Operating System :: POSIX',
16+
'Programming Language :: Python',
17+
'Topic :: Text Processing',
18+
'Topic :: Text Processing :: Filters',
19+
'Programming Language :: Python :: 2',
20+
'Programming Language :: Python :: 2.7',
21+
'Programming Language :: Python :: 3',
22+
'Programming Language :: Python :: 3.6',
23+
'Programming Language :: Python :: 3.7',
24+
'Programming Language :: Python :: 3.8',
25+
'Programming Language :: Python :: 3.9',
26+
'Programming Language :: Python :: 3.10',
27+
'Programming Language :: Python :: Implementation :: CPython',
28+
'Programming Language :: Python :: Implementation :: PyPy'
29+
]
30+
31+
packages = [
32+
{ include = "pypandoc" },
33+
]
34+
35+
include = [
36+
"examples/*",
37+
"LICENSE",
38+
"README.md",
39+
"tests.py",
40+
"filter_test.md",
41+
]
42+
43+
[tool.poetry.dependencies]
44+
python = "^3"
45+
46+
[tool.poetry.dev-dependencies]
47+
48+
[build-system]
49+
requires = ["poetry-core>=1.0.0"]
50+
build-backend = "poetry.core.masonry.api"
51+
52+
[tool.poetry.urls]
53+
"Issue Tracker" = "https://github.com/NicklasTegner/pypandoc/issues"
54+

‎tox.ini‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)