Skip to content

Commit 3f5938c

Browse files
committed
Switch to using git_helper to manage many files
1 parent d27914d commit 3f5938c

File tree

14 files changed

+126
-43
lines changed

14 files changed

+126
-43
lines changed

.ci/travis_build_conda.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ if [ $TRAVIS_PYTHON_VERSION == 3.6 ]; then
1616
conda install conda-build
1717
conda install anaconda-client
1818
conda info -a
19+
1920
conda config --add channels domdfcoding || exit 1
21+
2022
conda config --add channels conda-forge || exit 1
21-
23+
2224
conda build conda --output-folder conda/dist
2325

2426
for f in conda/dist/noarch/domdf_python_tools-*.tar.bz2; do

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Feature request
33
about: Suggest an idea for this project
44
title: "[FEATURE] "
55
labels: "enhancement"
6-
assignees: ""
6+
assignees: domdfcoding
77

88
---
99

10-
<!-- Have you searched for similar issues? Someone may already be working on the feature you are guggesting. Before submitting this issue, please check the open issues and add a note before logging a new issue.
10+
<!-- Have you searched for similar issues? Someone may already be working on the feature you are suggesting. Before submitting this issue, please check the open issues and add a note before logging a new issue.
1111
1212
PLEASE USE THE TEMPLATE BELOW TO PROVIDE INFORMATION ABOUT THE ISSUE.
1313
INSUFFICIENT INFO WILL GET THE ISSUE CLOSED. IT WILL ONLY BE REOPENED AFTER SUFFICIENT INFO IS PROVIDED-->

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,5 @@ build
138138
*.egg-info
139139
**/__pycache__
140140
**/conda
141+
142+

.nojekyll

Whitespace-only changes.

.readthedocs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ python:
1818
version: 3.6
1919
install:
2020
- requirements: requirements.txt
21-
- requirements: doc-source/requirements.txt
21+
- requirements: doc-source/requirements.txt
22+

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ dist: xenial
33
python:
44
- '3.6'
55
- '3.7'
6-
- "3.8"
7-
- "pypy3"
6+
- '3.8'
7+
- 'pypy3'
8+
89
install:
910
- sudo apt-get update
10-
- pip install coveralls tox tox-travis rst2txt
11+
- pip install coveralls tox tox-travis rst2txt []
1112
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
1213
- bash miniconda.sh -b -p $HOME/miniconda
1314
script:

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ include __pkginfo__.py
22
include LICENSE
33
include requirements.txt
44
recursive-exclude **/__pycache__ *
5+
6+

__pkginfo__.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,22 @@
4848
conda_description = """Helpful functions for Python
4949
5050
51-
Before installing please ensure you have added the "conda-forge" channel.
52-
"""
51+
Before installing please ensure you have added the "conda-forge" channel. """
5352
install_requires = (repo_root / "requirements.txt").read_text().split('\n')
54-
extras_require = {"dates": ["pytz>=2019.1"]}
53+
extras_require = {'dates': ['pytz>=2019.1']}
5554

5655
classifiers = [
5756
'Development Status :: 4 - Beta',
58-
# "Development Status :: 4 - Beta",
59-
# "Development Status :: 5 - Production/Stable",
60-
# "Development Status :: 6 - Mature",
61-
# "Development Status :: 7 - Inactive",
6257
'Intended Audience :: Developers',
63-
"License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
58+
'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
6459
'Operating System :: OS Independent',
6560
'Programming Language :: Python',
6661
'Programming Language :: Python :: 3.6',
6762
'Programming Language :: Python :: 3.7',
6863
'Programming Language :: Python :: 3.8',
69-
"Programming Language :: Python :: 3 :: Only",
70-
"Programming Language :: Python :: Implementation :: CPython",
71-
"Programming Language :: Python :: Implementation :: PyPy",
64+
'Programming Language :: Python :: 3 :: Only',
65+
'Programming Language :: Python :: Implementation :: CPython',
66+
'Programming Language :: Python :: Implementation :: PyPy',
7267
'Topic :: Software Development :: Libraries :: Python Modules',
68+
7369
]

doc-source/conf.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,21 @@
1212

1313
from sphinx.locale import _
1414

15-
from domdf_python_tools import __author__, __version__, __copyright__
16-
from __pkginfo__ import github_username, modname
15+
from domdf_python_tools import __copyright__
1716

18-
github_url = f"https://github.com/{github_username}/{modname}"
1917

20-
rst_prolog = f""".. |pkgname| replace:: {modname}
21-
.. |pkgname2| replace:: ``{modname}``
18+
github_url = f"https://github.com/domdfcoding/domdf_python_tools"
19+
20+
rst_prolog = f""".. |pkgname| replace:: domdf_python_tools
21+
.. |pkgname2| replace:: ``domdf_python_tools``
2222
.. |browse_github| replace:: `Browse the GitHub Repository <{github_url}>`__
2323
.. |ghurl| replace:: {github_url}
2424
"""
2525

26-
project = modname
26+
author = "Dominic Davis-Foster"
27+
project = "domdf_python_tools"
2728
slug = re.sub(r'\W+', '-', project.lower())
28-
version = __version__
29-
release = __version__
30-
author = __author__
29+
version = release = "0.3.1"
3130
copyright = __copyright__
3231
language = 'en'
3332

@@ -37,6 +36,7 @@
3736
'sphinx.ext.mathjax',
3837
'sphinx.ext.viewcode',
3938
'sphinxcontrib.httpdomain',
39+
4040
]
4141

4242
templates_path = ['_templates']
@@ -52,6 +52,7 @@
5252
'rtd': ('https://docs.readthedocs.io/en/latest/', None),
5353
'sphinx': ('http://www.sphinx-doc.org/en/stable/', None),
5454
'python': ('https://docs.python.org/3/', None),
55+
5556
}
5657

5758
html_theme = 'sphinx_rtd_theme'

domdf_python_tools/pagesizes/units.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ def __mul__(self, other):
5656
pt = 1
5757
inch = Unit("72.0")
5858
cm = inch / Unit("2.54")
59-
print(cm)
6059
mm = cm * Unit("0.1")
61-
print(mm)
6260
um = mm * Unit("0.01")
6361
pc = pica = Unit("12.0")
6462
dd = didot = Unit("1.07")

0 commit comments

Comments
 (0)