Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #126: updates imports/dependencies with new monorepo modules structure #127

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3
FROM python:3.11-bullseye

WORKDIR /app

@@ -9,7 +9,7 @@ ENV PYTHONPATH=/app

COPY ./requirements.txt .

RUN pip3 install --no-cache-dir -r requirements.txt
RUN pip install --no-cache-dir -r requirements.txt

COPY . ./

2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ cryptography
pyyaml
pydantic
python-magic
nachet-datastore @git+https://github.com/ai-cfia/ailab-datastore.git@main
nachet-datastore @git+https://github.com/ai-cfia/ailab-datastore.git@v1.0.0-nachet-datastore
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just so I understand correctly, This point to a release on the Datastore related to Nachet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly. it points to the following release :
https://github.com/ai-cfia/ailab-datastore/releases/tag/v1.0.0-nachet-datastore
It only contains files dedicated to nachet. This PR is simply to fix currently workflow since the changes from datastore prevent current main branch from working. Once we validate that it works locally and we merge this, I will work on documenting the process.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the clarification! 🥇

6 changes: 3 additions & 3 deletions storage/datastore_storage_api.py
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@
import datastore
from datastore import db
from datastore import user as user_datastore
from datastore import nachet as nachet_datastore
import datastore.bin.deployment_mass_import
import nachet as nachet_datastore
import nachet.bin.deployment_mass_import

import datastore.bin.upload_picture_set
import datastore.db.queries.seed as seed_queries
import nachet.db.queries.seed as seed_queries

class DatastoreError(Exception):
pass