Skip to content

Commit

Permalink
Merge branch 'trunk' into improve-kubevirt-node-driver
Browse files Browse the repository at this point in the history
  • Loading branch information
Kami authored Jun 18, 2024
2 parents f78d361 + 5fbf5bf commit 44f64ea
Show file tree
Hide file tree
Showing 21 changed files with 41,549 additions and 22,805 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ jobs:
uses: actions/checkout@master

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
tox -e coverage-ci
- name: Upload Coverage to codecov.io
uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
with:
# We utilize secret for more realiable builds. Without secret being set, upload step
# fails fairly often.
Expand Down
6 changes: 3 additions & 3 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ formats:
# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
#python:
# install:
# - requirements: requirements-rtd.txt
python:
install:
- requirements: requirements-rtd.txt
9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@ Compute
(#1972)
[Aayush Rangwala - @aayushrangwala, Tomaz Muraus - @Kami]

- [Amazon EC2] Update pricing and sizing data.
(#2012)
[Eric Anderson - @eric-anderson]

- [OpenStack] Add `is_default` and `tags` extra fields to the OpenStack
Network Object (`OpenStackNetwork`).
(#2016)
[Miguel Caballer - @micafer]

Storage
~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion docs/committer_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ preparing a release.
* Make sure ``CHANGES`` file is up to date
* Make sure ``__version__`` string in ``libcloud/__init__.py`` is up to date
* Make sure ``version`` and ``release`` in ``docs/conf.py`` are up to date
* Update constants, pricing and other auto-generated data: ``tox -e scrape-ec2-sizes,scrape-ec2-prices``
* Update constants, pricing and other auto-generated data: ``tox -e scrape-ec2-sizes,scrape-ec2-prices,black,isort``

1. Pre-release check list
~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
31 changes: 18 additions & 13 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
from sphinx.ext import apidoc
from sphinx.domains.python import PythonDomain

try:
import sphinx_rtd_theme
except ImportError:
sphinx_rtd_theme = None

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
BASE_DIR = os.path.abspath(BASE_DIR)

# Detect if we are running on read the docs
on_rtd = os.environ.get("READTHEDOCS", "").lower() == "true"

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
Expand All @@ -39,10 +41,12 @@

# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ["sphinx.ext.autodoc", "sphinx.ext.intersphinx", "sphinx.ext.viewcode"]

if not on_rtd:
extensions.append("sphinx_rtd_theme")
extensions = [
"sphinx.ext.autodoc",
"sphinx.ext.intersphinx",
"sphinx.ext.viewcode",
"sphinx_rtd_theme",
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"]
Expand Down Expand Up @@ -115,15 +119,14 @@

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = "sphinx_rtd_theme"

if on_rtd:
html_theme = "default"
RTD_NEW_THEME = True
else:
import sphinx_rtd_theme

if sphinx_rtd_theme:
html_theme = "sphinx_rtd_theme"
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
else:
html_theme = "default"


# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
Expand Down Expand Up @@ -327,10 +330,12 @@ def linkify_issues_in_changelog(app, docname, source):

def linkify_github_issues(match):
url = "https://github.com/apache/libcloud/issues/" + match[1]

return f"`{match[0]} <{url}>`_"

def linkify_jira_issues(match):
url = "https://issues.apache.org/jira/browse/LIBCLOUD-" + match[1]

return f"`{match[0]} <{url}>`_"

linkified_changelog = re.sub(r"(?:PR)?#([0-9]+)\b", linkify_github_issues, changelog)
Expand Down
Loading

0 comments on commit 44f64ea

Please sign in to comment.