Skip to content

Commit 2340b54

Browse files
dwapstradwapstra
committed
Merge remote-tracking branch 'origin/main' into meson_build_system
# Conflicts: # Makefile # setup.py
2 parents 9795ed9 + b37e7f1 commit 2340b54

71 files changed

Lines changed: 143 additions & 120 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ PIP = $(PYTHON) -m pip
2828
TESTCMD = $(PYTHON) -m unittest discover tests
2929
DISTDIR = $(BUILDDIR)/dist
3030

31-
DEPENDENCIES = f5-icontrol-rest requests_mock requests dict2xml ciscoisesdk
31+
DEPENDENCIES = f5-icontrol-rest requests_mock requests dict2xml "ciscoisesdk<=2.4.2"
3232
BUILD_DEPENDENCIES = meson-python 'meson>=1.10.0' ninja build 'patchelf>=0.11.0; sys_platform == "linux"'
3333

3434
.PHONY: clean package distribute distribute_staging distribute_staging_external\

‎docs/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ HEADER = [Rest Watchdog]
1919
HOSTNAME = `hostname`
2020

2121
# Dependencies for building documentation
22-
DEPENDENCIES = Sphinx sphinxcontrib-napoleon sphinxcontrib-mockautodoc sphinx-rtd-theme
22+
DEPENDENCIES = Sphinx==7.4.7 sphinxcontrib-napoleon sphinxcontrib-mockautodoc sphinx-rtd-theme==3.1.0
2323

2424

2525
# User-friendly check for sphinx-build
@@ -28,11 +28,11 @@ $(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx in
2828
endif
2929

3030
# Internal variables.
31-
PAPEROPT_a4 = -D latex_paper_size=a4
32-
PAPEROPT_letter = -D latex_paper_size=letter
33-
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
31+
PAPEROPT_a4 =
32+
PAPEROPT_letter =
33+
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) .
3434
# the i18n builder cannot share the environment and doctrees with the others
35-
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
35+
I18NSPHINXOPTS = $(SPHINXOPTS) .
3636

3737
.PHONY: distribute help clean docs html dirhtml singlehtml\
3838
pickle json htmlhelp qthelp devhelp epub latex latexpdf text man\

‎docs/apidoc/rest.connector.libs.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dnac
1919
:show-inheritance:
2020

2121
iosxe
22-
^^^^
22+
^^^^^
2323
.. automodule:: rest.connector.libs.iosxe.implementation
2424
:members:
2525
:undoc-members:

‎docs/changelog/2020/april.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ April 28
77
+-------------------------------+-------------------------------+
88
| Module | Versions |
99
+===============================+===============================+
10-
| ``rest.connector `` | 20.4 |
10+
| ``rest.connector`` | 20.4 |
1111
+-------------------------------+-------------------------------+
1212

1313

‎docs/changelog/2020/august.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
August 2020
2-
==========
2+
===========
33

44
August 25
5-
--------
5+
---------
66

77
+-------------------------------+-------------------------------+
88
| Module | Versions |
99
+===============================+===============================+
10-
| ``rest.connector `` | 20.8 |
10+
| ``rest.connector`` | 20.8 |
1111
+-------------------------------+-------------------------------+
1212

1313

1414
Features:
1515
^^^^^^^^^
1616

17-
* Fixed timeout issue in `connect()`
17+
* Fixed timeout issue in ``connect()``
1818
* Fixed issue with nxos _request() method when using expected_return_code

‎docs/changelog/2020/december.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ December 15
77
+-------------------------------+-------------------------------+
88
| Module | Versions |
99
+===============================+===============================+
10-
| ``rest.connector `` | 20.12 |
10+
| ``rest.connector`` | 20.12 |
1111
+-------------------------------+-------------------------------+
1212

1313

‎docs/changelog/2020/july.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ July 28
77
+-------------------------------+-------------------------------+
88
| Module | Versions |
99
+===============================+===============================+
10-
| ``rest.connector `` | 20.7 |
10+
| ``rest.connector`` | 20.7 |
1111
+-------------------------------+-------------------------------+
1212

1313

‎docs/changelog/2020/june.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ July 7
77
+-------------------------------+-------------------------------+
88
| Module | Versions |
99
+===============================+===============================+
10-
| ``rest.connector `` | 20.6 |
10+
| ``rest.connector`` | 20.6 |
1111
+-------------------------------+-------------------------------+
1212

1313

‎docs/changelog/2020/may.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ May 26
77
+-------------------------------+-------------------------------+
88
| Module | Versions |
99
+===============================+===============================+
10-
| ``rest.connector `` | 20.5 |
10+
| ``rest.connector`` | 20.5 |
1111
+-------------------------------+-------------------------------+
1212

1313

‎docs/changelog/2020/september.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
September 2020
2-
==========
2+
==============
33

44
September 29
5-
--------
5+
------------
66

77
+-------------------------------+-------------------------------+
88
| Module | Versions |
99
+===============================+===============================+
10-
| ``rest.connector `` | 20.9 |
10+
| ``rest.connector`` | 20.9 |
1111
+-------------------------------+-------------------------------+
1212

1313

0 commit comments

Comments
 (0)