Skip to content

Commit

Permalink
Release 0.11.2
Browse files Browse the repository at this point in the history
- restore `list_resource_requests()` with deprecation warning
- fix dependencies
  • Loading branch information
apdavison committed Nov 20, 2023
1 parent 03e4d84 commit b158d87
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test Python client

on:
push:
branches: [ "main" ]
branches: [ "master" ]

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
stages:
- test

test_staging:
test_main:
stage: test
only:
variables:
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
# The short X.Y version.
version = "0.11"
# The full version, including alpha/beta/rc tags.
release = "0.11.1"
release = "0.11.2"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion nmpi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
ESS = "BrainScaleS-ESS"
SPIKEY = "Spikey"

__version__ = "0.11.1"
__version__ = "0.11.2"
11 changes: 10 additions & 1 deletion nmpi/nmpi_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from urllib.request import urlretrieve
import fnmatch
import re
from warnings import warn
import requests
from requests.auth import AuthBase

Expand Down Expand Up @@ -707,7 +708,11 @@ def resource_requests(self, collab_id, status=None):
url += "?" + urlencode(filters)
return self._query(url)

def list_quotas(self, collab_id):
def list_resource_requests(self, collab_id, status=None):
warn("Use of `list_resource_requests() is deprecated, use `resource_requests()` instead.")
return self.resource_requests(collab_id, status=status)

def quotas(self, collab_id):
"""
Return a list of quotas for running jobs on the Neuromorphic Platform
"""
Expand All @@ -717,6 +722,10 @@ def list_quotas(self, collab_id):
quotas.extend(rr["quotas"])
return quotas

def list_quotas(self, collab_id):
warn("Use of `list_resource_requests() is deprecated, use `resource_requests()` instead.")
return self.quotas(collab_id)

def save_code_to_storage(self, job_id):
job = self.get_job(job_id)
code = job["code"]
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from setuptools import setup

requirements = ["requests", "click", "pyyaml"]
requirements = ["requests", "click", "pyyaml", "ebrains_drive"]

test_requirements = [
# TODO: put package test requirements here
Expand All @@ -13,7 +13,7 @@

setup(
name="hbp_neuromorphic_platform",
version="0.11.1",
version="0.11.2",
packages=["nmpi"],
package_dir={"nmpi": "nmpi"},
entry_points={"console_scripts": ["nmpi=nmpi.cli:cli"]},
Expand Down

0 comments on commit b158d87

Please sign in to comment.