Upgrade to 0.4.2, update CI (#55)

* Upgrade to 0.4.2, update CI * Pin pydantic < 2.0 * Pin pydantic < 2.0 in kbatch-proxy * Fix mypy issue * Fix more mypy issues
kbatch-dev · Sep 11, 2023 · 8537365 · 8537365
1 parent 1827cae
commit 8537365
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml
@@ -22,23 +22,24 @@ jobs:
 
       - name: Get the version
         id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+        run: |
+          echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
       - name: Log in to the Container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@v4
         with:
           context: kbatch-proxy
           file: kbatch-proxy/docker/production/Dockerfile

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ repos:
     hooks:
     - id: black
       language_version: python3
--   repo: https://gitlab.com/pycqa/flake8
+-   repo: https://github.com/pycqa/flake8
     rev: 3.9.2
     hooks:
     - id: flake8

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -22,7 +22,7 @@
 author = "Tom Augspurger"
 
 # The full version, including alpha/beta/rc tags
-release = "0.4.1"
+release = "0.4.2"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/kbatch-proxy/kbatch_proxy/main.py b/kbatch-proxy/kbatch_proxy/main.py
@@ -132,7 +132,7 @@ async def get_current_user(request: Request) -> User:
         user = None
 
     if user:
-        return User(**user, api_token=token, authenticated=True)
+        return User(**user, api_token=token)
     else:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,

diff --git a/kbatch-proxy/requirements.txt b/kbatch-proxy/requirements.txt
@@ -6,4 +6,4 @@ gunicorn==20.1.0
 jupyterhub
 escapism
 rich
-pydantic[dotenv]
+pydantic[dotenv]<2.0.0
diff --git a/kbatch-proxy/setup.cfg b/kbatch-proxy/setup.cfg
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [metadata]
 name = kbatch-proxy
-version = 0.4.1
+version = 0.4.2
 description = Proxy batch job requests to kubernetes.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -20,7 +20,7 @@ install_requires =
     httpx
     jupyterhub
     kubernetes
-    pydantic[dotenv]
+    pydantic[dotenv]<2.0.0
 
 [options.extras_require]
 all =

diff --git a/kbatch/kbatch/__init__.py b/kbatch/kbatch/__init__.py
@@ -14,7 +14,7 @@
 from ._backend import make_job, make_cronjob
 
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 __all__ = [
     "__version__",

diff --git a/kbatch/kbatch/_backend.py b/kbatch/kbatch/_backend.py
@@ -162,7 +162,7 @@ def _make_job_spec(
     return V1JobSpec(template=template, backoff_limit=0, ttl_seconds_after_finished=300)
 
 
-def _make_job_name(name: str, schedule: str = None):
+def _make_job_name(name: str, schedule: Union[str, None] = None):
     generate_name = name
     if not name.endswith("-"):
         generate_name = name + "-"

diff --git a/kbatch/kbatch/_core.py b/kbatch/kbatch/_core.py
@@ -82,7 +82,7 @@ def _request_action(
     token: Optional[str],
     method: str,
     model: Union[V1Job, V1CronJob],
-    resource_name: str = None,
+    resource_name: Union[str, None] = None,
     json_data: Optional[dict] = None,
 ):
     client = httpx.Client(follow_redirects=True)

diff --git a/kbatch/setup.cfg b/kbatch/setup.cfg
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [metadata]
 name = kbatch
-version = 0.4.1
+version = 0.4.2
 description = Submit batch jobs to Kubernetes.
 long_description = file: README.md
 long_description_content_type = text/markdown