From 30d234e70abfb696f8d452731a91a531613d9cf4 Mon Sep 17 00:00:00 2001 From: Isaac Garfield Date: Mon, 19 Feb 2024 12:51:53 -0700 Subject: [PATCH 1/2] Fix compatibility with numpy>=1.20 --- scripts/python/xml2vhdl-ox/xml2vhdl/helper/slave.py | 2 +- scripts/python/xml2vhdl-ox/xml2vhdl/xml2ic.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/python/xml2vhdl-ox/xml2vhdl/helper/slave.py b/scripts/python/xml2vhdl-ox/xml2vhdl/helper/slave.py index de2a907..2d7bb66 100644 --- a/scripts/python/xml2vhdl-ox/xml2vhdl/helper/slave.py +++ b/scripts/python/xml2vhdl-ox/xml2vhdl/helper/slave.py @@ -401,7 +401,7 @@ def compute_decoder_mask(self): add_num = len(addresses) logger.info('Addresses are: {add_num}' .format(add_num=add_num)) - baddr = np.zeros((add_num, 32), dtype=np.int) + baddr = np.zeros((add_num, 32), dtype=int) tree_dict = {} # building address array diff --git a/scripts/python/xml2vhdl-ox/xml2vhdl/xml2ic.py b/scripts/python/xml2vhdl-ox/xml2vhdl/xml2ic.py index f3cf79e..5d116dc 100644 --- a/scripts/python/xml2vhdl-ox/xml2vhdl/xml2ic.py +++ b/scripts/python/xml2vhdl-ox/xml2vhdl/xml2ic.py @@ -410,7 +410,7 @@ def get_decoder_mask(address_list): add_num = len(addresses) logger.info('Addresses are: {}' .format(add_num)) - baddr = np.zeros((add_num, 32), dtype=np.int) + baddr = np.zeros((add_num, 32), dtype=int) decode_dict = {} tree_dict = {} From 2009d4a20cee98c404c83b7302ec31ef7d4d9276 Mon Sep 17 00:00:00 2001 From: Isaac Garfield Date: Mon, 19 Feb 2024 13:11:39 -0700 Subject: [PATCH 2/2] Bump version to 0.2.3 and use numpy 1.24 --- scripts/python/xml2vhdl-ox/requirements.txt | 4 ++-- scripts/python/xml2vhdl-ox/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/python/xml2vhdl-ox/requirements.txt b/scripts/python/xml2vhdl-ox/requirements.txt index 8079ee7..0570d68 100644 --- a/scripts/python/xml2vhdl-ox/requirements.txt +++ b/scripts/python/xml2vhdl-ox/requirements.txt @@ -11,7 +11,7 @@ jinja2==2.10 logging==0.4.9.6 lxml==4.3.0 markupsafe==1.1.0 -numpy==1.16.0 +numpy==1.24 packaging==19.0 pygments==2.3.1 pyparsing==2.3.1 @@ -25,4 +25,4 @@ snowballstemmer==1.2.1 sphinx==1.8.4 sphinxcontrib-websupport==1.1.0 typing==3.6.6; python_version < '3.5' -urllib3==1.24.1 \ No newline at end of file +urllib3==1.24.1 diff --git a/scripts/python/xml2vhdl-ox/setup.py b/scripts/python/xml2vhdl-ox/setup.py index 7de19a9..0000dbd 100644 --- a/scripts/python/xml2vhdl-ox/setup.py +++ b/scripts/python/xml2vhdl-ox/setup.py @@ -20,7 +20,7 @@ setuptools.setup( name="xml2vhdl-ox", - version="0.2.2", + version="0.2.3", author="Department of Physics", author_email="xml2vhdl@ox.ac.uk", description="XML to VHDL Memory-Mapped Generation",