OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-25 07:07:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Trim white space at EOL

Browse Source
This commit is contained in:
Håkon Hægland committed 2025-09-04 11:24:05 +02:00
1 parent be8039a0a8
commit 4bc25047c2
7 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

python/docker/run-docker-build.sh
+1 -1
View File
@@ -291,7 +291,7 @@ main() {
DOCKER_CMD+=(--build-arg "version_simulators=$VERSION_SIMULATORS")
DOCKER_CMD+=(--build-arg "target_common=$TARGET_COMMON")
DOCKER_CMD+=(--build-arg "target_simulators=$TARGET_SIMULATORS")
# Add version_tag if specified
if [ -n "$VERSION_TAG" ]; then
DOCKER_CMD+=(--build-arg "version_tag=$VERSION_TAG")
python/docker/scripts/sync_versions.sh
+1 -1
View File
@@ -86,7 +86,7 @@ if [ -f "$DOCKERFILE" ]; then
# Update the python_versions ARG line
sed -i "s/^ARG python_versions=.*$/ARG python_versions=\"$DEFAULT_VERSIONS\"/" "$DOCKERFILE"
log_success "Updated Dockerfile ARG python_versions"
# Update the FROM line with the correct manylinux tag
sed -i "s|^FROM quay.io/pypa/manylinux_[0-9_]*x86_64 AS stage1$|FROM quay.io/pypa/${MANYLINUX_TAG}_x86_64 AS stage1|" "$DOCKERFILE"
log_success "Updated Dockerfile FROM line to use ${MANYLINUX_TAG}_x86_64"
python/docker/test_wheels/dockerfiles/debian:11/Dockerfile
+1 -1
View File
@@ -10,7 +10,7 @@ ENV PATH="${PYENV_ROOT}/bin:${PYENV_ROOT}/shims:${PATH}"
WORKDIR /test
# Make all scripts in the common folder available
# Make all scripts in the common folder available
COPY test_wheels/dockerfiles/common/ /test/common/
# Copy python_versions.json to the expected location
COPY python_versions.json /test/python_versions.json
python/docker/test_wheels/dockerfiles/ubuntu:22.04/Dockerfile
+1 -1
View File
@@ -10,7 +10,7 @@ ENV PATH="${PYENV_ROOT}/bin:${PYENV_ROOT}/shims:${PATH}"
WORKDIR /test
# Make all scripts in the common folder available
# Make all scripts in the common folder available
COPY test_wheels/dockerfiles/common/ /test/common/
# Copy python_versions.json to the expected location
COPY python_versions.json /test/python_versions.json
python/docker/test_wheels/dockerfiles/ubuntu:24.04/Dockerfile
+1 -1
View File
@@ -10,7 +10,7 @@ ENV PATH="${PYENV_ROOT}/bin:${PYENV_ROOT}/shims:${PATH}"
WORKDIR /test
# Make all scripts in the common folder available
# Make all scripts in the common folder available
COPY test_wheels/dockerfiles/common/ /test/common/
# Copy python_versions.json to the expected location
COPY python_versions.json /test/python_versions.json
python/docker/test_wheels/scripts/README.md
+1 -1
View File
@@ -55,7 +55,7 @@ $ opm-wheels build-docker-image --docker-os="debian:11"
- `--docker-os`, `-d` - OS for Docker image (default: ubuntu:22.04)
- Supported: `3.8,3.9,3.10,3.11,3.12,3.13`
- `--opm-simulators-repo`, `-osr` - OPM simulators repository URL
- `--opm-common-repo`, `-ocr` - OPM common repository URL
- `--opm-common-repo`, `-ocr` - OPM common repository URL
- `--opm-simulators-branch`, `-osb` - Simulators branch (default: master)
- `--opm-common-branch`, `-ocb` - Common branch (default: master)
- `--docker-progress`, `-dp` - Show Docker build progress output
python/docker/test_wheels/scripts/src/opm_wheels/config_reader.py
+1 -1
View File
@@ -19,7 +19,7 @@ def load_python_config() -> Dict:
config_path = get_config_path()
if not config_path.exists():
raise FileNotFoundError(f"Python config file not found at {config_path}")
with open(config_path, 'r') as f:
return json.load(f)