Skip to content

Commit dde9376

Browse files
timvideos-robotTravis CI User
authored and
Travis CI User
committed
Updating pythondata-cpu-minerva to 0.0.post135
Updated data to v0.0-84-gd06b5d2 based on d06b5d2 from http://github.com/lambdaconcept/minerva. > commit d06b5d2 > Author: Jean-François Nguyen <jf@lambdaconcept.com> > Date: Wed Apr 1 23:55:41 2020 +0200 > > Revert "Use nmigen_soc.wishbone.Interface." > > This reverts commit 8c4d4eb. > > The PyPI release of nmigen-soc doesn't allow nmigen versions above 0.1. > We will wait for a new release before merging 8c4d4eb. > Updated using 0.0.post51 from https://github.com/litex-hub/litex-data-auto
0 parents  commit dde9376

File tree

10 files changed

+421
-0
lines changed

10 files changed

+421
-0
lines changed

.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
**/verilog/**/*.v linguist-language=Verilog
2+
**/verilog/**/*.vh linguist-language=Verilog
3+
4+
**/system_verilog/**/*.v linguist-language=SystemVerilog
5+
**/system_verilog/**/*.sv linguist-language=SystemVerilog
6+
**/system_verilog/**/*.vh linguist-language=SystemVerilog
7+
8+
**/vhdl/**/*.vhdl linguist-language=VHDL
9+
**/vhdl/**/*.vh linguist-language=VHDL

.gitignore

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
pip-wheel-metadata/
24+
share/python-wheels/
25+
*.egg-info/
26+
.installed.cfg
27+
*.egg
28+
MANIFEST
29+
30+
# PyInstaller
31+
# Usually these files are written by a python script from a template
32+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
33+
*.manifest
34+
*.spec
35+
36+
# Installer logs
37+
pip-log.txt
38+
pip-delete-this-directory.txt
39+
40+
# Unit test / coverage reports
41+
htmlcov/
42+
.tox/
43+
.nox/
44+
.coverage
45+
.coverage.*
46+
.cache
47+
nosetests.xml
48+
coverage.xml
49+
*.cover
50+
*.py,cover
51+
.hypothesis/
52+
.pytest_cache/
53+
cover/
54+
55+
# Translations
56+
*.mo
57+
*.pot
58+
59+
# Django stuff:
60+
*.log
61+
local_settings.py
62+
db.sqlite3
63+
db.sqlite3-journal
64+
65+
# Flask stuff:
66+
instance/
67+
.webassets-cache
68+
69+
# Scrapy stuff:
70+
.scrapy
71+
72+
# Sphinx documentation
73+
docs/_build/
74+
75+
# PyBuilder
76+
target/
77+
78+
# Jupyter Notebook
79+
.ipynb_checkpoints
80+
81+
# IPython
82+
profile_default/
83+
ipython_config.py
84+
85+
# pyenv
86+
# For a library or package, you might want to ignore these files since the code is
87+
# intended to run in multiple environments; otherwise, check them in:
88+
# .python-version
89+
90+
# pipenv
91+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
92+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
94+
# install all needed dependencies.
95+
#Pipfile.lock
96+
97+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
98+
__pypackages__/
99+
100+
# Celery stuff
101+
celerybeat-schedule
102+
celerybeat.pid
103+
104+
# SageMath parsed files
105+
*.sage.py
106+
107+
# Environments
108+
.env
109+
.venv
110+
env/
111+
venv/
112+
ENV/
113+
env.bak/
114+
venv.bak/
115+
116+
# Spyder project settings
117+
.spyderproject
118+
.spyproject
119+
120+
# Rope project settings
121+
.ropeproject
122+
123+
# mkdocs documentation
124+
/site
125+
126+
# mypy
127+
.mypy_cache/
128+
.dmypy.json
129+
dmypy.json
130+
131+
# Pyre type checker
132+
.pyre/
133+
134+
# pytype static type analyzer
135+
.pytype/

.travis.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Always clone the full depth so git-describe works.
2+
git:
3+
depth: false
4+
5+
language: python
6+
python:
7+
- "3.5"
8+
- "3.6"
9+
- "3.7"
10+
- "3.8"
11+
- "nightly" # nightly build
12+
- "pypy3"
13+
14+
install:
15+
- python setup.py install
16+
17+
script:
18+
- python test.py
19+
20+
deploy:
21+
provider: pypi
22+
username: __token__
23+
distributions: sdist bdist_wheel
24+
server: https://test.pypi.org/legacy/
25+
skip_existing: true
26+
edge: true # opt in to dpl v2

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
graft pythondata_cpu_minerva/sources/
2+
global-exclude *.py[cod]

