We have clarified our Privacy Statement even further. Please have a look at our changes.
Browse Source

replace versions everywhere

tags/19.9.0
Henning Jacobs 2 months ago
parent
commit
97bc33645b
7 changed files with 29 additions and 25 deletions
  1. +3
    -2
      Dockerfile
  2. +6
    -3
      Makefile
  3. +9
    -9
      docs/conf.py
  4. +1
    -1
      kube_web/__init__.py
  5. +5
    -5
      kube_web/templates/base.html
  6. +3
    -3
      poetry.lock
  7. +2
    -2
      pyproject.toml

+ 3
- 2
Dockerfile View File

@@ -27,7 +27,8 @@ ARG VERSION=dev

# replace build version in package and
# add build version to static asset links to break browser cache
RUN sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" /kube_web/__init__.py && \
sed -i "s/BUILD_VERSION/${VERSION}/g" /kube_web/templates/base.html
# see also "version" in Makefile
RUN sed -i "s/^__version__ = .*/__version__ = \"${VERSION}\"/" /kube_web/__init__.py && \
sed -i "s/v=[0-9A-Za-z._-]*/v=${VERSION}/g" /kube_web/templates/base.html

ENTRYPOINT ["/usr/local/bin/python", "-m", "kube_web"]

+ 6
- 3
Makefile View File

@@ -3,6 +3,7 @@
IMAGE ?= hjacobs/kube-web-view
GITDIFFHASH = $(shell git diff | md5sum | cut -c 1-4)
VERSION ?= $(shell git describe --tags --always --dirty=-dirty-$(GITDIFFHASH))
VERSIONPY = $(shell echo $(VERSION) | cut -d- -f 1)
TAG ?= $(VERSION)
TTYFLAGS = $(shell test -t 0 && echo "-it")
OSNAME := $(shell uname | perl -ne 'print lc($$_)')
@@ -65,6 +66,8 @@ mirror:

.PHONY: version
version:
sed -i "s/version = .*/version = \"${VERSION}\"/" pyproject.toml
sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" kube_web/__init__.py
sed -i "s/BUILD_VERSION/${VERSION}/g" kube_web/templates/base.html
# poetry only accepts a narrow version format
sed -i "s/^version = .*/version = \"${VERSIONPY}\"/" pyproject.toml
sed -i "s/^version = .*/version = \"${VERSION}\"/" docs/conf.py
sed -i "s/^__version__ = .*/__version__ = \"${VERSION}\"/" kube_web/__init__.py
sed -i "s/v=[0-9A-Za-z._-]*/v=${VERSION}/g" kube_web/templates/base.html

+ 9
- 9
docs/conf.py View File

@@ -17,9 +17,10 @@

# -- Project information -----------------------------------------------------

project = 'Kubernetes Web View'
copyright = '2019, Henning Jacobs'
author = 'Henning Jacobs'
project = "Kubernetes Web View"
copyright = "2019, Henning Jacobs"
author = "Henning Jacobs"
version = "19.8.5-10-g940c675-dirty-e491"


# -- General configuration ---------------------------------------------------
@@ -27,22 +28,21 @@ author = 'Henning Jacobs'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
]
extensions = []

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


# The master toctree document.
# This setting is required for readthedocs.io
master_doc = 'index'
master_doc = "index"


# 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 = ['_build', 'Thumbs.db', '.DS_Store']
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]


# -- Options for HTML output -------------------------------------------------
@@ -62,4 +62,4 @@ except:
# 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"]

+ 1
- 1
kube_web/__init__.py View File

@@ -1,2 +1,2 @@
# This version is replaced during release process.
__version__ = "2019.0.dev1"
__version__ = "19.8.5-10-g940c675-dirty-e491"

+ 5
- 5
kube_web/templates/base.html View File

