Skip to content

Commit

Permalink
Merge branch 'main' of github.com:jupyter-naas/naas
Browse files Browse the repository at this point in the history
  • Loading branch information
Dr0p42 committed Mar 18, 2024
2 parents b2e63c0 + f80c4d2 commit b89f465
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .cz.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.commitizen]
name = "cz_conventional_commits"
tag_format = "$major.$minor.$patch$prerelease"
version = "2.13.6"
version = "2.14.0"
version_files = [
"naas/__init__.py",
"naas/runner/runner.py",
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## 2.14.0 (2024-03-18)

### Feat

- create remote bulk secrets list

### Fix

- linter
- Add make prod-build
- get secret return None
- Bump ci python version to 3.9
- Bump naas-python
- lint secret.py
- better error message
- Few updates to make it more like the legacy

## 2.13.6 (2024-03-18)

### Fix
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ FROM jupyternaas/singleuser:2.12.0
# Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE
ARG VCS_REF
ENV NAAS_VERSION 2.13.6
ENV NAAS_VERSION 2.14.0
ENV JUPYTER_ENABLE_LAB 'yes'
ENV NB_UMASK=022
ENV NB_USER=ftp
Expand Down
2 changes: 1 addition & 1 deletion naas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import os
import sys

__version__ = "2.13.6"
__version__ = "2.14.0"
__github_repo = "jupyter-naas/naas"
__doc_url = "https://naas.gitbook.io/naas/"
__canny_js = '<script>!function(w,d,i,s){function l(){if(!d.getElementById(i)){var f=d.getElementsByTagName(s)[0],e=d.createElement(s);e.type="text/javascript",e.async=!0,e.src="https://canny.io/sdk.js",f.parentNode.insertBefore(e,f)}}if("function"!=typeof w.Canny){var c=function(){c.q.push(arguments)};c.q=[],w.Canny=c,"complete"===d.readyState?l():w.attachEvent?w.attachEvent("onload",l):w.addEventListener("load",l,!1)}}(window,document,"canny-jssdk","script");</script>' # noqa: E501
Expand Down
2 changes: 1 addition & 1 deletion naas/runner/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
asyncio.set_event_loop_policy(None)
nest_asyncio.apply()

__version__ = "2.13.6"
__version__ = "2.14.0"


class Runner:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
setup(
name="naas",
version="2.13.6",
version="2.14.0",
author="Maxime Jublou",
author_email="devops@cashstory.com",
license="BSD",
Expand Down

0 comments on commit b89f465

Please sign in to comment.