There are currently two attempts to package this package.

One from April 2020 at
https://salsa.debian.org/python-team/packages/python-jsonrpc-server
and one from July 2020 at
https://salsa.debian.org/elMor3no-guest/python-jsonrpc-server

They have no shared history. To complete this, I will need to ditch
either one and only upload the other based on which one I assess to be
of better quality.

They both claim to be based on the upstream 0.3.4 version, but either
one is false since the upstream contents differ:

$ diff -ur python-jsonrpc-server-boyuan/ python-jsonrpc-server-pablo/
| diffstat | grep -v .git
 python-jsonrpc-server-boyuan//PKG-INFO
                            |only
 python-jsonrpc-server-boyuan//python_jsonrpc_server.egg-info
                            |only
 python-jsonrpc-server-boyuan/debian/exmaples
                            |only
 python-jsonrpc-server-pablo//.circleci
                            |only
 python-jsonrpc-server-pablo//.coveragerc
                            |only
 python-jsonrpc-server-pablo//appveyor.yml
                            |only
 python-jsonrpc-server-pablo//examples
                            |only
 python-jsonrpc-server-pablo//scripts
                            |only
 python-jsonrpc-server-pablo/debian/changelog
                            |   13
 python-jsonrpc-server-pablo/debian/clean
                            |only
 python-jsonrpc-server-pablo/debian/control
                            |   46
 python-jsonrpc-server-pablo/debian/copyright
                            |   43
 python-jsonrpc-server-pablo/debian/gbp.conf
                            |only
 python-jsonrpc-server-pablo/debian/patches/python-3.8.patch
                            |   18
 python-jsonrpc-server-pablo/debian/rules
                            |   22
 python-jsonrpc-server-pablo/debian/upstream
                            |only
 python-jsonrpc-server-pablo/debian/watch
                            |    4
 python-jsonrpc-server-pablo/pyls_jsonrpc/_version.py
                            |  533 +++++++++-
 python-jsonrpc-server-pablo/setup.cfg
                            |   17


Also the differences in the Debian packaging are quite significant:

$ diff -ur python-jsonrpc-server-boyuan/debian
python-jsonrpc-server-pablo/debian/
diff -ur python-jsonrpc-server-boyuan/debian/changelog
python-jsonrpc-server-pablo/debian/changelog
--- python-jsonrpc-server-boyuan/debian/changelog 2020-10-30
21:44:35.362933098 +0200
+++ python-jsonrpc-server-pablo/debian/changelog 2020-10-30
21:48:02.289974893 +0200
@@ -1,14 +1,5 @@
-python-jsonrpc-server (0.3.4-2) UNRELEASED; urgency=medium
-
-  * d/control: Update Maintainer field with new Debian Python Team
-    contact address.
-  * d/control: Update Vcs-* fields with new Debian Python Team Salsa
-    layout.
-
- -- Ondřej Nový <on...@debian.org>  Thu, 24 Sep 2020 08:42:20 +0200
-
 python-jsonrpc-server (0.3.4-1) unstable; urgency=medium

