oscar-python 1.3.2__tar.gz → 1.3.3__tar.gz

oscar_python-1.3.3/.github/workflows/release-build.yaml

@@ -0,0 +1,76 @@
+# This workflow will upload a Python Package to PyPI when a release is created
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  release-build:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get_version.outputs.version }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # Fetch sufficient history for setuptools-scm to find tags
+          # Using 50 commits should cover most scenarios while being faster than full history
+          fetch-depth: 50
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Get version from setuptools-scm
+        id: get_version
+        run: |
+          python -m pip install setuptools-scm
+          version=$(python -m setuptools_scm)
+          echo "version=$version" >> $GITHUB_OUTPUT
+          echo "Package version: $version"
+
+      - name: Build release distributions
+        run: |
+          python -m pip install build
+          python -m build
+
+      - name: Upload distributions
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+  pypi-publish:
+    runs-on: ubuntu-latest
+    needs:
+      - release-build
+    permissions:
+      # IMPORTANT: this permission is mandatory for trusted publishing
+      id-token: write
+
+    # Dedicated environments with protections for publishing are strongly recommended.
+    # For more information, see: https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#deployment-protection-rules
+    environment:
+      name: pypi
+      # PyPI project URL with the exact version (e.g., 1.3.3 or 1.3.3b3)
+      url: https://pypi.org/project/oscar-python/${{ needs.release-build.outputs.version }}/
+
+    steps:
+      - name: Retrieve release distributions
+        uses: actions/download-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+      - name: Publish release distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: dist/

oscar_python-1.3.3/.github/workflows/tests.yaml

@@ -0,0 +1,27 @@
+name: tests
+
+on:
+  push:
+    branches: ["main", "devel"]
+  pull_request:
+    branches: ["main", "devel"]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install -e .[dev]
+
+    - name: Run tests
+      run: python -m pytest tests --cov=oscar_python

oscar_python-1.3.3/.gitignore

@@ -0,0 +1,160 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

{oscar_python-1.3.2 → oscar_python-1.3.3}/PKG-INFO

@@ -1,37 +1,30 @@
 Metadata-Version: 2.4
-Name: oscar_python
-Version: 1.3.2
-Summary: OSCAR API for python
-Home-page: https://github.com/grycap/oscar_python
-Author: GRyCAP - Universitat Politecnica de Valencia
-Author-email: calarcon@i3m.upv.es
-License: Apache 2.0
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: Apache Software License
+Name: oscar-python
+Version: 1.3.3
+Summary: Python client for OSCAR clusters
+Author: GRyCAP - I3M - UPV
+License: Apache-2.0
+Project-URL: Homepage, https://github.com/grycap/oscar-python
+Project-URL: Repository, https://github.com/grycap/oscar-python
+Keywords: oscar,faas,serverless
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: webdavclient3==3.14.6
 Requires-Dist: requests
+Requires-Dist: webdavclient3>=3.14.6
 Requires-Dist: boto3
-Requires-Dist: setuptools>=40.8.0
 Requires-Dist: pyyaml
 Requires-Dist: aiohttp
 Requires-Dist: liboidcagent
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 ## Python OSCAR client
 
