Removal of smartypants #708

ralsina · 2018-11-10T00:15:55Z

Removed our copy of Smartypants and added it as a dependency. Fix #694

ralsina · 2019-01-02T18:22:13Z

@akrabat our old copy of smartypants has ... 572 style and other kinds of flake8 warnings, so this looks like a good thing to merge :-)

akrabat · 2019-01-02T19:38:18Z

I can't seem to run the tests:

$ nosetests -x -v -i regulartest -i sphinxtest
numbered_links.txt ... FAIL

======================================================================
FAIL: numbered_links.txt
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/nose/case.py", line 197, in runTest
    self.test(*self.arg)
  File "/Users/rob/Projects/python/rst2pdf/rst2pdf/tests/test.py", line 50, in __call__
    assert key == 'good', '%s is not good: %s'%(f,key)
AssertionError: /Users/rob/Projects/python/rst2pdf/rst2pdf/tests/input/numbered_links.txt is not good: fail
-------------------- >> begin captured stdout << ---------------------
Process "coverage" started on Wed Jan  2 19:36:44 2019

        coverage run -a /Users/rob/.pyenv/versions/rst2pdf/bin/rst2pdf
        --date-invariant -v numbered_links.txt --use-numbered-links -o
        /Users/rob/Projects/python/rst2pdf/rst2pdf/tests/output/numbered_links.pdf


* Traceback (most recent call last):
*   File "/Users/rob/.pyenv/versions/rst2pdf/bin/rst2pdf", line 11, in <module>
*     load_entry_point('rst2pdf', 'console_scripts', 'rst2pdf')()
*   File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/pkg_resources/__init__.py", line 484, in load_entry_point
*     return get_distribution(dist).load_entry_point(group, name)
*   File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2714, in load_entry_point
*     return ep.load()
*   File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2332, in load
*     return self.resolve()
*   File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2338, in resolve
*     module = __import__(self.module_name, fromlist=['__name__'], level=0)
*   File "/Users/rob/Projects/python/rst2pdf/rst2pdf/createpdf.py", line 99, in <module>
*     from rst2pdf.nodehandlers import nodehandlers
*   File "/Users/rob/Projects/python/rst2pdf/rst2pdf/nodehandlers.py", line 10, in <module>
*     from . import genelements
*   File "/Users/rob/Projects/python/rst2pdf/rst2pdf/genelements.py", line 52, in <module>
*     from .basenodehandler import NodeHandler
*   File "/Users/rob/Projects/python/rst2pdf/rst2pdf/basenodehandler.py", line 40, in <module>
*     from smartypants import smartypants
* ImportError: cannot import name smartypants

Program coverage exit code: FAIL (1)   elapsed time: 01.6 seconds

File numbered_links.pdf not generated

However smartypants is installed:

$ pip show smartypants
Name: smartypants
Version: 2.0.1
Summary: Python with the SmartyPants
Home-page: https://github.com/leohemsted/smartypants.py
Author: Leo Hemsted
Author-email: leohemsted@gmail.com
License: BSD License
Location: /Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages
Requires:
Required-by:

ralsina · 2019-01-02T19:46:04Z

Grmbl, I will take a look at that in a second.

…

