Merge branch 'master' into documentation
This commit is contained in:
Jake Howard
GitHub
commit
06e32fdef6
13 changed files with 94 additions and 14 deletions
60
.sass-lint.yml
Normal file
60
.sass-lint.yml
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
rules:
|
||||||
|
clean-import-paths: 0
|
||||||
|
extends-before-mixins: 2
|
||||||
|
extends-before-declarations: 2
|
||||||
|
force-attribute-nesting: 0
|
||||||
|
no-css-comments: 0
|
||||||
|
no-debug: 1
|
||||||
|
no-duplicate-properties:
|
||||||
|
- 2
|
||||||
|
-
|
||||||
|
exclude:
|
||||||
|
- src
|
||||||
|
- transform
|
||||||
|
no-ids: 0
|
||||||
|
no-important: 0
|
||||||
|
no-transition-all: 0
|
||||||
|
no-vendor-prefixes: 2
|
||||||
|
no-qualifying-elements: 0
|
||||||
|
no-url-protocols: 0
|
||||||
|
no-warn: 1
|
||||||
|
hex-notation:
|
||||||
|
- 2
|
||||||
|
-
|
||||||
|
style: uppercase
|
||||||
|
indentation:
|
||||||
|
- 2
|
||||||
|
-
|
||||||
|
size: 2
|
||||||
|
variable-name-format:
|
||||||
|
- 2
|
||||||
|
-
|
||||||
|
allow-leading-underscore: false
|
||||||
|
convention: hyphenatedlowercase
|
||||||
|
quotes:
|
||||||
|
- 2
|
||||||
|
-
|
||||||
|
style: double
|
||||||
|
property-sort-order:
|
||||||
|
- 2
|
||||||
|
-
|
||||||
|
order: 'concentric'
|
||||||
|
empty-line-between-blocks: 2
|
||||||
|
space-after-bang: 2
|
||||||
|
space-after-colon: 2
|
||||||
|
space-after-comma: 2
|
||||||
|
space-before-bang: 2
|
||||||
|
space-before-brace: 2
|
||||||
|
space-before-colon: 2
|
||||||
|
space-between-parens: 2
|
||||||
|
trailing-semicolon: 2
|
||||||
|
leading-zero: 0
|
||||||
|
single-line-per-selector: 0
|
||||||
|
force-pseudo-nesting: 0
|
||||||
|
force-element-nesting: 0
|
||||||
|
placeholder-in-extend: 0
|
||||||
|
no-url-domains: 0
|
||||||
|
nesting-depth:
|
||||||
|
- 2
|
||||||
|
-
|
||||||
|
max-depth: 5
|
||||||
|
|
@ -6,6 +6,10 @@ machine:
|
||||||
|
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
|
pre:
|
||||||
|
- sudo apt install pandoc pandoc-citeproc
|
||||||
|
- bash scripts/before_script.sh
|
||||||
|
|
||||||
post:
|
post:
|
||||||
- pip install -r dev-requirements.txt
|
- pip install -r dev-requirements.txt
|
||||||
|
|
||||||
|
|
@ -15,3 +19,4 @@ test:
|
||||||
- flake8 md_pdf/ --ignore=E128,E501
|
- flake8 md_pdf/ --ignore=E128,E501
|
||||||
- safety check
|
- safety check
|
||||||
- bandit -r md_pdf/
|
- bandit -r md_pdf/
|
||||||
|
- mdp --help
|
||||||
|
|
|
||||||
|
|
@ -21,4 +21,5 @@ function subst() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
window.subst = subst();
|
|
||||||
|
subst();
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,7 @@ body.cover {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
||||||
& h1 {
|
& h1 {
|
||||||
font-size: 48px;
|
|
||||||
padding-top: 400px;
|
padding-top: 400px;
|
||||||
|
font-size: 48px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<link rel="stylesheet" href="style.css" />
|
<link rel="stylesheet" href="../static/style.css" />
|
||||||
</head>
|
</head>
|
||||||
<body class="cover">
|
<body class="cover">
|
||||||
<h1>{{ title }}</h1>
|
<h1>{{ title }}</h1>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<link rel="stylesheet" href="style.css" />
|
<link rel="stylesheet" href="../static/style.css" />
|
||||||
<script type="text/javascript" src="context.js"></script>
|
|
||||||
</head>
|
</head>
|
||||||
<body onload="subst()" class="footer">
|
<body class="footer">
|
||||||
<table style="width: 100%;">
|
<table style="width: 100%;">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align: center">
|
<td style="text-align: center">
|
||||||
|
|
@ -12,5 +11,6 @@
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
<script type="text/javascript" src="../static/context.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<link rel="stylesheet" href="style.css" />
|
<link rel="stylesheet" href="../static/style.css" />
|
||||||
<script type="text/javascript" src="context.js"></script>
|
|
||||||
</head>
|
</head>
|
||||||
<body onload="subst()" class="header">
|
<body class="header">
|
||||||
|
<script type="text/javascript" src="../static/context.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,8 @@ PDF_OPTIONS = {
|
||||||
"footer-html": FOOTER_FILE,
|
"footer-html": FOOTER_FILE,
|
||||||
"footer-spacing": 5,
|
"footer-spacing": 5,
|
||||||
"header-spacing": 5,
|
"header-spacing": 5,
|
||||||
|
|
||||||
|
"user-style-sheet": STYLE_FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -34,6 +36,5 @@ def export_pdf(content, config):
|
||||||
content,
|
content,
|
||||||
os.path.join(os.path.abspath(config['output_dir']), 'output.pdf'),
|
os.path.join(os.path.abspath(config['output_dir']), 'output.pdf'),
|
||||||
options=PDF_OPTIONS,
|
options=PDF_OPTIONS,
|
||||||
css=STYLE_FILE,
|
|
||||||
cover=OUTPUT_COVER_FILE
|
cover=OUTPUT_COVER_FILE
|
||||||
)
|
)
|
||||||
|
|
|
||||||
0
md_pdf/config/__init__.py
Normal file
0
md_pdf/config/__init__.py
Normal file
|
|
@ -24,7 +24,6 @@ def download_csl():
|
||||||
bar = ProgressBar()
|
bar = ProgressBar()
|
||||||
|
|
||||||
remove_dir(CSL_DIR)
|
remove_dir(CSL_DIR)
|
||||||
remove_dir(CSL_DOWNLOAD_LINK)
|
|
||||||
|
|
||||||
def download_handle(count, block_size, total_size):
|
def download_handle(count, block_size, total_size):
|
||||||
bar.update(int(count * block_size * 100 / total_size))
|
bar.update(int(count * block_size * 100 / total_size))
|
||||||
|
|
@ -48,6 +47,7 @@ def download_csl():
|
||||||
bar.finish()
|
bar.finish()
|
||||||
|
|
||||||
logger.info("Cleaning Up...")
|
logger.info("Cleaning Up...")
|
||||||
|
os.close(_)
|
||||||
shutil.copytree(CSL_TEMP_DIR, CSL_DIR)
|
shutil.copytree(CSL_TEMP_DIR, CSL_DIR)
|
||||||
os.remove(download_location)
|
os.remove(download_location)
|
||||||
remove_dir(CSL_TEMP_DIR)
|
remove_dir(CSL_TEMP_DIR)
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
"description": "",
|
"description": "",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "npm run lint-scss && npm run lint-js",
|
"test": "npm run lint-scss && npm run lint-js",
|
||||||
"lint-scss": "sass-lint -vq md_pdf/assets/static/**/*.scss",
|
"lint-scss": "sass-lint -vqc .sass-lint.yml md_pdf/assets/static/**/*.scss",
|
||||||
"lint-js": "eslint -c eslint-config-dabapps/base/.eslintrc md_pdf/assets/static/**/*.js"
|
"lint-js": "eslint -c eslint-config-dabapps/base/.eslintrc md_pdf/assets/static/**/*.js"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
|
||||||
12
scripts/before_script.sh
Normal file
12
scripts/before_script.sh
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# 'stolen' from https://github.com/JazzCore/python-pdfkit/blob/master/travis/before-script.sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
sudo apt-get install -y openssl build-essential xorg libssl-dev
|
||||||
|
wget http://download.gna.org/wkhtmltopdf/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
|
||||||
|
tar -xJf wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
|
||||||
|
cd wkhtmltox
|
||||||
|
sudo chown root:root bin/wkhtmltopdf
|
||||||
|
sudo cp -r * /usr/
|
||||||
4
setup.py
4
setup.py
|
|
@ -1,4 +1,4 @@
|
||||||
from setuptools import setup
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
|
|
@ -13,6 +13,8 @@ setup(
|
||||||
"pyscss==1.3.5",
|
"pyscss==1.3.5",
|
||||||
"PyYAML==3.12"
|
"PyYAML==3.12"
|
||||||
],
|
],
|
||||||
|
packages=find_packages(),
|
||||||
|
include_package_data=True,
|
||||||
entry_points="""
|
entry_points="""
|
||||||
[console_scripts]
|
[console_scripts]
|
||||||
mdp=md_pdf.cli:cli
|
mdp=md_pdf.cli:cli
|
||||||
|
|
|
||||||
Reference in a new issue