Skip to content

Commit

Permalink
Fix py.test7 rootdir build issue with NAPALM docs (#1778)
Browse files Browse the repository at this point in the history
Co-authored-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
  • Loading branch information
ktbyers and M0NsTeRRR committed Oct 17, 2022
1 parent 41d19fe commit 5b45368
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
10 changes: 5 additions & 5 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sphinx
sphinx-rtd-theme
sphinxcontrib-napoleon
invoke
sphinx==1.8.6
sphinx-rtd-theme==1.0.0
sphinxcontrib-napoleon==0.7
invoke==1.7.1
jinja2==2.11.3
MarkupSafe==2.0.1
pytest==6.2.5
pytest==7.1.2
ansible==4.10.0
2 changes: 1 addition & 1 deletion docs/support/nxos.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ One caveat of using netutils diff of configurations is that the diff is performe

Example assuming that the device config contains:

.. code-block::
.. code-block:: bash
interface loopback0
ip address 10.1.4.4/32
Expand Down
3 changes: 2 additions & 1 deletion docs/test.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/bin/bash
CWD=`pwd`
TEST_RESULTS_PATH="$CWD/support/tests"
REPOBASE=$CWD/..

if [ ! -f "report.json" ]; then
set -e
py.test -c /dev/null --cov=./ -vs --json=report.json ../test*/*/test_getters.py
py.test --rootdir $REPOBASE -c /dev/null --cov=./ -vs --json=report.json $REPOBASE/test*/*/test_getters.py

set -e
cp report.json $TEST_RESULTS_PATH/report.json
Expand Down
6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ black==22.6.0
coveralls==3.3.1
ddt==1.5.0
flake8-import-order==0.18.1
pytest==6.2.5
pytest==7.1.2
pytest-cov==3.0.0
pytest-json==0.4.0
pyflakes==2.4.0
pylama==8.2.1
pyflakes==2.5.0
pylama==8.4.1
mock==4.0.3
tox==3.25.1
mypy==0.982
Expand Down

0 comments on commit 5b45368

Please sign in to comment.