1*4882a593SmuzhiyunFrom b13b7e38b38e2c79c0a13be32e05f0451483cd01 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: James Hilliard <james.hilliard1@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 12 Jun 2021 15:32:37 -0600 4*4882a593SmuzhiyunSubject: [PATCH] Fix duplicate xbr packages and xbr templates package_data. 5*4882a593Smuzhiyun (#1492) 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunSigned-off-by: James Hilliard <james.hilliard1@gmail.com> 8*4882a593Smuzhiyun[james.hilliard1@gmail.com: backport from upstream commit 9*4882a593Smuzhiyuna370f9e7154e59b313cb675bfcaf8cad6011bd52] 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun MANIFEST.in | 1 - 12*4882a593Smuzhiyun setup.py | 10 ++++++++-- 13*4882a593Smuzhiyun 2 files changed, 8 insertions(+), 3 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/MANIFEST.in b/MANIFEST.in 16*4882a593Smuzhiyunindex f4cb6da1..1dd32f0e 100644 17*4882a593Smuzhiyun--- a/MANIFEST.in 18*4882a593Smuzhiyun+++ b/MANIFEST.in 19*4882a593Smuzhiyun@@ -1,4 +1,3 @@ 20*4882a593Smuzhiyun include LICENSE 21*4882a593Smuzhiyun include autobahn/nvx/_utf8validator.c 22*4882a593Smuzhiyun recursive-include autobahn/wamp/gen/schema * 23*4882a593Smuzhiyun-recursive-include autobahn/xbr/templates * 24*4882a593Smuzhiyundiff --git a/setup.py b/setup.py 25*4882a593Smuzhiyunindex cf4e29ba..f27006da 100644 26*4882a593Smuzhiyun--- a/setup.py 27*4882a593Smuzhiyun+++ b/setup.py 28*4882a593Smuzhiyun@@ -166,6 +166,12 @@ packages = [ 29*4882a593Smuzhiyun 'twisted.plugins', 30*4882a593Smuzhiyun ] 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun+xbr_packages = [ 33*4882a593Smuzhiyun+ 'autobahn.xbr', 34*4882a593Smuzhiyun+ 'autobahn.asyncio.xbr', 35*4882a593Smuzhiyun+ 'autobahn.twisted.xbr', 36*4882a593Smuzhiyun+] 37*4882a593Smuzhiyun+ 38*4882a593Smuzhiyun package_data = {'autobahn.asyncio': ['./test/*']} 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun entry_points = { 41*4882a593Smuzhiyun@@ -179,8 +185,8 @@ if 'AUTOBAHN_STRIP_XBR' in os.environ: 42*4882a593Smuzhiyun shutil.rmtree('autobahn.egg-info', ignore_errors=True) 43*4882a593Smuzhiyun else: 44*4882a593Smuzhiyun extras_require_all += extras_require_xbr 45*4882a593Smuzhiyun- packages += ['autobahn.xbr', 'autobahn.asyncio.xbr', 'autobahn.twisted.xbr'] 46*4882a593Smuzhiyun- package_data['xbr'] = ['./xbr/contracts/*.json'] 47*4882a593Smuzhiyun+ packages += xbr_packages 48*4882a593Smuzhiyun+ package_data['xbr'] = ['./xbr/templates/*.py.jinja2'] 49*4882a593Smuzhiyun entry_points['console_scripts'] += ["xbrnetwork = autobahn.xbr._cli:_main"] 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun # development dependencies 52*4882a593Smuzhiyun-- 53*4882a593Smuzhiyun2.25.1 54*4882a593Smuzhiyun 55