Updating pythondata-cpu-mor1kx to 5.0.post124

Updated data to v5.0-76-g06e2e46 based on 06e2e46 from https://github.com/openrisc/mor1kx.git.
> commit 06e2e46
> Author: JaewonHur <[email protected]>
> Date:   Mon Dec 23 01:23:20 2019 +0900
>
>     Fix mor1kx_decode to accept valid l.fl1 (l.ff1) instructions (#110)
>
>     * Fix mor1kx_decode to only accept valid l.fl1 and l.ff1 instructions
>
>     Both l.fl1 and l.ff1 have bit 9 set in the insruction as port of their op codes,
>     mor1kx_decode does not currently properly check this
>

Updated using 0.0.post48 from https://github.com/litex-hub/litex-data-auto

Author: mithro

MANIFEST.in

@@ -1,2 +1,2 @@
-graft litex/data/cpu/mor1kx/verilog/
+graft pythondata_cpu_mor1kx/verilog/
 global-exclude *.py[cod]

README.md

@@ -1,81 +1,92 @@
-# litex-data-cpu-mor1kx
+# pythondata-cpu-mor1kx
 
-Non-Python data files required to use the mor1kx with
+Non-Python  files needed for the cpu mor1kx packaged
+into a Python module so they can be used with Python libraries and tools.
+
+This Useful for usage with tools like
 [LiteX](https://github.com/enjoy-digital/litex.git).
 
-The data files can be found under the Python module `litex.data.cpu.mor1kx`. The
-`litex.data.cpu.mor1kx.location` value can be used to find the files on the file system.
+The data files can be found under the Python module `pythondata_cpu_mor1kx`. The
+`pythondata_cpu_mor1kx.location` value can be used to find the files on the file system.
 
 Example of getting the data file directly;
 ```python
-import litex.data.cpu.mor1kx
+import pythondata_cpu_mor1kx
 
 my_data_file = "abc.txt"
 
-with open(os.path.join(litex.data.cpu.mor1kx.data_location, my_data_file)) as f:
+with open(os.path.join(pythondata_cpu_mor1kx.data_location, my_data_file)) as f:
     print(f.read())
 ```
 
 Example of getting the data file using `litex.data.find` API;
 ```python
-from litex.data.find import find_data
+from pythondata_cpu_mor1kx import data_file
 
 my_data_file = "abc.txt"
 
-with open(os.path.join(find_data("cpu", "mor1kx"), my_data_file)) as f:
+with open(data_file(my_data_file)) as f:
     print(f.read())
 ```
 
 
 The data files come from https://github.com/openrisc/mor1kx.git
 and are imported using `git subtrees` to the directory
-[litex/data/cpu/mor1kx/verilog](litex/data/cpu/mor1kx/verilog).
+[pythondata_cpu_mor1kx/verilog](pythondata_cpu_mor1kx/verilog).
 
 
 
-## Installing
+## Installing from git repository
 
 ## Manually
 
 You can install the package manually, however this is **not** recommended.
 
 ```
-git clone https://github.com/litex-hub/litex-data-cpu-mor1kx.git
-cd litex-data-cpu-mor1kx
+git clone https://github.com/litex-hub/pythondata-cpu-mor1kx.git
+cd pythondata-cpu-mor1kx
 sudo python setup.py install
 ```
 
-## Using [pip](https://pip.pypa.io/)
+## Using [pip](https://pip.pypa.io/) with git repository
 
 You can use [pip](https://pip.pypa.io/) to install the data package directly
 from github using;
 
 ```
-pip install --user git+https://github.com/litex-hub/litex-data-cpu-mor1kx.git
+pip install --user git+https://github.com/litex-hub/pythondata-cpu-mor1kx.git
 ```
 
 If you want to install for the whole system rather than just the current user,
 you need to remove the `--user` argument and run as sudo like so;
 
 ```
-sudo pip install git+https://github.com/litex-hub/litex-data-cpu-mor1kx.git
+sudo pip install git+https://github.com/litex-hub/pythondata-cpu-mor1kx.git
 ```
 
 You can install a specific revision of the repository using;
 ```
-pip install --user git+https://github.com/litex-hub/litex-data-cpu-mor1kx.git@<tag>
-pip install --user git+https://github.com/litex-hub/litex-data-cpu-mor1kx.git@<branch>
-pip install --user git+https://github.com/litex-hub/litex-data-cpu-mor1kx.git@<hash>
+pip install --user git+https://github.com/litex-hub/pythondata-cpu-mor1kx.git@<tag>
+pip install --user git+https://github.com/litex-hub/pythondata-cpu-mor1kx.git@<branch>
+pip install --user git+https://github.com/litex-hub/pythondata-cpu-mor1kx.git@<hash>
 ```
 
 ### With `requirements.txt` file
 
 Add to your Python `requirements.txt` file using;
 ```
--e git+https://github.com/litex-hub/litex-data-cpu-mor1kx.git
+-e git+https://github.com/litex-hub/pythondata-cpu-mor1kx.git
 ```
 
 To use a specific revision of the repository, use the following;
 ```
--e https://github.com/litex-hub/litex-data-cpu-mor1kx.git@<hash>
+-e https://github.com/litex-hub/pythondata-cpu-mor1kx.git@<hash>
+```
+
+## Installing from [PyPi](https://pypi.org/project/pythondata-cpu-mor1kx/)
+
+## Using [pip](https://pip.pypa.io/)
+
+```
+pip install --user pythondata-cpu-mor1kx
 ```

pythondata_cpu_mor1kx/__init__.py

@@ -0,0 +1,55 @@
+import os.path
+__dir__ = os.path.split(os.path.abspath(os.path.realpath(__file__)))[0]
+data_location = os.path.join(__dir__, "verilog")
+src = "https://github.com/openrisc/mor1kx.git"
+
+# Module version
+version_str = "5.0.post124"
+version_tuple = (5, 0, 124)
+try:
+    from packaging.version import Version as V
+    pversion = V("5.0.post124")
+except ImportError:
+    pass
+
+# Data version info
+data_version_str = "5.0.post76"
+data_version_tuple = (5, 0, 76)
+try:
+    from packaging.version import Version as V
+    pdata_version = V("5.0.post76")
+except ImportError:
+    pass
+data_git_hash = "06e2e46afbad62572c31bde88e8f2424e23ecda2"
+data_git_describe = "v5.0-76-g06e2e46"
+data_git_msg = """\
+commit 06e2e46afbad62572c31bde88e8f2424e23ecda2
+Author: JaewonHur <[email protected]>
+Date:   Mon Dec 23 01:23:20 2019 +0900
+
+    Fix mor1kx_decode to accept valid l.fl1 (l.ff1) instructions (#110)
+    
+    * Fix mor1kx_decode to only accept valid l.fl1 and l.ff1 instructions
+    
+    Both l.fl1 and l.ff1 have bit 9 set in the insruction as port of their op codes,
+    mor1kx_decode does not currently properly check this
+
+"""
+
+# Tool version info
+tool_version_str = "0.0.post48"
+tool_version_tuple = (0, 0, 48)
+try:
+    from packaging.version import Version as V
+    ptool_version = V("0.0.post48")
+except ImportError:
+    pass
+
+
+def data_file(f):
+    """Get absolute path for file inside pythondata_cpu_mor1kx."""
+    fn = os.path.join(data_location, f)
+    fn = os.path.abspath(fn)
+    if not os.path.exists(fn):
+        raise IOError("File {f} doesn't exist in pythondata_cpu_mor1kx".format(f))
+    return fn

setup.py

@@ -3,17 +3,18 @@
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-from litex.data.cpu.mor1kx import version_str
+from pythondata_cpu_mor1kx import version_str
 
 setuptools.setup(
-    name="litex-data-cpu-mor1kx",
+    name="pythondata-cpu-mor1kx",
     version=version_str,
     author="LiteX Authors",
     author_email="[email protected]",
-    description="Python module containing data files for using the OpenRISC1000 cpu with LiteX.",
+    description="""\
+Python module containing verilog files for OpenRISC1000 cpu.""",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/litex-hub/litex-data-cpu-mor1kx",
+    url="https://github.com/litex-hub/pythondata-cpu-mor1kx",
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
@@ -22,6 +23,12 @@
     python_requires='>=3.5',
     zip_safe=False,
     packages=setuptools.find_packages(),
-    package_data={'litex.data.cpu.mor1kx': ['litex/data/cpu/mor1kx/verilog/**']},
+    package_data={
+    	'cpu_mor1kx': ['cpu_mor1kx/verilog/**'],
+    },
     include_package_data=True,
+    project_urls={
+        "Bug Tracker": "https://github.com/litex-hub/pythondata-cpu-mor1kx/issues",
+        "Source Code": "https://github.com/litex-hub/pythondata-cpu-mor1kx",
+    },
 )

test.py

@@ -1,20 +1,20 @@
 #!/usr/bin/env python3
 import os
 
-from litex.data.cpu import mor1kx
+import pythondata_cpu_mor1kx
 
-print("Found mor1kx @ version", mor1kx.version_str, "(with data", mor1kx.data_version_str, ")")
+print("Found mor1kx @ version", pythondata_cpu_mor1kx.version_str, "(with data", pythondata_cpu_mor1kx.data_version_str, ")")
 print()
-print("Data is in", mor1kx.data_location)
-assert os.path.exists(mor1kx.data_location)
-print("Data is version", mor1kx.data_version_str, mor1kx.data_git_hash)
+print("Data is in", pythondata_cpu_mor1kx.data_location)
+assert os.path.exists(pythondata_cpu_mor1kx.data_location)
+print("Data is version", pythondata_cpu_mor1kx.data_version_str, pythondata_cpu_mor1kx.data_git_hash)
 print("-"*75)
-print(mor1kx.data_git_msg)
+print(pythondata_cpu_mor1kx.data_git_msg)
 print("-"*75)
 print()
 print("It contains:")
-for root, dirs, files in os.walk(mor1kx.data_location):
+for root, dirs, files in os.walk(pythondata_cpu_mor1kx.data_location):
     dirs.sort()
     for f in sorted(files):
-        path = os.path.relpath(os.path.join(root, f), mor1kx.data_location)
+        path = os.path.relpath(os.path.join(root, f), pythondata_cpu_mor1kx.data_location)
         print(" -", path)