On Wed, Jan 2, 2019 at 4:38 PM Rob Allen ***@***.***> wrote: I can't seem to run the tests: $ nosetests -x -v -i regulartest -i sphinxtest numbered_links.txt ... FAIL ====================================================================== FAIL: numbered_links.txt ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/nose/case.py", line 197, in runTest self.test(*self.arg) File "/Users/rob/Projects/python/rst2pdf/rst2pdf/tests/test.py", line 50, in __call__ assert key == 'good', '%s is not good: %s'%(f,key) AssertionError: /Users/rob/Projects/python/rst2pdf/rst2pdf/tests/input/numbered_links.txt is not good: fail -------------------- >> begin captured stdout << --------------------- Process "coverage" started on Wed Jan 2 19:36:44 2019 coverage run -a /Users/rob/.pyenv/versions/rst2pdf/bin/rst2pdf --date-invariant -v numbered_links.txt --use-numbered-links -o /Users/rob/Projects/python/rst2pdf/rst2pdf/tests/output/numbered_links.pdf * Traceback (most recent call last): * File "/Users/rob/.pyenv/versions/rst2pdf/bin/rst2pdf", line 11, in <module> * load_entry_point('rst2pdf', 'console_scripts', 'rst2pdf')() * File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/pkg_resources/__init__.py", line 484, in load_entry_point * return get_distribution(dist).load_entry_point(group, name) * File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2714, in load_entry_point * return ep.load() * File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2332, in load * return self.resolve() * File "/Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages/pkg_resources/__init__.py", line 2338, in resolve * module = __import__(self.module_name, fromlist=['__name__'], level=0) * File "/Users/rob/Projects/python/rst2pdf/rst2pdf/createpdf.py", line 99, in <module> * from rst2pdf.nodehandlers import nodehandlers * File "/Users/rob/Projects/python/rst2pdf/rst2pdf/nodehandlers.py", line 10, in <module> * from . import genelements * File "/Users/rob/Projects/python/rst2pdf/rst2pdf/genelements.py", line 52, in <module> * from .basenodehandler import NodeHandler * File "/Users/rob/Projects/python/rst2pdf/rst2pdf/basenodehandler.py", line 40, in <module> * from smartypants import smartypants * ImportError: cannot import name smartypants Program coverage exit code: FAIL (1) elapsed time: 01.6 seconds File numbered_links.pdf not generated However smartypants is installed: $ pip show smartypants Name: smartypants Version: 2.0.1 Summary: Python with the SmartyPants Home-page: https://github.com/leohemsted/smartypants.py Author: Leo Hemsted Author-email: ***@***.*** License: BSD License Location: /Users/rob/.pyenv/versions/2.7.15/envs/rst2pdf/lib/python2.7/site-packages Requires: Required-by: — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#708 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAAGK_vCK2LPlFWAkdAYuGTiS30VHU4nks5u_QqqgaJpZM4YXtQL> .

ralsina · 2019-01-03T12:39:18Z

@akrabat That error importing smartypants is because you have stale .pyc files, remove them and all will be well (although there are other test errors, which I am looking into)

ralsina · 2019-01-03T13:01:15Z

@akrabat please check

oz123

In the end the amount of code changed is surprisingly very little!

ralsina · 2019-01-03T16:20:42Z

Yeah, there was just a minor API change in smartypants in the last ... 10 years or so?

…

On Thu, Jan 3, 2019 at 1:15 PM Oz N Tiram ***@***.***> wrote: ***@***.**** approved this pull request. In the end the amount of code changed is surprisingly very little! — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#708 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAAGK9ff7wuYVdzydX5p5P5nVknE7vtbks5u_iyvgaJpZM4YXtQL> .

akrabat · 2019-01-03T20:35:15Z

requirements.txt

@@ -39,4 +39,9 @@ svg2rlg==0.3
 typing==3.6.6             # via sphinx
 urllib3==1.24.1           # via requests
 webencodings==0.5.1       # via html5lib
+smartypants==2.0.1


This needs to go in requirements.in I believe?

Eek, what the heck is pip-compile? It doesn't even seem to exist anymore.

https://github.com/jazzband/pip-tools

akrabat · 2019-01-03T20:38:42Z

rst2pdf/basenodehandler.py

@@ -36,10 +36,11 @@
 import inspect
 import types

+from log import log, nodeid


This is a duplicate of line 44

akrabat · 2019-01-03T20:40:28Z

rst2pdf/createpdf.py

@@ -94,7 +94,7 @@
 from rst2pdf.image import MyImage, missing
 from rst2pdf.aafigure_directive import Aanode
 from rst2pdf.log import log, nodeid
-from rst2pdf.smartypants import smartyPants
+import smartypants


Shouldn't we do from smartypants import smartypants as per basenodehandler.py?

It's the same thing, but sure, why not.

akrabat · 2019-01-03T20:48:02Z

rst2pdf/createpdf.py

-        self.smarty = smarty
+
+        # See https://pythonhosted.org/smartypants/reference.html#smartypants-module
+        self.smarty = 0


Can we rename this property to smartypants_attributes so that we know it's not the same as the smarty variable which holds the command line value of (0, 1 ,2 or 3)?

akrabat · 2019-01-03T20:51:09Z

rst2pdf/tests/input/test_smarty.cli

@@ -1 +1 @@
--smart-quotes=1
+--smart-quotes=2


Is this a BC break?

It's because the change in smartypants APIs don't allow reproducing the old behaviour, because there is no way to reproduce the specific combination of transformations it used to do.

ralsina · 2019-01-03T20:52:22Z

IIRC This seems to have been broken, so I changed the behaviour and the docs to match what was the actual behaviour.

…