@@ -4,11 +4,11 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% block title %}{% endblock %} - Kubernetes Web View</title>
<link rel="stylesheet" href="/assets/bulma.min.css?v=BUILD_VERSION">
<script defer src="/assets/solid.min.js?v=BUILD_VERSION"></script>
<script defer src="/assets/fontawesome.min.js?v=BUILD_VERSION"></script>
<script src="/assets/kube-web.js?v=BUILD_VERSION"></script>
<link rel="stylesheet" href="/assets/kube-web.css?v=BUILD_VERSION" />
<link rel="stylesheet" href="/assets/bulma.min.css?v=19.8.5-10-g940c675-dirty-e491">
<script defer src="/assets/solid.min.js?v=19.8.5-10-g940c675-dirty-e491"></script>
<script defer src="/assets/fontawesome.min.js?v=19.8.5-10-g940c675-dirty-e491"></script>
<script src="/assets/kube-web.js?v=19.8.5-10-g940c675-dirty-e491"></script>
<link rel="stylesheet" href="/assets/kube-web.css?v=19.8.5-10-g940c675-dirty-e491" />
<link rel="shortcut icon" href="/assets/favicon.png">
<link rel="icon" type="image/png" href="/assets/favicon.png">
{% include "partials/extrahead.html" %}

+ 3
- 3
poetry.lock View File

@@ -522,7 +522,7 @@ description = "Kubernetes test support with KIND for pytest"
name = "pytest-kind"
optional = false
python-versions = ">=3.7,<4.0"
version = "0.6.0"
version = "19.9.0"

[package.dependencies]
pykube-ng = ">=0.30.0,<0.31.0"
@@ -759,7 +759,7 @@ version = "0.6.0"
more-itertools = "*"

[metadata]
content-hash = "5ab70582073d77ed1619ae057ee8c77b7395ff4a6b11ad27200dd3e1deafb02d"
content-hash = "554b50cab45709d1319b412b8dc2333f55aea7d6efc49fc9d0a95b287cbebf43"
python-versions = "^3.7"

[metadata.hashes]
@@ -815,7 +815,7 @@ pyppeteer = ["51fe769b722a1718043b74d12c20420f29e0dd9eeea2b66652b7f93a9ad465dd"]
pyquery = ["07987c2ed2aed5cba29ff18af95e56e9eb04a2249f42ce47bddfb37f487229a3", "4771db76bd14352eba006463656aef990a0147a0eeaf094725097acfa90442bf"]
pytest = ["95d13143cc14174ca1a01ec68e84d76ba5d9d493ac02716fd9706c949a505210", "b78fe2881323bd44fd9bd76e5317173d4316577e7b1cddebae9136a4495ec865"]
pytest-cov = ["2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6", "e00ea4fdde970725482f1f35630d12f074e121a23801aabf2ae154ec6bdd343a"]
pytest-kind = ["480c3e0be2a0b91a02391ff5c523278e12053d2b6a8c24d713819da8e0542474", "98b9d8dcfb818be05078d111923d62be7acedcef8dff142e06aa12324d6f14b2"]
pytest-kind = ["25252d46487afff8ba143e97f9eed497ac6f26716bd6a392224dfc3ef31a3956", "40a26d5a7cb32ca189242c5ce60c00959f7e547481645aafe7b080b42e61dea3"]
pytz = ["26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32", "c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7"]
pyyaml = ["0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9", "01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4", "5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8", "5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696", "7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34", "7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9", "87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73", "9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299", "a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b", "b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae", "b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681", "bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41", "f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8"]
requests = ["11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", "9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"]

+ 2
- 2
pyproject.toml View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "kube-web-view"
version = "19.8.0"
version = "19.8.5"
description = "Kubernetes Web View allows to list and view all Kubernetes resources (incl. CRDs) with permalink-friendly URLs in a plain-HTML frontend"
authors = ["Henning Jacobs <henning@zalando.de>"]
license = "GPL-3.0+"
@@ -33,7 +33,7 @@ pytest-cov = "^2.7"
Sphinx = "^2.1"
sphinx-rtd-theme = "^0.4.3"
requests-html = "^0.10.0"
pytest-kind = "=0.6.0"
pytest-kind = "=19.9.0"
[build-system]
requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api"

Loading…
Cancel
Save