Skip to content

Commit

Permalink
fix(deps): Update dependencies and CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mikkelkp committed Jan 14, 2025
1 parent 7e1ce19 commit 1dfb6da
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 21 deletions.
41 changes: 27 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,23 @@ jobs:
- name: set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: set up node # we need node for for semantic release
uses: actions/setup-node@v2.1.2
python-version: '3.10'
- name: set up node # we need node for for semantic release
uses: actions/setup-node@v4
with:
node-version: 14.2.0
node-version: 22.2.0
- name: install python dependencies
run: |
pip install -r dev-requirements.txt
pip install .
- name: install semantic-release
run: npm install @semantic-release/exec
run:
npm install @semantic-release/exec
- name: run semantic release
id: new_release
run: |
nextRelease="`npx semantic-release@^17.0.0 --dryRun | grep -oP 'Published release \K.*? ' || true`"
npx semantic-release@^17.0.0
nextRelease="`npx semantic-release@^23.1.1 --dryRun | grep -oP 'Published release \K.*? ' || true`"
npx semantic-release@^23.1.1
echo "::set-output name=tag::$nextRelease"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -48,13 +49,13 @@ jobs:
- name: set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: '3.10'
- name: install python dependencies
run: pip install .
- name: deploy to staging
run: |
queenbee
pollination dsl push pollination-annual-daylight --tag ${{needs.deploy.outputs.tag}} -e https://api.staging.pollination.cloud -src https://api.staging.pollination.cloud/registries --push-dependencies
pollination dsl push pollination-annual-daylight --tag ${{needs.deploy.outputs.tag}} -e https://api.staging.pollination.solutions -src https://api.staging.pollination.solutions/registries --push-dependencies
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
QB_POLLINATION_TOKEN: ${{ secrets.POLLINATION_STAGING_LADYBUGBOT_TOKEN }}
Expand Down Expand Up @@ -94,8 +95,7 @@ jobs:
echo $TAG-${{ matrix.branch }}
queenbee
pollination dsl push pollination-annual-daylight --tag $TAG-${{ matrix.branch }} -e https://api.staging.pollination.cloud -src https://api.staging.pollination.cloud/registries --push-dependencies
pollination dsl push pollination-annual-daylight --tag $TAG-${{ matrix.branch }} -e https://api.staging.pollination.solutions -src https://api.staging.pollination.solutions/registries --push-dependencies
- name: deploy ${{ matrix.branch }} branch to PyPI
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -105,6 +105,19 @@ jobs:
python setup.py sdist bdist_wheel --branch ${{ matrix.branch }}
echo "Pushing new version to PyPi"
twine upload dist/* -u $PYPI_USERNAME -p $PYPI_PASSWORD
- name: Set Tag
id: set-tag
run: |
TAG=$(echo "${{ needs.deploy.outputs.tag }}-viz" | sed 's/[[:space:]]//g')
echo "tag=$TAG" >> $GITHUB_OUTPUT
- name: install python dependencies for samples
run: pip install -r samples/requirements.txt
- name: run on staging
run: python samples/run_jobs.py
env:
QB_POLLINATION_TOKEN: ${{ secrets.POLLINATION_STAGING_LADYBUGBOT_TOKEN }}
TAG: ${{ steps.set-tag.outputs.tag }}
HOST: https://api.staging.pollination.solutions

deploy-to-production:
name: Deploy to Pollination Production
Expand All @@ -117,7 +130,7 @@ jobs:
- name: set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: '3.10'
- name: Get Job Context
id: get-context
run: |
Expand All @@ -133,7 +146,7 @@ jobs:
TAG=$(echo "${TAG:?}" | sed 's/[[:space:]]//g')
echo $TAG
queenbee
pollination dsl push pollination-annual-daylight --tag $TAG -e https://api.pollination.cloud -src https://api.pollination.cloud/registries --push-dependencies
pollination dsl push pollination-annual-daylight --tag $TAG -e https://api.pollination.solutions -src https://api.pollination.solutions/registries --push-dependencies
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
QB_POLLINATION_TOKEN: ${{ secrets.POLLINATION_LADYBUGBOT_TOKEN }}
Expand Down Expand Up @@ -175,4 +188,4 @@ jobs:
echo $TAG-${{ matrix.branch }}
queenbee
pollination dsl push pollination-annual-daylight --tag $TAG-${{ matrix.branch }} -e https://api.pollination.cloud -src https://api.pollination.cloud/registries --push-dependencies
pollination dsl push pollination-annual-daylight --tag $TAG-${{ matrix.branch }} -e https://api.pollination.solutions -src https://api.pollination.solutions/registries --push-dependencies
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: '3.10'
- name: install python dependencies
run: |
pip install -r dev-requirements.txt
Expand Down
8 changes: 4 additions & 4 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest==6.2.3
twine==3.4.1
wheel==0.36.2
setuptools==56.0.0
pytest==6.2.5
twine==5.1.1
wheel==0.44.0
setuptools==75.1.0
2 changes: 1 addition & 1 deletion extras-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pollination-honeybee-display==0.1.13
pollination-honeybee-display==0.1.19
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pollination-honeybee-radiance==0.22.49
pollination-honeybee-radiance-postprocess==0.0.45
pollination-dsl>=0.15.3
pollination-dsl>=0.17.1
pollination-alias==0.11.8
pollination-path==0.3.2

0 comments on commit 1dfb6da

Please sign in to comment.