Skip to content

Commit 5ab1323

Browse files
committed
Add git config safe.directory workaround for versioneer
1 parent 14dba22 commit 5ab1323

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
/io/continuous_integration/build-manylinux-wheels.sh
8080
8181
- name: Check version number from inside wheel
82-
if: matrix.docker-image != 'manylinux1_i686'
82+
if: matrix.docker-image != 'manylinux2014_i686'
8383
run: |
8484
mv geotiepoints unused_src_to_prevent_local_import
8585
python -m pip install --find-links=./dist/ python-geotiepoints

continuous_integration/build-manylinux-wheels.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ set -e -x
33

44
# This is to be run by Docker inside a Docker image.
55
# You can test it locally on a Linux machine by installing docker and running from this repo's root:
6-
# $ docker run -e PLAT=manylinux1_x86_64 -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh
6+
# $ docker run -e PLAT=manylinux2014_x86_64 -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh
77

88
# * The -e just defines an environment variable PLAT=[docker name] inside the
99
# docker - auditwheel can't detect the docker name automatically.
1010
# * The -v gives a directory alias for passing files in and out of the docker
1111
# (/io is arbitrary). E.g the `setup.py` script would be accessed in the
1212
# docker via `/io/setup.py`.
13-
# * quay.io/pypa/manylinux1_x86_64 is the full docker image name. Docker
13+
# * quay.io/pypa/manylinux2014_x86_64 is the full docker image name. Docker
1414
# downloads it automatically.
1515
# * The last argument is a shell command that the Docker will execute.
1616
# Filenames must be from the Docker's perspective.
@@ -24,6 +24,10 @@ mkdir -p /io/temp-wheels
2424
# Clean out any old existing wheels.
2525
find /io/temp-wheels/ -type f -delete
2626

27+
# /io might be owned by someone else since we are in docker
28+
# this may stop versioneer from using git the way it needs
29+
git config --global --add safe.directory /io
30+
2731
# Iterate through available pythons.
2832
for PYBIN in /opt/python/cp3{7,8,9,10}*/bin; do
2933
"${PYBIN}/pip" install -q -U setuptools wheel build --cache-dir /io/pip-cache

0 commit comments

Comments
 (0)