Skip to content

Commit

Permalink
refactor(poetry) : use package local reference (#39)
Browse files Browse the repository at this point in the history
* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker

* refactor(docker): update docker
  • Loading branch information
guillaume-chervet authored Sep 16, 2024
1 parent 2e30a7e commit ff244bf
Show file tree
Hide file tree
Showing 75 changed files with 9,915 additions and 9,111 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker_with_model.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Set up Python 3.11
uses: actions/setup-python@v3
with:
python-version: "3.10.13"
python-version: "3.10.15"

- name: Setup Project
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
PNPM_VERSION: 8.5.1
PYTHON_VERSION: 3.10.13
PYTHON_VERSION: 3.10.15
NODE_VERSION: 18
AZURE_RESOURCE_GROUP_NAME: "azure-ml-gui"
AZURE_LOCATION: "northeurope"
Expand Down Expand Up @@ -69,13 +69,13 @@ jobs:
python -m pip install --upgrade pip
pip install --user poetry
- name: Run unit tests Packages Extraction
working-directory: packages/extraction
working-directory: packages/mlopspython-extraction
run: |
poetry install
poetry run coverage run -m unittest tests.extraction_tests
poetry run coverage report
- name: Run unit tests Packages Inference
working-directory: packages/inference
working-directory: packages/mlopspython-inference
run: |
poetry install
#poetry run coverage run -m unittest tests.inference_tests
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
# run: |
# poetry install --dev
# poetry run python -m unittest tests.evaluate_test

tags:
runs-on: ubuntu-latest
needs: [train_unit_tests, packages_unit_tests]
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
find ./ -name '*.json' -exec cp "{}" ./ \;
rm -r ./cats-dogs-others
- name: Upload Model Build Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Publish model
path: ./model
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:
npm run coverage
npm run build
- name: Upload WebApp Build Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Publish webapp
path: ./production/webapp/build
Expand Down Expand Up @@ -375,4 +375,4 @@ jobs:
./bin/generate-changelog.sh "$PROJECT_URL"
git add ./CHANGELOG.md
git commit -m "[skip ci] Generate changelog to version ${{ steps.tag.outputs.new_version }}"
git push -f --set-upstream origin "HEAD:main" --follow-tags
git push -f --set-upstream origin "HEAD:main" --follow-tags
15 changes: 4 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
install_mode=${1:-poetry}
download_model_version=${2:-none}
download_model_version=${1:-none}

if [ $download_model_version != 'none' ]; then
# Download the model from here :
Expand All @@ -11,12 +10,6 @@ if [ $download_model_version != 'none' ]; then
fi


if [ $install_mode = 'pip' ]; then
echo "Installing with pip (degraded mode)"
chmod +x pip-install.sh
./pip-install.sh
else
echo "Installing with poetry (default mode)"
chmod +x poetry-install.sh
./poetry-install.sh
fi
echo "Installing with poetry (default mode)"
chmod +x poetry-install.sh
./poetry-install.sh
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ git clone https://www.github.com/guillaume-chervet/MLOpsPython
cd MLOpsPython
chmod +x Makefile
# If you have poetry installed
./Makefile poetry 0.13.0
# Else degraded mode
./Makefile pip 0.13.0
./Makefile 0.13.3

cd production
docker-compose up
Expand Down
2 changes: 0 additions & 2 deletions bin/init_repository.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ gh secret set AZURE_SUBSCRIPTION_ID --body $subscriptionId --env $environmentNam
$jsonCredentials=($credentials | ConvertFrom-Json | ConvertTo-Json -Compress).Replace("`"", "\`"")
echo $jsonCredentials
gh secret set AZURE_CREDENTIALS --body "$jsonCredentials" --env "$environmentName"
gh secret set DOCKER_PASSWORD --body "dckr_pat_e2lZ9YgpMt8APE-Qxzn89u6mt28" --env "$environmentName"
gh secret set DOCKER_USERNAME --body "robertcarry" --env "$environmentName"
$git_token=$(gh auth token)
gh secret set GIT_TOKEN --body "$git_token" --env "$environmentName"

Expand Down
2 changes: 0 additions & 2 deletions bin/init_repository.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ gh secret set AZURE_SUBSCRIPTION_ID --body "$subscriptionId" --env "$environment
escapedJsonCredentials=$(echo "$credentials" | jq -c @json)
echo "Escaped JSON Credentials: $escapedJsonCredentials"
gh secret set AZURE_CREDENTIALS --body "$escapedJsonCredentials" --env "$environmentName"
gh secret set DOCKER_PASSWORD --body "dckr_pat_e2lZ9YgpMt8APE-Qxzn89u6mt28" --env "$environmentName"
gh secret set DOCKER_USERNAME --body "robertcarry" --env "$environmentName"
git_token=$(gh auth token)
gh secret set GIT_TOKEN --body "$git_token" --env "$environmentName"

Expand Down
122 changes: 0 additions & 122 deletions packages/extraction/poetry.lock

This file was deleted.

2 changes: 0 additions & 2 deletions packages/extraction/requirements.txt

This file was deleted.

24 changes: 0 additions & 24 deletions packages/extraction/setup.py

This file was deleted.

Loading

0 comments on commit ff244bf

Please sign in to comment.