Skip to content

Commit

Permalink
Merge pull request #22 from anaconda/jb_pydantic
Browse files Browse the repository at this point in the history
[AENT-8333] - Updating Pydantic Dependencies
  • Loading branch information
joshburt authored Sep 20, 2024
2 parents 77f3b54 + 2c4e94c commit 1b88264
Show file tree
Hide file tree
Showing 62 changed files with 742 additions and 13,543 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Install dependencies
# https://github.com/conda-incubator/setup-miniconda
uses: conda-incubator/setup-miniconda@3b0f2504dd76ef23b6d31f291f4913fb60ab5ff3 # v2
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3
with:
channels: defaults,ae5-admin
auto-activate-base: true
Expand All @@ -56,3 +56,8 @@ jobs:
run: |
mkdir build
conda build conda-recipe --output-folder build
- name: Publish Conda Package (Dev Build)
env:
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
run: |
anaconda --verbose --token $ANACONDA_TOKEN upload --user ae5-admin --label dev build/noarch/mlflow-adsp-*.tar.bz2 --force
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Install dependencies
# https://github.com/conda-incubator/setup-miniconda
uses: conda-incubator/setup-miniconda@3b0f2504dd76ef23b6d31f291f4913fb60ab5ff3 # v2
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3
with:
channels: defaults,ae5-admin
auto-activate-base: true
Expand Down
12 changes: 4 additions & 8 deletions anaconda-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,13 @@ env_specs:
default:
description: Default Environment
packages:
- defaults:python>=3.11
- defaults:mlflow=2.6.0
- ae5-admin:ae5-tools<1.0
- defaults:python>=3.12,<3.13
- defaults:mlflow>=2.12
- ae5-admin:ae5-tools>=0.7,<1.0
- defaults:psutil
- defaults:pydantic<2.0
- defaults:pydantic>=2.0,<3
- defaults:click
- defaults:requests
- defaults:pip
- pip:
- mlserver
- mlserver-mlflow

# Project Maintenance and Development
- defaults:anaconda-project
Expand Down
4 changes: 2 additions & 2 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ requirements:
- python>=3.8
- mlflow>=2.3.0
- tqdm
- ae5-tools>=0.6.1
- ae5-tools>=0.7,<1.0
- psutil
- pydantic<2.0
- pydantic>=2.0,<3
- click
- requests

Expand Down
2 changes: 1 addition & 1 deletion container/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 registry.access.redhat.com/ubi8/ubi:latest
FROM --platform=linux/amd64 registry.access.redhat.com/ubi8/ubi:latest@sha256:d5e2d1ddf34b573673581940f1341c7b3301ff8efde28f17100b31a3df7d94b6

# Perform Environment Maintenance
RUN yum update && yum install -y gcc clang cmake
Expand Down
2 changes: 1 addition & 1 deletion container/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- ae5-admin:mlflow-adsp>=0.5,<1.0
- defaults:tqdm
- defaults:psutil
- defaults:pydantic<2.0
- defaults:pydantic>2.0
- defaults:click
- defaults:requests
- defaults:pip
Expand Down
Binary file modified docs/build/doctrees/cli.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/build/doctrees/index.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/installation_guide.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/mlflow_adsp/mlflow_adsp.common.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/mlflow_adsp/mlflow_adsp.contracts.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/mlflow_adsp/mlflow_adsp.contracts.dto.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified docs/build/doctrees/mlflow_adsp/mlflow_adsp.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/mlflow_adsp/mlflow_adsp.services.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/model_serving.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/workflow_setup_guide.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/workflow_usage_and_configuration.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 0bfe48770a0f8121c21df0d1c8ce56f1
config: f00da845d8953f014b3cc26145f89064
tags: 645f666f9bcd5a90fca523b33c5a78b7
2 changes: 1 addition & 1 deletion docs/build/html/_sources/installation_guide.md.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ See `Variables` below for specific details on each.
### 2. Install Plugin

