Move grafyaml to Bookworm and python 3.11
This updates python testing to py311, adjusts the trove identifiers to match, and switches the docker file to using python3.11 on Bookworm. The motivation behind this is once OpenDev has updated all services to Bookworm and python3.11 the old bullseye images and images for older python versions can be cleaned up. Change-Id: I3dde845ba05bfec915e19c44959c187162254204
This commit is contained in:
parent
fda05305bd
commit
0a344201a2
12
.zuul.yaml
12
.zuul.yaml
@ -21,8 +21,8 @@
|
|||||||
allowed-projects: opendev/grafyaml
|
allowed-projects: opendev/grafyaml
|
||||||
timeout: 2700
|
timeout: 2700
|
||||||
requires:
|
requires:
|
||||||
- python-builder-3.10-bullseye-container-image
|
- python-builder-3.11-bookworm-container-image
|
||||||
- python-base-3.10-bullseye-container-image
|
- python-base-3.11-bookworm-container-image
|
||||||
provides:
|
provides:
|
||||||
- grafyaml-container-image
|
- grafyaml-container-image
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -40,8 +40,8 @@
|
|||||||
description: Build the grafyaml Docker image and upload to Docker Hub.
|
description: Build the grafyaml Docker image and upload to Docker Hub.
|
||||||
timeout: 3600
|
timeout: 3600
|
||||||
requires:
|
requires:
|
||||||
- python-builder-3.10-bullseye-container-image
|
- python-builder-3.11-bookworm-container-image
|
||||||
- python-base-3.10-bullseye-container-image
|
- python-base-3.11-bookworm-container-image
|
||||||
provides: grafyaml-container-image
|
provides: grafyaml-container-image
|
||||||
vars: *grafyaml_image_vars
|
vars: *grafyaml_image_vars
|
||||||
secrets:
|
secrets:
|
||||||
@ -65,7 +65,7 @@
|
|||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- tox-pep8
|
- tox-pep8
|
||||||
- tox-py310:
|
- tox-py311:
|
||||||
nodeset: ubuntu-jammy
|
nodeset: ubuntu-jammy
|
||||||
- opendev-buildset-registry
|
- opendev-buildset-registry
|
||||||
- grafyaml-build-image
|
- grafyaml-build-image
|
||||||
@ -73,7 +73,7 @@
|
|||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- tox-pep8
|
- tox-pep8
|
||||||
- tox-py310:
|
- tox-py311:
|
||||||
nodeset: ubuntu-jammy
|
nodeset: ubuntu-jammy
|
||||||
- grafyaml-upload-image
|
- grafyaml-upload-image
|
||||||
promote:
|
promote:
|
||||||
|
@ -14,12 +14,12 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
|
FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
|
||||||
|
|
||||||
COPY . /tmp/src
|
COPY . /tmp/src
|
||||||
RUN assemble
|
RUN assemble
|
||||||
|
|
||||||
FROM docker.io/opendevorg/python-base:3.10-bullseye
|
FROM docker.io/opendevorg/python-base:3.11-bookworm
|
||||||
|
|
||||||
COPY --from=builder /output/ /output
|
COPY --from=builder /output/ /output
|
||||||
RUN /output/install-from-bindep
|
RUN /output/install-from-bindep
|
||||||
|
@ -16,12 +16,7 @@ classifier =
|
|||||||
Operating System :: OS Independent
|
Operating System :: OS Independent
|
||||||
Programming Language :: Python
|
Programming Language :: Python
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.3
|
Programming Language :: Python :: 3.11
|
||||||
Programming Language :: Python :: 3.5
|
|
||||||
Programming Language :: Python :: 3.6
|
|
||||||
Programming Language :: Python :: 3.7
|
|
||||||
Programming Language :: Python :: 3.8
|
|
||||||
Programming Language :: Python :: 3.10
|
|
||||||
Topic :: Utilities
|
Topic :: Utilities
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user