Makefile

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
ACTIVATE=[[ -e venv/bin/activate ]] && source venv/bin/activate;
2+
3+
SHELL := /bin/bash
4+
5+
clean:
6+
rm -rf build dist litex_data_*
7+
8+
.PHONY: clean
9+
10+
venv-clean:
11+
rm -rf venv
12+
13+
.PHONY: venv-clean
14+
15+
venv:
16+
virtualenv --python=python3 venv
17+
${ACTIVATE} pip install twine
18+
19+
.PHONY: venv
20+
21+
build:
22+
${ACTIVATE} python setup.py sdist bdist_wheel
23+
24+
.PHONY: build
25+
26+
# PYPI_TEST = --repository-url https://test.pypi.org/legacy/
27+
PYPI_TEST = --repository testpypi
28+
29+
upload-test: build
30+
${ACTIVATE} twine upload ${PYPI_TEST} dist/*
31+
32+
.PHONY: upload-test
33+
34+
upload: build
35+
${ACTIVATE} twine upload
36+
37+
.PHONY: upload
38+
39+
install:
40+
${ACTIVATE} python setup.py install
41+
42+
.PHONY: install
43+
44+
test:
45+
${ACTIVATE} python test.py
46+
47+
.PHONY: test

README.md

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# pythondata-cpu-minerva
2+
3+
Non-Python files needed for the cpu minerva packaged
4+
into a Python module so they can be used with Python libraries and tools.
5+
6+
This Useful for usage with tools like
7+
[LiteX](https://github.com/enjoy-digital/litex.git).
8+
9+
The data files can be found under the Python module `pythondata_cpu_minerva`. The
10+
`pythondata_cpu_minerva.data_location` value can be used to find the files on the file
11+
system.
12+
13+
Example of getting the data file directly;
14+
```python
15+
import pythondata_cpu_minerva
16+
17+
my_data_file = "abc.txt"
18+
19+
with open(os.path.join(pythondata_cpu_minerva.data_location, my_data_file)) as f:
20+
print(f.read())
21+
```
22+
23+
Example of getting the data file using `litex.data.find` API;
24+
```python
25+
from pythondata_cpu_minerva import data_file
26+
27+
my_data_file = "abc.txt"
28+
29+
with open(data_file(my_data_file)) as f:
30+
print(f.read())
31+
```
32+
33+
34+
The data files come from http://github.com/lambdaconcept/minerva
35+
and are imported using `git subtrees` to the directory
36+
[pythondata_cpu_minerva/sources](pythondata_cpu_minerva/sources).
37+
38+
39+
40+
## Installing from git repository
41+
42+
## Manually
43+
44+
You can install the package manually, however this is **not** recommended.
45+
46+
```
47+
git clone https://github.com/litex-hub/pythondata-cpu-minerva.git
48+
cd pythondata-cpu-minerva
49+
sudo python setup.py install
50+
```
51+
52+
## Using [pip](https://pip.pypa.io/) with git repository
53+
54+
You can use [pip](https://pip.pypa.io/) to install the data package directly
55+
from github using;
56+
57+
```
58+
pip install --user git+https://github.com/litex-hub/pythondata-cpu-minerva.git
59+
```
60+
61+
If you want to install for the whole system rather than just the current user,
62+
you need to remove the `--user` argument and run as sudo like so;
63+
64+
```
65+
sudo pip install git+https://github.com/litex-hub/pythondata-cpu-minerva.git
66+
```
67+
68+
You can install a specific revision of the repository using;
69+
```
70+
pip install --user git+https://github.com/litex-hub/pythondata-cpu-minerva.git@<tag>
71+
pip install --user git+https://github.com/litex-hub/pythondata-cpu-minerva.git@<branch>
72+
pip install --user git+https://github.com/litex-hub/pythondata-cpu-minerva.git@<hash>
73+
```
74+
75+
### With `requirements.txt` file
76+
77+
Add to your Python `requirements.txt` file using;
78+
```
79+
-e git+https://github.com/litex-hub/pythondata-cpu-minerva.git
80+
```
81+
82+
To use a specific revision of the repository, use the following;
83+
```
84+
-e https://github.com/litex-hub/pythondata-cpu-minerva.git@<hash>
85+
```
86+
87+
## Installing from [PyPi](https://pypi.org/project/pythondata-cpu-minerva/)
88+
89+
## Using [pip](https://pip.pypa.io/)
90+
91+
```
92+
pip install --user pythondata-cpu-minerva
93+
```

pythondata_cpu_minerva/__init__.py

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import os.path
2+
__dir__ = os.path.split(os.path.abspath(os.path.realpath(__file__)))[0]
3+
data_location = os.path.join(__dir__, "sources")
4+
src = "http://github.com/lambdaconcept/minerva"
5+
6+
# Module version
7+
version_str = "0.0.post135"
8+
version_tuple = (0, 0, 135)
9+
try:
10+
from packaging.version import Version as V
11+
pversion = V("0.0.post135")
12+
except ImportError:
13+
pass
14+
15+
# Data version info
16+
data_version_str = "0.0.post84"
17+
data_version_tuple = (0, 0, 84)
18+
try:
19+
from packaging.version import Version as V
20+
pdata_version = V("0.0.post84")
21+
except ImportError:
22+
pass
23+
data_git_hash = "d06b5d2fd354cad3040f0efaf58b2f206395b7d0"
24+
data_git_describe = "v0.0-84-gd06b5d2"
25+
data_git_msg = """\
26+
commit d06b5d2fd354cad3040f0efaf58b2f206395b7d0
27+
Author: Jean-François Nguyen <jf@lambdaconcept.com>
28+
Date: Wed Apr 1 23:55:41 2020 +0200
29+
30+
Revert "Use nmigen_soc.wishbone.Interface."
31+
32+
This reverts commit 8c4d4eb3f74786bc44a721a9c9ce28cf37ee8cf4.
33+
34+
The PyPI release of nmigen-soc doesn't allow nmigen versions above 0.1.
35+
We will wait for a new release before merging 8c4d4eb3f.
36+
37+
"""
38+
39+
# Tool version info
40+
tool_version_str = "0.0.post51"
41+
tool_version_tuple = (0, 0, 51)
42+
try:
43+
from packaging.version import Version as V
44+
ptool_version = V("0.0.post51")
45+
except ImportError:
46+
pass
47+
48+
49+
def data_file(f):
50+
"""Get absolute path for file inside pythondata_cpu_minerva."""
51+
fn = os.path.join(data_location, f)
52+
fn = os.path.abspath(fn)
53+
if not os.path.exists(fn):
54+
raise IOError("File {f} doesn't exist in pythondata_cpu_minerva".format(f))
55+
return fn

requirements.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)