From d1a057e51b182ff70a8cc82c24eb980b2eb9435b Mon Sep 17 00:00:00 2001 From: mostaphaRoudsari Date: Tue, 22 Oct 2024 14:04:35 -0400 Subject: [PATCH 1/3] fix: change endpoints to pollination.solutions I also took the opportunity to rename and simplify the env varibale --- README.md | 6 +++--- queenbee_pollination/client.py | 2 +- queenbee_pollination/config.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2f47ca1..963e10a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # queenbee-pollination -queenbee-pollination extends [queenbee](https://github.com/ladybug-tools/queenbee) in order to interact with the [Pollination API](https://api.pollination.cloud). +queenbee-pollination extends [queenbee](https://github.com/pollination/queenbee) in order to interact with the [Pollination API](https://api.pollination.solutions). ## Installation @@ -19,12 +19,12 @@ The CLI tool will authenticate to the Pollination API in one of two ways: #### Env Vars -Set the following environment variable as your API token before running commands `QB_POLLINATION_TOKEN`. +Set the following environment variable as your API token before running commands `POLLINATION_TOKEN`. Example for a bash shell: ```console -> export QB_POLLINATION_TOKEN= +> export POLLINATION_TOKEN= > queenbee pollination project simulations list --project test-project --owner ladybug-tools ``` diff --git a/queenbee_pollination/client.py b/queenbee_pollination/client.py index da9ead1..2c1fe50 100644 --- a/queenbee_pollination/client.py +++ b/queenbee_pollination/client.py @@ -4,7 +4,7 @@ class Client(object): """A Pollination client designed to interact with Workflow and Simulation objects.""" - def __init__(self, api_token=None, access_token=None, host='https://api.pollination.cloud'): + def __init__(self, api_token=None, access_token=None, host='https://api.pollination.solutions'): config = sdk.Configuration( api_key={'APIKeyAuth': api_token} ) diff --git a/queenbee_pollination/config.py b/queenbee_pollination/config.py index 1267526..fe5ebfe 100644 --- a/queenbee_pollination/config.py +++ b/queenbee_pollination/config.py @@ -6,7 +6,7 @@ class Config(BaseSettings): endpoint: str = Field( - 'https://api.pollination.cloud', + 'https://api.pollination.solutions', description='The API endpoint to use when making API calls', env='QB_POLLINATION_ENDPOINT', ) @@ -14,7 +14,7 @@ class Config(BaseSettings): token: str = Field( None, description='The API token used to login to the API', - env='QB_POLLINATION_TOKEN' + env='POLLINATION_TOKEN' ) jwt_token: str = Field( From 8f5d50da718e4c3c1311e2495e41ca5e521ee173 Mon Sep 17 00:00:00 2001 From: mostaphaRoudsari Date: Tue, 22 Oct 2024 14:08:06 -0400 Subject: [PATCH 2/3] deps(dev): bump dev dependencies --- dev-requirements.txt | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 1377666..824f42f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,13 +1,11 @@ -coverage==5.1 -coveralls==2.1.1 -pytest==5.4.3 -pytest-cov==2.10.0 -attrs==19.3.0 -Sphinx==3.1.2 -sphinx-bootstrap-theme==0.7.1 +pytest==8.3.2 +attrs>=19.3.0 +Sphinx==8.0.2 +sphinx-bootstrap-theme==0.8.1 sphinxcontrib-fulltoc==1.2.0 -sphinxcontrib-websupport==1.2.3 -twine==3.2.0 -requests==2.24.0 -wheel==0.34.2 +sphinxcontrib-websupport==2.0.0 +twine==3.4.1 +requests>=2.24.0 +wheel==0.36.2 pylint==2.6.0 +setuptools==61.0.0 From 1757e89d1aacb57a19e5f4cf7fb145ce28a76fca Mon Sep 17 00:00:00 2001 From: mostaphaRoudsari Date: Tue, 22 Oct 2024 14:18:36 -0400 Subject: [PATCH 3/3] ci: update actions --- .github/workflows/continuous-deployment.yaml | 6 +++--- .github/workflows/continuous-integration.yaml | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/continuous-deployment.yaml b/.github/workflows/continuous-deployment.yaml index becb74c..6090c4f 100644 --- a/.github/workflows/continuous-deployment.yaml +++ b/.github/workflows/continuous-deployment.yaml @@ -10,11 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.12 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index c8940fc..e7b2ee4 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.12 - name: Install dependencies run: | python -m pip install --upgrade pip @@ -29,10 +29,10 @@ jobs: steps: - uses: actions/checkout@v1 - - uses: actions/setup-node@v1 + - name: set up node + uses: actions/setup-node@v4 with: - node-version: '10.x' - registry-url: 'https://registry.npmjs.org' - - run: npx semantic-release@^17.0.0 + node-version: 22.2.0 + - run: npx semantic-release@^23.1.1 env: GH_TOKEN: ${{ secrets.GH_TOKEN }}