From 0de74cbfbfa19cbe1b969ae6a63c7963c5e9086d Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Fri, 13 Jan 2017 13:36:26 +0100 Subject: Move against submodules to GitLab. --- .../3b918fae-212f-4844-a96d-df0f2e4db761/body | 5 --- .../3b918fae-212f-4844-a96d-df0f2e4db761/values | 29 ------------- .../6cf9ff31-d607-427c-bf87-036baeb80892/values | 50 ---------------------- .be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/settings | 1 - .be/version | 1 - .gitignore | 2 +- .gitmodules | 4 +- NEWS.txt | 10 ++++- README.txt | 2 +- json_diff.py | 2 +- setup.py | 2 +- 11 files changed, 15 insertions(+), 93 deletions(-) delete mode 100644 .be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/comments/3b918fae-212f-4844-a96d-df0f2e4db761/body delete mode 100644 .be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/comments/3b918fae-212f-4844-a96d-df0f2e4db761/values delete mode 100644 .be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/values delete mode 100644 .be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/settings delete mode 100644 .be/version diff --git a/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/comments/3b918fae-212f-4844-a96d-df0f2e4db761/body b/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/comments/3b918fae-212f-4844-a96d-df0f2e4db761/body deleted file mode 100644 index 3e1da22..0000000 --- a/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/comments/3b918fae-212f-4844-a96d-df0f2e4db761/body +++ /dev/null @@ -1,5 +0,0 @@ -When running - -json_diff test/DMS* - -json_diff fails with recursive error. diff --git a/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/comments/3b918fae-212f-4844-a96d-df0f2e4db761/values b/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/comments/3b918fae-212f-4844-a96d-df0f2e4db761/values deleted file mode 100644 index 6a38bbe..0000000 --- a/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/comments/3b918fae-212f-4844-a96d-df0f2e4db761/values +++ /dev/null @@ -1,29 +0,0 @@ -{ - - - - - - - "Author": "Mat\u011bj Cepl ", - - - - - - - "Content-type": "text/plain", - - - - - - - "Date": "Thu, 29 Aug 2013 22:55:20 +0000" - - - - - - -} diff --git a/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/values b/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/values deleted file mode 100644 index 0ec557a..0000000 --- a/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/bugs/6cf9ff31-d607-427c-bf87-036baeb80892/values +++ /dev/null @@ -1,50 +0,0 @@ -{ - - - - - - - "creator": "Mat\u011bj Cepl ", - - - - - - - "reporter": "Mat\u011bj Cepl ", - - - - - - - "severity": "minor", - - - - - - - "status": "open", - - - - - - - "summary": "Recursive search fails", - - - - - - - "time": "Thu, 29 Aug 2013 22:52:49 +0000" - - - - - - -} diff --git a/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/settings b/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/settings deleted file mode 100644 index 0967ef4..0000000 --- a/.be/df8d9667-5196-43aa-aa49-5d4a9d207a5c/settings +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/.be/version b/.be/version deleted file mode 100644 index 38d39ae..0000000 --- a/.be/version +++ /dev/null @@ -1 +0,0 @@ -Bugs Everywhere Directory v1.5 diff --git a/.gitignore b/.gitignore index bc3c246..6fb92c6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ dist/ MANIFEST build/ -.be/id-cache +json_diff.egg-info/ diff --git a/.gitmodules b/.gitmodules index 7ce5704..1f3eda4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "xdiff/UM-J"] path = xdiff/UM-J - url = http://luther.ceplovi.cz/git/UM-J.git + url = https://gitlab.com/mcepl/UM-J.git [submodule "xdiff/UM-C"] path = xdiff/UM-C - url = http://luther.ceplovi.cz/git/UM-C.git + url = https://gitlab.com/mcepl/UM-C.git diff --git a/NEWS.txt b/NEWS.txt index 5ab5770..b48f206 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,3 +1,11 @@ +1.3.5 2017-01-13 + * Fedorahosted dies, everything (including submodules) moved to + GitLab.com + +1.3.4 2015-03-13 + * Switch to setuptools + * Reorganization of repositories (fedorahosted) + 1.3.3 2012-04-24 * Grrr, python 2.4 doesn't have context managers @@ -58,4 +66,4 @@ 0.9.1 2011-11-21 Two small nits in __main__ part. -(for detailed log of all changes see git log) \ No newline at end of file +(for detailed log of all changes see git log) diff --git a/README.txt b/README.txt index 2ae2c86..11e0413 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ Compares two JSON files (http://json.org) and generates a new JSON file with the result. Allows exclusion of some keys from the comparison, or in other way to include only some keys. -The project’s website is at https://fedorahosted.org/json_diff/ +The project’s website is at https://gitlab.com/mcepl/json_diff Patches and pull requests are welcome, but please keep the script compatible with python 2.4. diff --git a/json_diff.py b/json_diff.py index bdbe23d..28d3f52 100755 --- a/json_diff.py +++ b/json_diff.py @@ -33,7 +33,7 @@ import logging from optparse import OptionParser __author__ = "Matěj Cepl" -__version__ = "1.3.4" +__version__ = "1.3.5" logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s', level=logging.INFO) diff --git a/setup.py b/setup.py index bb99b07..2502654 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( description='Generates diff between two JSON files', author='Matěj Cepl', author_email='mcepl@redhat.com', - url='https://fedorahosted.org/json_diff/', + url='https://gitlab.com/mcepl/json_diff', py_modules=['json_diff'], long_description=get_long_description(), keywords=['json', 'diff'], -- cgit