Skip to content

Commit fd9a6c1

Browse files
authored
Merge pull request #48 from regro-cf-autotick-bot/36.0.1_h4f525a
python-kubernetes v36.0.1
2 parents 4b80e36 + 31023c3 commit fd9a6c1

4 files changed

Lines changed: 22 additions & 11 deletions

File tree

.github/workflows/conda-build.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
os: ubuntu
2929
runs_on: ['ubuntu-latest']
3030
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
31+
tools_install_dir: ~/miniforge3
32+
build_workspace_dir: build_artifacts
33+
docker_run_args:
3134
steps:
3235

3336
- name: Checkout code
@@ -37,11 +40,13 @@ jobs:
3740
id: build-linux
3841
if: matrix.os == 'ubuntu'
3942
env:
43+
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
44+
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
4045
CONFIG: ${{ matrix.CONFIG }}
4146
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
4247
DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
4348
CI: github_actions
44-
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
49+
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.docker_run_args }}"
4550
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
4651
FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
4752
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
@@ -61,13 +66,17 @@ jobs:
6166
else
6267
export IS_PR_BUILD="False"
6368
fi
69+
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
70+
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
6471
echo "::endgroup::"
6572
./.scripts/run_docker_build.sh
6673
6774
- name: Build on macOS
6875
id: build-macos
6976
if: matrix.os == 'macos'
7077
env:
78+
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
79+
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
7180
CONFIG: ${{ matrix.CONFIG }}
7281
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
7382
CI: github_actions
@@ -86,6 +95,8 @@ jobs:
8695
else
8796
export IS_PR_BUILD="False"
8897
fi
98+
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
99+
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
89100
./.scripts/run_osx_build.sh
90101
91102
- name: Build on windows
@@ -98,10 +109,8 @@ jobs:
98109
set "sha=%GITHUB_SHA%"
99110
call ".scripts\run_win_build.bat"
100111
env:
101-
# default value; make it explicit, as it needs to match with artefact
102-
# generation below. Not configurable for now, can be revisited later
103-
CONDA_BLD_PATH: C:\bld
104-
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
112+
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
113+
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
105114
PYTHONUNBUFFERED: 1
106115
CONFIG: ${{ matrix.CONFIG }}
107116
CI: github_actions

.scripts/build_steps.sh

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recipe/meta.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
{% set version = "36.0.0" %}
1+
{% set version = "36.0.1" %}
22

33
package:
44
name: python-kubernetes
55
version: {{ version }}
66

77
source:
88
url: https://pypi.org/packages/source/k/kubernetes/kubernetes-{{ version }}.tar.gz
9-
sha256: 027b606bb8032e6c6464a53236bdd9bd9a94c237e1063bc45a303c25b304ced9
9+
sha256: 3eadd6ae1be3b742ae63bd382b139c9fd5171afb6e00771dcefaae2d49001992
1010

1111
build:
1212
number: 0
@@ -19,12 +19,12 @@ requirements:
1919
- setuptools
2020
- pip
2121
run:
22-
- aiohttp <4.0.0,>=3.9.0
22+
- aiohttp <4.0.0,>=3.13.5
2323
- python >={{ python_min }}
2424
- certifi >=14.05.14
2525
- six >=1.9.0
2626
- python-dateutil >=2.5.3
27-
- pyyaml >=5.4.1
27+
- pyyaml >=6.0.3
2828
- google-auth >=1.0.1
2929
- websocket-client >=0.32.0,!=0.40.0,!=0.41.*,!=0.42.*
3030
- requests

0 commit comments

Comments
 (0)