Merge pull request #6 from eea/develop

 Refs #97586 - Update to wkhtmltopdf 0.12.4 --disable-smart-shrinking

CONTRIBUTING.md

@@ -46,4 +46,4 @@ official issue register.
 
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* [EEA packages](http://eea.github.io/docs/IT-systems/)
+* [EEA packages](https://eea.github.io/docs/IT-systems/)

README.rst

@@ -300,9 +300,9 @@ Funding
 
 EEA_ - European Environment Agency (EU)
 
-.. _EEA: http://www.eea.europa.eu/
-.. _`plone.recipe.zope2instance`: http://pypi.python.org/pypi/plone.recipe.zope2instance
-.. _`zc.buildout`: http://pypi.python.org/pypi/zc.buildout
-.. _`eea.pdf`: http://eea.github.com/docs/eea.pdf
-.. _`eea.epub`: http://eea.github.com/docs/eea.epub
+.. _EEA: https://www.eea.europa.eu/
+.. _`plone.recipe.zope2instance`: https://pypi.python.org/pypi/plone.recipe.zope2instance
+.. _`zc.buildout`: https://pypi.python.org/pypi/zc.buildout
+.. _`eea.pdf`: https://eea.github.com/docs/eea.pdf
+.. _`eea.epub`: https://eea.github.com/docs/eea.epub
 .. _`PyPDF2`: https://pypi.python.org/pypi/PyPDF2/1.25.1

docs/HISTORY.txt

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+12.3 - (2018-08-22)
+---------------------
+* Change: Update to wkhtmltopdf 0.12.4 (add ----disable-smart-shrinking option)
+  [avoinea refs #97586]
+* Change: updated URLs pointing to eea.europa.eu with https://
+  [alecghica refs #95849]
+* Change: fix tests to run on Plone 4.3.17
+  [alecghica refs #96974]
+
 12.2 - (2018-04-20)
 -------------------
 * Change: Possibility to group download info within AsyncInfo wrapper
@@ -340,4 +349,3 @@ Changelog
 ------------------
 * Initial release
   [voineali]
-

eea/converter/README.txt

@@ -22,5 +22,5 @@ Authors
 
   EEA_ - European Environment Agency (EU)
 
-.. _EEA: http://www.eea.europa.eu/
-.. _`eea.googlecharts`: http://eea.github.com/docs/eea.googlecharts
+.. _EEA: https://www.eea.europa.eu/
+.. _`eea.googlecharts`: https://eea.github.io/docs/eea.googlecharts

eea/converter/pdf/adapters.py

@@ -75,6 +75,7 @@ def options(self):
         """
         if self._options is None:
             self._options = [
+                '--disable-smart-shrinking',
                 '--page-size', 'A4',
                 '--page-offset', '2',
                 '--print-media-type',

eea/converter/version.txt

@@ -1 +1 @@
-12.2
+12.3

setup.py

@@ -14,7 +14,7 @@
                    "tools as ImageMagick"),
       long_description=open("README.rst").read() + "\n" +
                        open(os.path.join("docs", "HISTORY.txt")).read(),
-      # http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      # https://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
           "Framework :: Zope2",
           "Framework :: Plone",
@@ -31,7 +31,7 @@
       keywords='EEA converter imagemagick utility Add-ons Plone Zope',
       author='European Environment Agency: IDM2 A-Team',
       author_email="eea-edw-a-team-alerts@googlegroups.com",
-      download_url="http://pypi.python.org/pypi/eea.converter",
+      download_url="https://pypi.python.org/pypi/eea.converter",
       url='https://github.com/collective/eea.converter',
       license='GPL',
       packages=find_packages(exclude=['ez_setup']),