Skip to content

Commit

Permalink
Merge pull request #157 from CSCfi/devel
Browse files Browse the repository at this point in the history
bump ot 1.0.rc16
  • Loading branch information
blankdots authored Mar 31, 2021
2 parents 97b30f6 + d9b4d37 commit 2b13190
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 89 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14.15-alpine3.12 as FRONTEND
FROM node:14.16.0-alpine3.12 as FRONTEND

RUN apk add --update \
&& apk add --no-cache build-base curl-dev linux-headers bash git\
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-Devel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14.15-alpine3.12 as FRONTEND
FROM node:14.16.0-alpine3.12 as FRONTEND

RUN apk add --update \
&& apk add --no-cache build-base curl-dev linux-headers bash git\
Expand Down
50 changes: 24 additions & 26 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,45 @@
import os

# Get the project root dir
sys.path.insert(0, os.path.abspath('../../swift_browser_ui'))
sys.path.insert(0, os.path.abspath("../../swift_browser_ui"))

# -- Project information -----------------------------------------------------
current_year = str(datetime.date.today().year)

project = 'swift-browser-ui'
copyright = f'{current_year}, CSC Developers'
author = 'CSC Developers'
project = "swift-browser-ui"
copyright = f"{current_year}, CSC Developers"
author = "CSC Developers"

# The full version, including alpha/beta/rc tags
version = release = '1.0.0rc15'
version = release = "1.0.0rc16"


# -- General configuration ---------------------------------------------------

# 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.autosummary',
'sphinx.ext.coverage',
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode',
'sphinx.ext.githubpages',
'sphinx.ext.todo']
extensions = [
"sphinx.ext.autodoc",
"sphinx.ext.autosummary",
"sphinx.ext.coverage",
"sphinx.ext.ifconfig",
"sphinx.ext.viewcode",
"sphinx.ext.githubpages",
"sphinx.ext.todo",
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

linkcheck_ignore = [r'https://editor.swagger.io/']
linkcheck_ignore = [r"https://editor.swagger.io/"]

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = []

master_doc = 'index'
master_doc = "index"

autosummary_generate = True

Expand All @@ -63,24 +65,20 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_rtd_theme'
html_theme_options = {
'collapse_navigation': True,
'sticky_navigation': True,
'display_version': True,
'prev_next_buttons_location': 'bottom'}
html_theme = "sphinx_rtd_theme"
html_theme_options = {"collapse_navigation": True, "sticky_navigation": True, "display_version": True, "prev_next_buttons_location": "bottom"}

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ["_static"]


def setup(app):
"""Add custom stylesheet."""
app.add_css_file('style.css')
app.add_css_file("style.css")


htmlhelp_basename = 'swift-browser-ui'
man_pages = [(master_doc, 'swift-browser-ui', [author], 1)]
texinfo_documents = [(master_doc, 'swift-browser-ui', author, 'Miscellaneous')]
htmlhelp_basename = "swift-browser-ui"
man_pages = [(master_doc, "swift-browser-ui", [author], 1)]
texinfo_documents = [(master_doc, "swift-browser-ui", author, "Miscellaneous")]
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
aiohttp==3.7.4.post0
python-swiftclient==3.11.1
cryptography==3.4.6
cryptography==3.4.7
keystoneauth1==4.3.1
click==7.1.2
sphinx==3.5.3
Expand Down
2 changes: 1 addition & 1 deletion swift_browser_ui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@


__name__ = "swift_browser_ui"
__version__ = "1.0.0rc15"
__version__ = "1.0.0rc16"
__author__ = "CSC Developers"
__license__ = "MIT License"
109 changes: 56 additions & 53 deletions swift_browser_ui_frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2b13190

Please sign in to comment.