Skip to content

Commit 4874670

Browse files
committed
Setup environment using make-env
Signed-off-by: Robert Winkler <[email protected]>
1 parent 4ffb6db commit 4874670

File tree

7 files changed

+59
-7
lines changed

7 files changed

+59
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
build/
2+
env/
23

34
# Byte-compiled / optimized / DLL files
45
__pycache__/

Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Copyright (C) 2020 SymbiFlow Authors.
2+
#
3+
# Use of this source code is governed by a ISC-style
4+
# license that can be found in the LICENSE file or at
5+
# https://opensource.org/licenses/ISC
6+
#
7+
# SPDX-License-Identifier: ISC
8+
9+
# The top directory where environment will be created.
10+
TOP_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
11+
12+
# A pip `requirements.txt` file.
13+
# https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format
14+
REQUIREMENTS_FILE := requirements.txt
15+
16+
# A conda `environment.yml` file.
17+
# https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html
18+
ENVIRONMENT_FILE := environment.yml
19+
20+
include third_party/make-env/conda.mk

README.rst

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Enabling
1515

1616
Add extension in ``conf.py``::
1717

18-
extensions = [ 'sphinxcontrib-verilog-domain' ]
18+
extensions = [ 'sphinx-verilog-domain' ]
1919

2020
Usage
2121
-----
@@ -62,7 +62,6 @@ Nesting::
6262

6363
Reference to module ``Top1``'s port ``a``: :verilog:ref:`Top1.a`.
6464

65-
6665
Namespaces
6766
^^^^^^^^^^
6867

@@ -87,3 +86,12 @@ Example::
8786
.. verilog:port:: input inside_a_b_again;
8887
.. verilog:namespace::
8988
.. verilog:port:: input in_global_namespace;
89+
90+
Development
91+
-----------
92+
93+
To create and open the development environment with all system
94+
and python packages use::
95+
96+
make env
97+
source env/conda/bin/activate sphinx-verilog-domain

docs/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ git+https://github.com/SymbiFlow/sphinx_symbiflow_theme
22

33
sphinx
44
symbolator
5+
sphinxcontrib-verilog-diagrams

docs/source/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
# ones.
3333
extensions = [
3434
'sphinx-verilog-domain',
35-
'symbolator_sphinx'
35+
'symbolator_sphinx',
36+
'sphinxcontrib_verilog_diagrams'
3637
]
3738

3839
# Add any paths that contain templates here, relative to this directory.

environment.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: sphinx-verilog-domain
2+
channels:
3+
- symbiflow
4+
- conda-forge
5+
- defaults
6+
dependencies:
7+
- python=3.7
8+
- docutils
9+
- sphinx
10+
- pango
11+
- pycairo
12+
- pygobject
13+
- yosys
14+
- netlistsvg
15+
- pip
16+
- pip:
17+
- -r file:requirements.txt
18+
- -r file:docs/requirements.txt
19+
- .

setup.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
url="https://github.com/SymbiFlow/sphinx-verilog-domain",
1515
python_requires=">=3.7",
1616
packages=setuptools.find_packages(),
17+
package_data={'': ["verilog.lark"]},
18+
include_package_data=True,
1719
install_requires=[
18-
'setuptools',
19-
'docutils',
20-
'sphinx',
21-
'lark-parser'
20+
'setuptools',
21+
'docutils',
22+
'sphinx',
23+
'lark-parser'
2224
],
2325
classifiers=[
2426
'Development Status :: 4 - Beta',

0 commit comments

Comments
 (0)