-[![Build](https://github.com/grycap/oscar_python/actions/workflows/release.yaml/badge.svg)](https://github.com/grycap/oscar_python/actions/workflows/main.yaml)
-![PyPI](https://img.shields.io/pypi/v/oscar_python)
+[![Tests](https://github.com/grycap/oscar_python/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/grycap/oscar_python/actions/workflows/tests.yaml)
+[![PyPI](https://img.shields.io/pypi/v/oscar-python)](https://pypi.org/project/oscar-python/)
 
 This package provides a client to interact with OSCAR (https://oscar.grycap.net) clusters and services. It is available on Pypi with the name [oscar-python](https://pypi.org/project/oscar-python/).
 
@@ -107,6 +100,7 @@ and `scopes`:
                 'refresh_token':'token',
                 'scopes': ["openid", "profile", "email"],
                 'token_endpoint': "http://issuer.com/token",
+                'client_id': "your_client_id"
                 'ssl':'True'}
                 
   client = Client(options = options_oidc_auth)
@@ -231,6 +225,8 @@ logs = client.get_job_logs("service_name", "job_id") # returns an http response
 ``` python
 # get a list of jobs in a service
 log_list = client.list_jobs("service_name") # returns an http response
+# to get more jobs use the page parameter
+log_list = client.list_jobs("service_name",page="token_to_next_page") # returns an http response
 ```
 
 **remove_job**

{oscar_python-1.3.2 → oscar_python-1.3.3}/README.md

@@ -1,7 +1,7 @@
 ## Python OSCAR client
 
-[![Build](https://github.com/grycap/oscar_python/actions/workflows/release.yaml/badge.svg)](https://github.com/grycap/oscar_python/actions/workflows/main.yaml)
-![PyPI](https://img.shields.io/pypi/v/oscar_python)
+[![Tests](https://github.com/grycap/oscar_python/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/grycap/oscar_python/actions/workflows/tests.yaml)
+[![PyPI](https://img.shields.io/pypi/v/oscar-python)](https://pypi.org/project/oscar-python/)
 
 This package provides a client to interact with OSCAR (https://oscar.grycap.net) clusters and services. It is available on Pypi with the name [oscar-python](https://pypi.org/project/oscar-python/).
 
@@ -77,6 +77,7 @@ and `scopes`:
                 'refresh_token':'token',
                 'scopes': ["openid", "profile", "email"],
                 'token_endpoint': "http://issuer.com/token",
+                'client_id': "your_client_id"
                 'ssl':'True'}
                 
   client = Client(options = options_oidc_auth)
@@ -201,6 +202,8 @@ logs = client.get_job_logs("service_name", "job_id") # returns an http response
 ``` python
 # get a list of jobs in a service
 log_list = client.list_jobs("service_name") # returns an http response
+# to get more jobs use the page parameter
+log_list = client.list_jobs("service_name",page="token_to_next_page") # returns an http response
 ```
 
 **remove_job**

oscar_python-1.3.3/jupyter_example/oscar_notebook.ipynb

@@ -0,0 +1,143 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### OSCAR API notebook example"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "This notebook is a sample of the usage of the python API with jupyter notebooks step by step. You can modify the parameters in the code and the service to test it with your own OSCAR cluster.\n",
+    "\n",
+    "The first step is to install the package from Pypi."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true,
+    "jupyter": {
+     "outputs_hidden": true
+    },
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "# Install oscar-python package in the current Jupyter kernel\n",
+    "import sys\n",
+    "!{sys.executable} -m pip install oscar-python"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "With the package installed you can now create the client with your cluster credentials, enpoint and ID or cluster name."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Import oscar_python library\n",
+    "from oscar_python.client import Client\n",
+    "client = Client(\"cluster-id\",\"https://your-cluster-endpoint.net\", \"user\", \"password\", True)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Once the client is created, you can call the function `create_service` with the path to the FDL file wich contains the function definition. To make it easier we recommend to have a folder for each service with their respective fdl and script within the path of the jupyter notebook. \n",
+    "\n",
+    "Also, the cluster ID on the FDL file has to match the one provided on the client definition, otherwise the function will throw an exception."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true,
+    "jupyter": {
+     "outputs_hidden": true
+    },
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "# Create a service with the function create_service, which returns an error if something goes wrong or nothing if the service is created correctly\n",
+    "try:\n",
+    "    client.create_service(\"services/cowsay_example/cowsay.yaml\")\n",
+    "    print(\"Service created\")\n",
+    "except Exception as ex:\n",
+    "    print(\"Error creating service: \", ex)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Then, you can run a synchronous invocation with the function `run_service` and the input parameters that the function requires."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true,
+    "jupyter": {
+     "outputs_hidden": true
+    },
+    "tags": []
+   },
+   "outputs": [],
+   "source": [
+    "# Test the synchronous invocation of the service\n",
+    "try:\n",
+    "    res = client.run_service(\"cowsay\", input = '{\"message\": \"Hi there\"}')\n",
+    "    if res.status_code == 200:\n",
+    "        print(res.text)\n",
+    "except Exception as ex:\n",
+    "    print(\"Error running service: \", ex)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "interpreter": {
+   "hash": "31f2aee4e71d21fbe5cf8b01ff0e069b9275f58929596ceb00d14d90e3e16cd6"
+  },
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.9.7"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

oscar_python-1.3.3/jupyter_example/services/cowsay_example/cowsay.yaml

@@ -0,0 +1,12 @@
+functions:
+  oscar:
+  - oscar-gpu-cluster:
+      name: cowsay
+      cpu: 1.0
+      memory: 1Gi
+      image: ghcr.io/grycap/cowsay
+      script: services/cowsay_example/script.sh
+      log_level: CRITICAL   # To avoid supervisor logs in response
+      environment:
+        Variables:
+          INPUT_TYPE: json  # Comment to set input string encoded in base64

oscar_python-1.3.3/jupyter_example/services/cowsay_example/script.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$INPUT_TYPE" = "json" ]
+then
+    jq '.message' "$INPUT_FILE_PATH" -r | /usr/games/cowsay
+else
+    cat "$INPUT_FILE_PATH" | /usr/games/cowsay
+fi

{oscar_python-1.3.2 → oscar_python-1.3.3}/oscar_python/_oidc.py

@@ -77,14 +77,14 @@ class OIDC(object):
             return True
 
     @staticmethod
-    def refresh_access_token(refresh_token, scopes, token_endpoint):
+    def refresh_access_token(refresh_token, scopes, token_endpoint, client_id="token-portal"):
         """
         Refresh the access token using the refresh token
         """
         data = {
             'grant_type': 'refresh_token',
             'refresh_token': refresh_token,
-            'client_id': 'token-portal',
+            'client_id': client_id,
             'scope': ' '.join(scopes)
         }
 

{oscar_python-1.3.2 → oscar_python-1.3.3}/oscar_python/client.py

@@ -41,6 +41,7 @@ _DELETE = "delete"
 # Default values for OIDC refresh token using EGI CheckIn
 _DEFAULT_SCOPES = ['openid', 'email', 'profile', 'voperson_id', 'eduperson_entitlement']
 _DEFAULT_TOKEN_ENDPOINT = 'https://aai.egi.eu/auth/realms/egi/protocol/openid-connect/token'
+_DEFAULT_CLIENT_ID = 'token-portal'
 
 
 class Client(DefaultClient):
@@ -72,6 +73,8 @@ class Client(DefaultClient):
         self.token_endpoint = options.get('token_endpoint',
                                           _DEFAULT_TOKEN_ENDPOINT)
         self.ssl = bool(options['ssl'])
+        self.client_id = options.get('client_id',
+                                     _DEFAULT_CLIENT_ID)
 
     def set_auth_type(self, options):
         if 'user' in options:
@@ -91,7 +94,8 @@ class Client(DefaultClient):
         if self.refresh_token and OIDC.is_access_token_expired(self.oidc_token):
             self.oidc_token = OIDC.refresh_access_token(self.refresh_token,
                                                         self.scopes,
-                                                        self.token_endpoint)
+                                                        self.token_endpoint,
+                                                        self.client_id)
         return self.oidc_token
 
     """ Creates a generic storage client to interact with the storage providers
@@ -132,9 +136,14 @@ class Client(DefaultClient):
                     except KeyError as err:
                         raise Exception("FDL clusterID does not match current clusterID: {0}".format(err))
                     try:
-                        with open(svc["script"]) as s:
+                        if os.path.isabs(svc["script"]):
+                            script_path =  svc["script"]
+                        else:
+                            fdl_directory = os.path.dirname(fdl_path)
+                            script_path = os.path.join(fdl_directory, svc['script'])
+                        with open(script_path) as s:
                             svc["script"] = s.read()
-                    except IOError:
+                    except IOError  as e:
                         raise Exception("Couldn't read script")
 
                     # cpu parameter has to be string on the request
@@ -205,8 +214,8 @@ class Client(DefaultClient):
         return utils.make_request(self, _LOGS_PATH+"/"+svc+"/"+job, _GET)
 
     """ List a service jobs """
-    def list_jobs(self, svc):
-        return utils.make_request(self, _LOGS_PATH+"/"+svc, _GET)
+    def list_jobs(self, svc, page=""):
+        return utils.make_request(self, _LOGS_PATH+"/"+svc+"?page="+page, _GET)
 
     """ Remove a service job """
     def remove_job(self, svc, job):

{oscar_python-1.3.2 → oscar_python-1.3.3}/oscar_python.egg-info/PKG-INFO

@@ -1,37 +1,30 @@
 Metadata-Version: 2.4
-Name: oscar_python
-Version: 1.3.2
-Summary: OSCAR API for python
-Home-page: https://github.com/grycap/oscar_python
-Author: GRyCAP - Universitat Politecnica de Valencia
-Author-email: calarcon@i3m.upv.es
-License: Apache 2.0
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: Apache Software License
+Name: oscar-python
+Version: 1.3.3
+Summary: Python client for OSCAR clusters
+Author: GRyCAP - I3M - UPV
+License: Apache-2.0
+Project-URL: Homepage, https://github.com/grycap/oscar-python
+Project-URL: Repository, https://github.com/grycap/oscar-python
+Keywords: oscar,faas,serverless
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: webdavclient3==3.14.6
 Requires-Dist: requests
+Requires-Dist: webdavclient3>=3.14.6
 Requires-Dist: boto3
-Requires-Dist: setuptools>=40.8.0
 Requires-Dist: pyyaml
 Requires-Dist: aiohttp
 Requires-Dist: liboidcagent
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 ## Python OSCAR client
 
-[![Build](https://github.com/grycap/oscar_python/actions/workflows/release.yaml/badge.svg)](https://github.com/grycap/oscar_python/actions/workflows/main.yaml)
-![PyPI](https://img.shields.io/pypi/v/oscar_python)
+[![Tests](https://github.com/grycap/oscar_python/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/grycap/oscar_python/actions/workflows/tests.yaml)
+[![PyPI](https://img.shields.io/pypi/v/oscar-python)](https://pypi.org/project/oscar-python/)
 
 This package provides a client to interact with OSCAR (https://oscar.grycap.net) clusters and services. It is available on Pypi with the name [oscar-python](https://pypi.org/project/oscar-python/).
 
@@ -107,6 +100,7 @@ and `scopes`:
                 'refresh_token':'token',
                 'scopes': ["openid", "profile", "email"],
                 'token_endpoint': "http://issuer.com/token",
+                'client_id': "your_client_id"
                 'ssl':'True'}
                 
   client = Client(options = options_oidc_auth)
@@ -231,6 +225,8 @@ logs = client.get_job_logs("service_name", "job_id") # returns an http response
 ``` python
 # get a list of jobs in a service
 log_list = client.list_jobs("service_name") # returns an http response
+# to get more jobs use the page parameter
+log_list = client.list_jobs("service_name",page="token_to_next_page") # returns an http response
 ```
 
 **remove_job**

{oscar_python-1.3.2 → oscar_python-1.3.3}/oscar_python.egg-info/SOURCES.txt

@@ -1,6 +1,13 @@
+.gitignore
 LICENSE
 README.md
+pyproject.toml
 setup.py
+.github/workflows/release-build.yaml
+.github/workflows/tests.yaml
+jupyter_example/oscar_notebook.ipynb
+jupyter_example/services/cowsay_example/cowsay.yaml
+jupyter_example/services/cowsay_example/script.sh
 oscar_python/__init__.py
 oscar_python/_oidc.py
 oscar_python/_utils.py
@@ -12,7 +19,6 @@ oscar_python/storage.py
 oscar_python.egg-info/PKG-INFO
 oscar_python.egg-info/SOURCES.txt
 oscar_python.egg-info/dependency_links.txt
-oscar_python.egg-info/not-zip-safe
 oscar_python.egg-info/requires.txt
 oscar_python.egg-info/top_level.txt
 oscar_python/_providers/_minio.py

oscar_python-1.3.3/oscar_python.egg-info/requires.txt

@@ -0,0 +1,10 @@
+requests
+webdavclient3>=3.14.6
+boto3
+pyyaml
+aiohttp
+liboidcagent
+
+[dev]
+pytest
+pytest-cov

oscar_python-1.3.3/oscar_python.egg-info/top_level.txt

@@ -0,0 +1 @@
+oscar_python

oscar_python-1.3.3/pyproject.toml

@@ -0,0 +1,38 @@
+[build-system]
+requires = ["setuptools>=64", "setuptools-scm>=8"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "oscar-python"
+dynamic = ["version"]
+description = "Python client for OSCAR clusters"
+readme = "README.md"
+requires-python = ">=3.8"
+license = {text = "Apache-2.0"}
+authors = [{name = "GRyCAP - I3M - UPV"}]
+keywords = ["oscar", "faas", "serverless"]
+
+dependencies = [
+    "requests",
+    "webdavclient3>=3.14.6",
+    "boto3",
+    "pyyaml",
+    "aiohttp",
+    "liboidcagent",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest",
+    "pytest-cov",
+]
+
+[project.urls]
+Homepage = "https://github.com/grycap/oscar-python"
+Repository = "https://github.com/grycap/oscar-python"
+
+[tool.setuptools]
+packages = ["oscar_python"]
+
+[tool.setuptools_scm]
+# Automatically get version from git tags

oscar_python-1.3.3/setup.py

@@ -0,0 +1,21 @@
+# Copyright (C) GRyCAP - I3M - UPV
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Minimal setup.py for backward compatibility.
+All configuration is now in pyproject.toml.
+"""
+
+from setuptools import setup
+
+setup()

{oscar_python-1.3.2 → oscar_python-1.3.3}/tests/test_oidc.py

@@ -24,7 +24,8 @@ def test_refresh_access_token():
         mock_post.return_value = mock_response
         access_token = OIDC.refresh_access_token("old_refresh_token",
                                                  ["openid", "profile", "email"],
-                                                 "http://test.com/token")
+                                                 "http://test.com/token",
+                                                 "token-portal")
 
         assert access_token == "new_access_token"
         mock_post.assert_called_once_with(

oscar_python-1.3.2/oscar_python.egg-info/not-zip-safe

@@ -1 +0,0 @@
-

oscar_python-1.3.2/oscar_python.egg-info/requires.txt

@@ -1,7 +0,0 @@
-webdavclient3==3.14.6
-requests
-boto3
-setuptools>=40.8.0
-pyyaml
-aiohttp
-liboidcagent

oscar_python-1.3.2/oscar_python.egg-info/top_level.txt

@@ -1,3 +0,0 @@
-jupyter_example
-oscar_python
-tests

oscar_python-1.3.2/setup.py

@@ -1,49 +0,0 @@
-# Copyright (C) GRyCAP - I3M - UPV
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from setuptools import setup, find_namespace_packages
-
-# Load readme
-with open('README.md', mode='r', encoding='utf-8') as f:
-    readme = f.read()
-
-# Load version
-with open('version.py', mode='r', encoding='utf-8') as f:
-    exec(f.read())
-
-
-setup(name='oscar_python',
-      version=__version__,
-      description='OSCAR API for python',
-      long_description=readme,
-      long_description_content_type='text/markdown',
-      url='https://github.com/grycap/oscar_python',
-      author='GRyCAP - Universitat Politecnica de Valencia',
-      author_email='calarcon@i3m.upv.es',
-      license='Apache 2.0',
-      packages=find_namespace_packages(),
-      install_requires=[
-          'webdavclient3 == 3.14.6',
-          'requests',
-          'boto3',
-          'setuptools >= 40.8.0',
-          'pyyaml',
-          'aiohttp',
-          'liboidcagent',
-      ],
-      classifiers=[
-          'Programming Language :: Python :: 3',
-          'License :: OSI Approved :: Apache Software License'
-      ],
-      zip_safe=False)