Moving to xmldiff 2.0

.coveragerc

@@ -1,3 +1,4 @@
 [run]
 source = xmldiff
-omit = */test*
+omit = tests*
+       xmldiff/*diff_match_patch*.py

.gitignore

@@ -1,23 +1,10 @@
+*.pyc
+__pycache__
+*.bak
+*.egg-info
+*.wp?
 .eggs
-.pytest_cache/
-.cache
 .tox
-.venv/
-
-tags
-TAGS
-ID
-bin
-eggs
-parts
-tree
-develop-eggs
-src/xmldiff.egg-info/
-.installed.cfg
-tmp
-*.so
-*.py?
 .coverage
 htmlcov
-coverage
-coverage.xml
+docs/build

.travis.yml

@@ -1,17 +1,28 @@
 language: python
-sudo: false
+
+# Travis doesn't support 3.7 by default, but if we run it on xenial it works
 matrix:
-    include:
-        - python: 2.7
-          env: TOXENV=py27
-        - python: 3.6
-          env: TOXENV=py36
+  fast_finish: true
+  include:
+  - python: 2.7
+  - python: 3.5
+  - python: 3.6
+  - python: 3.7
+    sudo: required
+    dist: xenial
+  - python: pypy
+  - python: pypy3
+
 install:
-  - pip install tox-travis coveralls
+  - pip install . coverage coveralls flake8 sphinx sphinx sphinx-argparse
+
 script:
-  - tox
-notifications:
-    email: false
+  - make flake
+  - make coverage
+  - cd docs; make doctest; make html
 
 after_success:
   - coveralls
+
+cache:
+  pip: true

CHANGES.rst

@@ -1,250 +1,30 @@
-CHANGES
+Changes
 =======
 
-1.1.2 (unreleased)
+2.0b2 (unreleased)
 ------------------
 
-- When I fixed the xpath namespace handling I also changed the tag names to
-  an xpath syntax. This was unhelpful, so I changed that back. To solve this
-  I have had to extend the return format from the parser and ass a N_NSPREFIX
-  that contains the prefix. This is used by the differ to return correct
-  xpaths without changing the tags.
+- Documentation
 
-- The AbstractFormatter.init() method made exactly zero sense and made it
-  practically impossible to set the output stream to anything but sys.stdout.
-  Fixed and deprecated.
+- The diff formatter now handles the --keep-whitespace argument
 
+- Added a ``--version`` argument
 
-1.1.1 (2018-06-20)
-------------------
-
-- When moving attributes the secondary rename action xpath was
-  '//LogilabXmldiffTmpAttr<attrib>' which is a tag specification.
-  Changed this to '//@LogilabXmldiffTmpAttr<attrib>', so an attribute
-  is specified.
-
-
-1.1.0 (2018-06-15)
-------------------
-
-- When using namespaces, the returned xpaths are now in the form ns_prefix:tag
-  instead of the earlier {ns_uri}tag, which isn't correct xpaths.
 
-
-1.0.0 (2018-04-13)
+2.0b1 (2018-09-03)
 ------------------
 
-- pep8 cleanup, added flake8 checking to tox
-
-
-1.0.0a6 (2018-04-12)
---------------------
-
-- Removed encoding, because python does unicode just fine
-
-- Switched on namespace handling for XML input
-
-
-1.0.0a5 (2018-04-11)
---------------------
-
-- Brownbag release to make up for bad previous ones.
-
-1.0.0a2 (2018-04-11)
---------------------
+- A complete, bottom-up, pure-python rewrite
 
-- Temporary disabling of encoding text (hopefully permanent).
+- New easy API
 
-- Reverted bug fix: Do not remove newlines from text while parsing
-  the XML.
+- New output formats:
 
+  - A list of actions (similar but not compatible with the old format)
 
-1.0.0a1 (2018-04-10)
---------------------
+  - XML with changes marked though tags and attributes
 
-- Bug: Fix a off-by-one issue with `insert-after` action.
-
-- Bug: Do not rename children on text node updates.
-
-- Bug: Text moves were not recorded as part of the fmes edit script.
-
-- Remove only partially implemented xmlrev script.
-
-- Removed support for xupdate, which never became a standard.
-
-- Removed deprecated ezs optional algorithm.
-
-- Removed support for Debian and RedHat packaging.
-
-- Removed Windows support
-
-- LOTS of package cleanup (setup.py, MANIFEST, proper console script, etc)
-
-- tests moved to py.test and cleaned, added tox, travis, coverage support
-
-
-0.6.10 (2010-08-27)
--------------------
-
-- apply Daiki Ueno patch: fails when comparing minimal trees on i386
-
-
-0.6.9 (2009-04-02)
-------------------
-
-- Fixed xmldiff-xmlrev compilation error
-
-
-0.6.8 (2006-06-15)
-------------------
-
-- Fixed 64bit cleanness issues
-
-
-0.6.7 (2005-05-04)
-------------------
-
-- WARNING: xmldiff is no longer a logilab subpackage. Users may have to
-  manually remove the old logilab/xmldiff directory.
-
-- fixed debian bug #275750, also reported by Christopher R Newman on the
-  xml-projects mailing list
-
-- fixed --profile option, wrap function from maplookup when profiling so that
-  they appear in the profile information
-
-- fixed setup.py to ignore the xmlrev shell script under windows platforms
-
-- small improvements (remove recursion in object.py, minor enhancement in
-  mydifflib.py, rewrite of lcs4 in C)
-
-
-0.6.6 (2004-12-23)
-------------------
-
-- Applied patch by Bastian Kleineidam <[email protected]> which
-
-  - corrects the typo in  ML_DIR
-
-  - fixes the TMPFILE_XSLT/TMPFILE_XSL typo
-
-  - makes sure the files are XML or SGML files, else prints an error
-
-  - adds various missing quotes around filenames which could have
-    spaces or begin with a hyphen
-
-  - fixes typos in the usage() function
-
-  Thanks a lot, Bastian.
-
-- Fixed some problems in the xmlrev.xslt stylesheet
-
-- Fixed problems in xmlrev caused by the exit status of xmldiff when
-  successful
-
-- Added a man page for xmldiff and xmlrev
-
-
-0.6.5 (2004-09-02)
-------------------
-
-- xmlrev bugfixes
-
-- Fixed packaging problems (missing xsl stylesheets and MANIFEST file)
-
-
-0.6.4 (2003-10-02)
-------------------
-
-- fix recursive mode
-
-- rewrite regression test, add test for the recursive mode
-
-- add --help option to xlmrev
-
-- packaging fixes
-
-- turn API.txt and HELP.txt to correct ReST
-
-
-0.6.3 (2002-11-06)
-------------------
-
-- fix wrong xpath for attributes
-
-- fix bug with temporary duplicate attribute node
-
-- fix for xupdate
-
-- fix ext_pes option bug
-
-- update changelog to new format
-
-
-0.6.2 (2002-09-23)
-------------------
-
-- return number of differences on command line
-
-- reintroduce misc.list_print which caused recursive mode
-  to fail
-
-- use psyco if available (http://psyco.sf.net)
-
-- little changes in C extension
-
-
-0.6.1 (2002-08-29)
-------------------
-
-- fix packaging problems
-
-
-0.6.0 (2002-08-23)
-------------------
-
-- change of the internal representation
-
-- remove support for the EZS algorithm (no more maintened
-  for the moment)
-
-- add command line options to parse html and to control
-  entities inclusion and output encoding
-
-- fixing coalescing text nodes bug
-
-- many other bugs fixes
-
-- great speed improvement
-
-
-0.5.3 (2002-01-31)
-------------------
-
-- add __init__.py in "logilab" directory
-
-
-0.5.2 (2001-10-29)
-------------------
-
-- bug fixes in xupdate formatting and in the dom interface.
-
-
-0.5.1 (2001-09-07)
-------------------
-
-- Fast Match / Edit Scritp algorithm, now fully usable
-
-- fixes Unicode problem
-
-
-0.2.1 (2001-08-10)
-------------------
-
-- bug fixes, optimizations for ezs algorithm
-
-
-0.1.1 (2001-08-04)
-------------------
+  - RML aware XML where tags containing text are semantically diffed, useful
+    for human output such as converting to HTML or PDF
 
-- original revision
+- 100% test coverage