On Thu, Jan 3, 2019 at 5:51 PM Rob Allen ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In rst2pdf/tests/input/test_smarty.cli <#708 (comment)>: > @@ -1 +1 @@ ---smart-quotes=1 +--smart-quotes=2 Is this a BC break? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#708 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAAGKzzoaR1OL2UoyRqIHUr98xYC2hW7ks5u_m0-gaJpZM4YXtQL> .

akrabat · 2019-01-03T21:05:43Z

@akrabat That error importing smartypants is because you have stale .pyc files, remove them and all will be well (although there are other test errors, which I am looking into)

You were right.

find . -name "*.pyc" -exec rm {} \; solved my problem!

ralsina · 2019-01-04T20:49:43Z

@akrabat I think I addressed all the comments, merge at will :-)

Closes rst2pdf#708 Fixes rst2pdf#694

ralsina added 5 commits November 9, 2018 21:11

naive removal of smartypants

ef53e82

adapt to newer smartypants

a364d6a

fix import

e53161d

freeze smartypants requirement

71d80d8

fix another usage of smartypants

74ee22a

ralsina changed the title ~~Removal of smartypants~~ [WIP] Removal of smartypants Nov 10, 2018

Roberto Alsina and others added 19 commits November 13, 2018 11:45

Attempt to match current smartypants API (not working yet)

57a46df

Attempt to match current smartypants API (closer)

6a2044e

So, the test was just wrong. Made code/docs/test consistent

4a32dc9

typo

1e11077

Merge branch 'master' into kill-smarty

1182fcb

There is no real difference between this and master

3855a1c

naive removal of smartypants

6c21c7d

adapt to newer smartypants

60cda3a

fix import

30852ae

freeze smartypants requirement

1fcef8e

fix another usage of smartypants

34d96fc

Attempt to match current smartypants API (not working yet)

5c6f239

Attempt to match current smartypants API (closer)

d21d845

So, the test was just wrong. Made code/docs/test consistent

0b364ae

typo

ae5a0e1

There is no real difference between this and master

ef032eb

rebased

aaf5afe

Fix rebase-introduced regression

022c0c6

Merge branch 'master' into kill-smarty

5ff4c97

updated 2 test checksums

1467b93

ralsina changed the title ~~[WIP] Removal of smartypants~~ Removal of smartypants Jan 3, 2019

remove duplicate emntry in changelog

11b98b4

oz123 approved these changes Jan 3, 2019

View reviewed changes

akrabat reviewed Jan 3, 2019

View reviewed changes

Follow review suggestions

a0d45c8

akrabat approved these changes Jan 6, 2019

View reviewed changes

akrabat added a commit to akrabat/rst2pdf that referenced this pull request Jan 6, 2019

Merge branch 'kill-smarty'

0209348

Closes rst2pdf#708 Fixes rst2pdf#694

akrabat merged commit a0d45c8 into master Jan 6, 2019

akrabat added this to the 0.94 milestone Feb 12, 2019

akrabat deleted the kill-smarty branch December 18, 2019 09:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Removal of smartypants #708

Removal of smartypants #708

ralsina commented Nov 10, 2018 •

edited

ralsina commented Jan 2, 2019

akrabat commented Jan 2, 2019

ralsina commented Jan 2, 2019 via email

ralsina commented Jan 3, 2019

ralsina commented Jan 3, 2019 •

edited

oz123 left a comment

ralsina commented Jan 3, 2019 via email

akrabat Jan 3, 2019

ralsina Jan 4, 2019

akrabat Jan 5, 2019

ralsina Jan 5, 2019

akrabat Jan 3, 2019

akrabat Jan 3, 2019

ralsina Jan 4, 2019

akrabat Jan 3, 2019

akrabat Jan 3, 2019

ralsina Jan 4, 2019

ralsina commented Jan 3, 2019 via email

akrabat commented Jan 3, 2019

ralsina commented Jan 4, 2019

		@@ -1 +1 @@
		--smart-quotes=1
		--smart-quotes=2

Removal of smartypants #708

Removal of smartypants #708

Conversation

ralsina commented Nov 10, 2018 • edited

ralsina commented Jan 2, 2019

akrabat commented Jan 2, 2019

ralsina commented Jan 2, 2019 via email

ralsina commented Jan 3, 2019

ralsina commented Jan 3, 2019 • edited

oz123 left a comment

Choose a reason for hiding this comment

ralsina commented Jan 3, 2019 via email

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ralsina commented Jan 3, 2019 via email

akrabat commented Jan 3, 2019

ralsina commented Jan 4, 2019

ralsina commented Nov 10, 2018 •

edited

ralsina commented Jan 3, 2019 •

edited