-  * Initial release.
+  * Initial release (Closes: #964497)

- -- Boyuan Yang <by...@debian.org>  Sat, 25 Apr 2020 09:34:42 -0400
+ -- Pablo Mestre Drake <pmdc...@gmail.com>  Thu, 17 Sep 2020 12:05:20 -0300
Only in python-jsonrpc-server-pablo/debian/: clean
diff -ur python-jsonrpc-server-boyuan/debian/control
python-jsonrpc-server-pablo/debian/control
--- python-jsonrpc-server-boyuan/debian/control 2020-10-30
21:44:35.362933098 +0200
+++ python-jsonrpc-server-pablo/debian/control 2020-10-30
21:48:02.289974893 +0200
@@ -1,31 +1,27 @@
 Source: python-jsonrpc-server
-Priority: optional
 Section: python
+Priority: optional
+Maintainer: Pablo Mestre Drake <pmdc...@gmail.com>
+Build-Depends: debhelper-compat (= 13),
+               python3-pytest,
+               dh-sequence-python3,
+               python3-pytest-cov,
+               python3-setuptools,
+               python3-ujson,
+               python3-mock,
+               python3-all
 Standards-Version: 4.5.0
-Maintainer: Debian Python Team <team+pyt...@tracker.debian.org>
-Uploaders:
- Boyuan Yang <by...@debian.org>,
-Build-Depends:
- debhelper-compat (= 12),
- dh-sequence-python3,
- python3,
- python3-ujson,
- python3-setuptools,
- python3-versioneer,
- python3-pytest <!nocheck>,
- python3-pytest-cov <!nocheck>,
- python3-mock <!nocheck>,
 Homepage: https://github.com/palantir/python-jsonrpc-server
-Vcs-Git: 
https://salsa.debian.org/python-team/packages/python-jsonrpc-server.git
-Vcs-Browser: 
https://salsa.debian.org/python-team/packages/python-jsonrpc-server
+Vcs-Browser: https://salsa.debian.org/delMor3no-guest/python-jsonrpc-server
+Vcs-Git: https://salsa.debian.org/elMor3no-guest/python-jsonrpc-server.git
+Rules-Requires-Root: no

-Package: python3-jsonrpc-server
+Package: python3-pyls-jsonrpc
 Architecture: all
-Depends:
- ${python3:Depends},
- ${misc:Depends},
-Description: Python implementation of the JSON RPC 2.0 protocol
- This is a python implementation of the JSON RPC 2.0 protocol.
- The library comes out of the Python Language Server project.
- .
- This package provides the python3 library.
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         python3-ujson,
+Description: JSON-RPC is a stateless, light-weight remote procedure
call (RPC) protocol
+ A Python 2.7 and 3.4+ server implementation of
+ the JSON RPC 2.0 protocol. This library has been pulled out
+ of the Python Language Server project.
diff -ur python-jsonrpc-server-boyuan/debian/copyright
python-jsonrpc-server-pablo/debian/copyright
--- python-jsonrpc-server-boyuan/debian/copyright 2020-10-30
21:44:35.362933098 +0200
+++ python-jsonrpc-server-pablo/debian/copyright 2020-10-30
21:48:02.289974893 +0200
@@ -1,37 +1,32 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-jsonrpc-server
 Source: https://github.com/palantir/python-jsonrpc-server
+Upstream-Contact: Palantir Technologies, Inc <supp...@palantir.com>

 Files: *
-Copyright: 2017-2018 Palantir Technologies, Inc.
-License: Expat
+Copyright: Palantir Technologies, Inc <supp...@palantir.com>
+License: MIT

 Files: debian/*
-Copyright: 2020 Boyuan Yang <by...@debian.org>
-License: public-domain
- The files are released into the Public Domain.
+Copyright:
+    2020 Pablo Mestre Drake <pmdc...@gmail.com>
+    2020 Jochen Sprickerhof <jspri...@debian.org>
+License: MIT

-Files: versioneer.py pyls_jsonrpc/_version.py
-Copyright: Brian Warner <warner-version...@lothar.com>
-License: CC0-1.0
- On Debian systems, the full text of the CC0-1.0 license can be found in
- /usr/share/common-licenses/CC0-1.0.
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
  .
  The above copyright notice and this permission notice shall be included in all
  copies or substantial portions of the Software.
  .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF
+ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE
+ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Only in python-jsonrpc-server-boyuan/debian: exmaples
Only in python-jsonrpc-server-pablo/debian/: gbp.conf
diff -ur python-jsonrpc-server-boyuan/debian/patches/python-3.8.patch
python-jsonrpc-server-pablo/debian/patches/python-3.8.patch
--- python-jsonrpc-server-boyuan/debian/patches/python-3.8.patch
2020-10-30 21:44:35.362933098 +0200
+++ python-jsonrpc-server-pablo/debian/patches/python-3.8.patch
2020-10-30 21:48:02.289974893 +0200
@@ -1,8 +1,12 @@
-Origin: 
https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/python-jsonrpc-server
+From: Pablo Mestre Drake <pmdc...@gmail.com>
+Date: Fri, 11 Jul 2020 06:05:45 +0300
+Subject: Python-3.8.patch
+Description: Tests failing with Python 3.8
+Author: Aaron Griffin <aa...@archlinux.org>

-diff -uprb python-jsonrpc-server-0.2.0.orig/pyls_jsonrpc/endpoint.py
python-jsonrpc-server-0.2.0/pyls_jsonrpc/endpoint.py
---- python-jsonrpc-server-0.2.0.orig/pyls_jsonrpc/endpoint.py
2019-06-27 18:42:22.000000000 +0300
-+++ python-jsonrpc-server-0.2.0/pyls_jsonrpc/endpoint.py 2019-11-02
23:24:59.407851208 +0200
+diff -uprb python-jsonrpc-serve/pyls_jsonrpc/endpoint.py
python-jsonrpc-server/pyls_jsonrpc/endpoint.py
+--- python-jsonrpc-server/pyls_jsonrpc/endpoint.py   2019-06-27
18:42:22.000000000 +0300
++++ python-jsonrpc-server/pyls_jsonrpc/endpoint.py    2019-11-02
23:24:59.407851208 +0200
 @@ -98,7 +98,7 @@ class Endpoint(object):
              message (dict): The JSON RPC message sent by the client
          """
@@ -45,9 +49,9 @@

          log.debug("Received result for message %s: %s", msg_id, result)
          request_future.set_result(result)
-diff -uprb python-jsonrpc-server-0.2.0.orig/test/test_endpoint.py
python-jsonrpc-server-0.2.0/test/test_endpoint.py
---- python-jsonrpc-server-0.2.0.orig/test/test_endpoint.py 2019-06-27
18:42:22.000000000 +0300
-+++ python-jsonrpc-server-0.2.0/test/test_endpoint.py 2019-11-02
23:24:21.033838729 +0200
+diff -uprb python-jsonrpc-server/test/test_endpoint.py
python-jsonrpc-server/test/test_endpoint.py
+--- python-jsonrpc-server/test/test_endpoint.py  2019-06-27
18:42:22.000000000 +0300
++++ python-jsonrpc-server/test/test_endpoint.py   2019-11-02
23:24:21.033838729 +0200
 @@ -115,9 +115,9 @@ def test_request_cancel(endpoint, consum
          'params': {'id': MSG_ID}
      })
diff -ur python-jsonrpc-server-boyuan/debian/rules
python-jsonrpc-server-pablo/debian/rules
--- python-jsonrpc-server-boyuan/debian/rules 2020-10-30
21:44:35.362933098 +0200
+++ python-jsonrpc-server-pablo/debian/rules 2020-10-30 21:48:02.289974893 +0200
@@ -1,22 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all

 %:
  dh $@ --buildsystem=pybuild

-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- # Tests are known to be failing with python3.8
- # Awaiting upstream fix:
- # https://github.com/palantir/python-jsonrpc-server/issues/33
- # TODO: Migrate to autopkgtest
- #-dh_auto_test -O--buildsystem=pybuild
-endif
-
-override_dh_missing:
- dh_missing --fail-missing
+# make sure test results are not installed
+execute_after_dh_auto_test:
+ rm -f .pybuild/*/build/.coverage
+ rm -f .pybuild/*/build/pytest.xml
+ rm -rf .pybuild/*/build/htmlcov
Only in python-jsonrpc-server-pablo/debian/: upstream
diff -ur python-jsonrpc-server-boyuan/debian/watch
python-jsonrpc-server-pablo/debian/watch
--- python-jsonrpc-server-boyuan/debian/watch 2020-10-30
21:44:35.362933098 +0200
+++ python-jsonrpc-server-pablo/debian/watch 2020-10-30 21:48:02.293974952 +0200
@@ -1,4 +1,2 @@
 version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%python-jsonrpc-server-$1.tar.gz%"
\
- https://github.com/palantir/python-jsonrpc-server/releases \
-  (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/python-jsonrpc-server-$1\.tar\.gz/
https://github.com/palantir/python-jsonrpc-servers/tags
.*/v?(\d\S+)\.tar\.gz
\ No newline at end of file

Reply via email to