Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,13 @@ RUN git clone --branch "${BUFR_QUERY_REF}" --depth 1 \
make install && \
rm -rf /tmp/bufr-query

# Install Python dependencies declared in pyproject.toml, plus pybind11 which
# is required to build bufr-query bindings, and cloud storage CLIs for S3/GCS.
# Install Python dependencies declared in pyproject.toml, plus setuptools for
# editable installs without build isolation, pybind11 for bufr-query bindings,
# and cloud storage CLIs for S3/GCS.
COPY pyproject.toml /tmp/geode/pyproject.toml
COPY src /tmp/geode/src
RUN python -m pip install --no-cache-dir --upgrade pip && \
python -m pip install --no-cache-dir "/tmp/geode[dev]" pybind11==3.0.1 awscli==1.46.1 gsutil==5.37 && \
python -m pip install --no-cache-dir "setuptools>=61,!=79.0.1" "/tmp/geode[dev]" pybind11==3.0.1 awscli==1.46.1 gsutil==5.37 && \
rm -rf /tmp/geode

# Set working directory
Expand Down
7 changes: 4 additions & 3 deletions .devcontainer/Dockerfile_CI
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@ RUN git clone --branch "${BUFR_QUERY_REF}" --depth 1 \
make install && \
rm -rf /tmp/bufr-query

# Install Python dependencies declared in pyproject.toml, plus pybind11 which
# is required to build bufr-query bindings, and cloud storage CLIs for S3/GCS.
# Install Python dependencies declared in pyproject.toml, plus setuptools for
# editable installs without build isolation, pybind11 for bufr-query bindings,
# and cloud storage CLIs for S3/GCS.
COPY pyproject.toml /tmp/geode/pyproject.toml
COPY src /tmp/geode/src
RUN python -m pip install --no-cache-dir --upgrade pip && \
python -m pip install --no-cache-dir "/tmp/geode[dev]" pybind11==3.0.1 awscli==1.46.1 gsutil==5.37 && \
python -m pip install --no-cache-dir "setuptools>=61,!=79.0.1" "/tmp/geode[dev]" pybind11==3.0.1 awscli==1.46.1 gsutil==5.37 && \
rm -rf /tmp/geode

# Set default command
Expand Down
1 change: 0 additions & 1 deletion dev/ush/install_and_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ main() {

(
cd "${repo_root}"
python -m pip install --user "setuptools>=61,!=79.0.1"
python -m pip install --user --no-build-isolation -e ".[dev]"
python -m pytest test/ -v -s -W error::pytest.PytestUnhandledThreadExceptionWarning
)
Expand Down
Loading