Merge pull request #66 from mayeut/drop-linux-python3.3
Give ownership of the wheel files to the current user instead of root on Linux
This commit is contained in:
+11
-25
@@ -5,42 +5,28 @@ matrix:
|
|||||||
# Linux Python 2
|
# Linux Python 2
|
||||||
- sudo: required
|
- sudo: required
|
||||||
language: python
|
language: python
|
||||||
services:
|
python: 2.7
|
||||||
- docker
|
services: docker
|
||||||
env:
|
env: PYTHON=python
|
||||||
- "PYTHON=python2"
|
|
||||||
|
|
||||||
# Linux Python 3
|
# Linux Python 3
|
||||||
- sudo: required
|
- sudo: required
|
||||||
language: python
|
language: python
|
||||||
services:
|
python: 3.4
|
||||||
- docker
|
services: docker
|
||||||
env:
|
env: PYTHON=python
|
||||||
- "PYTHON=python3"
|
|
||||||
before_install:
|
|
||||||
- sudo apt-get -qq update
|
|
||||||
- sudo apt-get install -y python3-pip
|
|
||||||
|
|
||||||
# macOS Python 2
|
# macOS Python 2
|
||||||
- os: osx
|
- os: osx
|
||||||
env:
|
env: PYTHON=python2
|
||||||
- "PYTHON=python2"
|
|
||||||
|
|
||||||
# macOS Python 3
|
# macOS Python 3
|
||||||
- os: osx
|
- os: osx
|
||||||
env:
|
env: PYTHON=python3
|
||||||
- "PYTHON=python3"
|
|
||||||
before_install:
|
before_install:
|
||||||
- brew update
|
- brew update
|
||||||
- brew outdated python || brew upgrade python
|
- brew outdated python || brew upgrade python
|
||||||
|
|
||||||
script:
|
install: $PYTHON -m pip install -r requirements-dev.txt
|
||||||
- |
|
|
||||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
script: $PYTHON ./bin/run_tests.py
|
||||||
$PYTHON -m pip install -r requirements-dev.txt
|
|
||||||
$PYTHON ./bin/run_tests.py
|
|
||||||
else
|
|
||||||
# linux test requires root to clean up the wheelhouse (docker runs as root)
|
|
||||||
sudo $PYTHON -m pip install -r requirements-dev.txt
|
|
||||||
sudo $PYTHON ./bin/run_tests.py
|
|
||||||
fi
|
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
|
|||||||
|
|
||||||
# we're all done here; move it to output
|
# we're all done here; move it to output
|
||||||
mv "$delocated_wheel" /output
|
mv "$delocated_wheel" /output
|
||||||
|
chown {uid}:{gid} "/output/$(basename "$delocated_wheel")"
|
||||||
done
|
done
|
||||||
'''.format(
|
'''.format(
|
||||||
package_name=package_name,
|
package_name=package_name,
|
||||||
@@ -108,6 +109,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
|
|||||||
),
|
),
|
||||||
build_verbosity_flag=' '.join(get_build_verbosity_extra_flags(build_verbosity)),
|
build_verbosity_flag=' '.join(get_build_verbosity_extra_flags(build_verbosity)),
|
||||||
environment_exports='\n'.join(environment.as_shell_commands()),
|
environment_exports='\n'.join(environment.as_shell_commands()),
|
||||||
|
uid=os.getuid(),
|
||||||
|
gid=os.getgid(),
|
||||||
)
|
)
|
||||||
|
|
||||||
docker_process = subprocess.Popen([
|
docker_process = subprocess.Popen([
|
||||||
|
|||||||
Reference in New Issue
Block a user