Merge branch 'main' into 388-naas-manager-remove-templates

.cz.toml

@@ -1,7 +1,7 @@
 [tool.commitizen]
 name = "cz_conventional_commits"
 tag_format = "$major.$minor.$patch$prerelease"
-version = "2.10.3"
+version = "2.11.2"
 version_files = [
     "naas/__init__.py",
     "naas/runner/runner.py",

.docker/dev/docker-entrypoint.sh

@@ -18,5 +18,7 @@ pip install -ve '/home/ftp/naas/extensions/naasai'
 
 jupyter labextension develop --overwrite '/home/ftp/naas/extensions/naasai'
 
+cd /home/ftp/
+
 # Start jupyterlab.
 tini -g -- "start-notebook.sh"  

.github/workflows/deploy_packages.yml

@@ -38,14 +38,14 @@ jobs:
           python3 -m black naas
           python3 -m flake8 naas
           pytest --cov=./naas --cov-report=xml 
-      - name: Upload coverage to Codecov
-        if: runner.os == 'Linux'
-        uses: codecov/codecov-action@v1.0.3
-        with:
-          token: ${{secrets.CODECOV_TOKEN}}
-          file: ./coverage.xml
-          fail_ci_if_error: true
-          verbose: true
+#      - name: Upload coverage to Codecov
+#        if: runner.os == 'Linux'
+#        uses: codecov/codecov-action@v1.0.3
+#        with:
+#          token: ${{secrets.CODECOV_TOKEN}}
+#          file: ./coverage.xml
+#          fail_ci_if_error: true
+#          verbose: true
       - name: Build package
         run: python3 setup.py sdist
       - name: Deploy Pypi
@@ -66,4 +66,4 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           repository: jupyter-naas/kernels
           event-type: pypip-deployed
-          client-payload: '{"ref": "${{ github.ref }}"}'
+          client-payload: '{"ref": "${{ github.ref }}"}'

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.11.2 (2023-07-05)
+
+### Fix
+
+- Remove codecov upload for now
+
+## 2.11.1 (2023-07-05)
+
+### Fix
+
+- **dependency**: update naas_drivers 0.110.2
+
+## 2.11.0 (2023-06-29)
+
+### Feat
+
+- Introduced User-Defined outputs_path for Pipeline Execution (#402)
+
 ## 2.10.3 (2023-03-02)
 
 ### Fix

Dockerfile

@@ -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.10.3
+ENV NAAS_VERSION 2.11.2
 ENV JUPYTER_ENABLE_LAB 'yes'
 ENV NB_UMASK=022
 ENV NB_USER=ftp

naas/__init__.py

@@ -19,7 +19,7 @@
 import os
 import sys
 
-__version__ = "2.10.3"
+__version__ = "2.11.2"
 __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

naas/pipeline/pipeline.py

@@ -39,7 +39,7 @@ class ExecutionContext:
     output_dir: str = None
     output_path: str = None
 
-    def __init__(self, output_dir: str = "pipeline_executions"):
+    def __init__(self, output_dir: str):
         self.execution_id = str(uuid.uuid4())
         self.output_dir = output_dir
         self.timestamp = datetime.datetime.now()
@@ -428,7 +428,7 @@ def run(
         self,
         style: Literal["diagram", "progess"] = "diagram",
         monitor: bool = True,
-        outputs_path="",
+        outputs_path="pipeline_executions",
     ):
         """Start the execution of the pipeline.
 
@@ -442,7 +442,7 @@ def run(
         """
         if self.execution_ctx is not None:
             raise PipelineAlreadyRan("This pipeline have already been executed.")
-        self.execution_ctx = ExecutionContext()
+        self.execution_ctx = ExecutionContext(outputs_path)
         self.status = StepStatus.RUNNING
         self.monitors = []
         if monitor is True:
@@ -494,7 +494,6 @@ class DummyStep(Step):
     """
 
     def __init__(self, name):
-
         super().__init__(name)
         self.output = None
 

naas/runner/runner.py

@@ -50,7 +50,7 @@
 asyncio.set_event_loop_policy(None)
 nest_asyncio.apply()
 
-__version__ = "2.10.3"
+__version__ = "2.11.2"
 
 
 class Runner:

setup.py

@@ -3,7 +3,7 @@
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
-NDV = "0.109.1"
+NDV = "0.110.2"
 
 driver_dep = [f'naas_drivers[full]=={NDV}']
 dev_dep = [
@@ -25,7 +25,7 @@
 ]
 setup(
     name="naas",
-    version="2.10.3",
+    version="2.11.2",
     author="Maxime Jublou",
     author_email="devops@cashstory.com",
     license="BSD",
@@ -76,7 +76,8 @@
         "mprop==0.16.0",
         "pydash==5.1.0",
         "pyvis==0.3.0",
-        "rich"
+        "rich",
+        "tzlocal==2.1"
     ],
     classifiers=[
         "Programming Language :: Python :: 3.9",