```shell
conda install -c https://conda.anaconda.org/ae5-admin mlflow-adsp
conda install -c https://conda.anaconda.org/ae5-admin mlflow-adsp
```

## Variables
Expand Down
17 changes: 3 additions & 14 deletions docs/build/html/_static/_sphinx_javascript_frameworks_compat.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
/*
* _sphinx_javascript_frameworks_compat.js
* ~~~~~~~~~~
*
* Compatability shim for jQuery and underscores.js.
*
* WILL BE REMOVED IN Sphinx 6.0
* xref RemovedInSphinx60Warning
/* Compatability shim for jQuery and underscores.js.
*
* Copyright Sphinx contributors
* Released under the two clause BSD licence
*/

/**
* select a different prefix for underscore
*/
$u = _.noConflict();


/**
* small helper function to urldecode strings
*
Expand Down
55 changes: 25 additions & 30 deletions docs/build/html/_static/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -237,6 +237,10 @@ a.headerlink {
visibility: hidden;
}

a:visited {
color: #551A8B;
}

h1:hover > a.headerlink,
h2:hover > a.headerlink,
h3:hover > a.headerlink,
Expand Down Expand Up @@ -324,17 +328,17 @@ aside.sidebar {
p.sidebar-title {
font-weight: bold;
}

nav.contents,
aside.topic,

div.admonition, div.topic, blockquote {
clear: left;
}

/* -- topics ---------------------------------------------------------------- */

nav.contents,
aside.topic,

div.topic {
border: 1px solid #ccc;
padding: 7px;
Expand Down Expand Up @@ -375,7 +379,6 @@ div.sidebar > :last-child,
aside.sidebar > :last-child,
nav.contents > :last-child,
aside.topic > :last-child,

div.topic > :last-child,
div.admonition > :last-child {
margin-bottom: 0;
Expand All @@ -385,7 +388,6 @@ div.sidebar::after,
aside.sidebar::after,
nav.contents::after,
aside.topic::after,

div.topic::after,
div.admonition::after,
blockquote::after {
Expand Down Expand Up @@ -611,25 +613,6 @@ ul.simple p {
margin-bottom: 0;
}

/* Docutils 0.17 and older (footnotes & citations) */
dl.footnote > dt,
dl.citation > dt {
float: left;
margin-right: 0.5em;
}

dl.footnote > dd,
dl.citation > dd {
margin-bottom: 0em;
}

dl.footnote > dd:after,
dl.citation > dd:after {
content: "";
clear: both;
}

/* Docutils 0.18+ (footnotes & citations) */
aside.footnote > span,
div.citation > span {
float: left;
Expand All @@ -654,8 +637,6 @@ div.citation > p:last-of-type:after {
clear: both;
}

/* Footnotes & citations ends */

dl.field-list {
display: grid;
grid-template-columns: fit-content(30%) auto;
Expand All @@ -668,10 +649,6 @@ dl.field-list > dt {
padding-right: 5px;
}

dl.field-list > dt:after {
content: ":";
}

dl.field-list > dd {
padding-left: 0.5em;
margin-top: 0em;
Expand All @@ -697,6 +674,16 @@ dd {
margin-left: 30px;
}

.sig dd {
margin-top: 0px;
margin-bottom: 0px;
}

.sig dl {
margin-top: 0px;
margin-bottom: 0px;
}

dl > dd:last-child,
dl > dd:last-child > :last-child {
margin-bottom: 0;
Expand Down Expand Up @@ -765,6 +752,14 @@ abbr, acronym {
cursor: help;
}

.translated {
background-color: rgba(207, 255, 207, 0.2)
}

.untranslated {
background-color: rgba(255, 207, 207, 0.2)
}

/* -- code displays --------------------------------------------------------- */

pre {
Expand Down
Loading

0 comments on commit 1b88264

Please sign in to comment.