Skip to content

Commit 2f11646

Browse files
authored
Merge branch 'nexB:develop' into develop
2 parents c1b2584 + 37e8b4f commit 2f11646

17 files changed

+1740
-1388
lines changed

.gitignore

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Python compiled files
12
*.py[cod]
23

34
# virtualenv and other misc bits
@@ -15,7 +16,11 @@
1516
/include
1617
/Include
1718
/local
18-
/man/
19+
*/local/*
20+
/local/
21+
/share/
22+
/tcl/
23+
/.eggs/
1924

2025
# Installer logs
2126
pip-log.txt
@@ -34,19 +39,34 @@ htmlcov
3439
.project
3540
.pydevproject
3641
.idea
42+
org.eclipse.core.resources.prefs
43+
.vscode
44+
.vs
3745

3846
# Sphinx
3947
docs/_build
48+
docs/bin
49+
docs/build
50+
docs/include
51+
docs/Lib
52+
doc/pyvenv.cfg
53+
pyvenv.cfg
4054

55+
# Various junk and temp files
4156
.DS_Store
4257
*~
4358
.*.sw[po]
4459
.build
4560
.ve
4661
*.bak
4762
/.cache/
48-
/.settings/
49-
/tcl/
63+
64+
# pyenv
5065
/.python-version
51-
/.tox/
66+
/man/
5267
/.pytest_cache/
68+
lib64
69+
tcl
70+
71+
# Ignore Jupyter Notebook related temp files
72+
.ipynb_checkpoints/

.readthedocs.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Where the Sphinx conf.py file is located
9+
sphinx:
10+
configuration: docs/source/conf.py
11+
12+
# Setting the python version and doc build requirements
13+
python:
14+
install:
15+
- method: pip
16+
path: .
17+
extra_requirements:
18+
- docs
File renamed without changes.

0 commit comments

Comments
 (0)