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

Repo cleanup. 8 things in top level. Rest in buildconfig/. Old stuff removed. #485

Merged
merged 25 commits into from Aug 6, 2018
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6fcb739
Deleted a lot of files in big repo clean up of 2018.
illume Aug 3, 2018
3a99fdf
Removing more files in the great 2018 repo shredding debacle.
illume Aug 3, 2018
b036766
Renamed lots of files breaking everything.
illume Aug 3, 2018
0306588
_readme is too subtle... shout it out. README!!!
illume Aug 3, 2018
61842c6
Get it building again on linux and mac.
illume Aug 3, 2018
9890954
appveyor should work again
illume Aug 3, 2018
31db7b1
A __init__.py file for the buildconfig folder.
illume Aug 3, 2018
b6f3e25
Travis should build again.
illume Aug 3, 2018
47bb135
Fix config.py path on appyveyor build.
illume Aug 3, 2018
2db50d3
Travis config.py path fixed.
illume Aug 3, 2018
60528cf
Use setup.py build -auto instead of config.py -auto.
illume Aug 3, 2018
1a8387b
Fix setup_win_common.py path to use buildconfig/
illume Aug 3, 2018
5f6470d
Fix config imports so work on py2 and py3.
illume Aug 3, 2018
9112514
Hopefully fix config_win.py.
illume Aug 3, 2018
180ed07
And fix more buildconfig paths in config_win.py.
illume Aug 3, 2018
9b31675
More py2 py3 import fixes.
illume Aug 3, 2018
22a45fd
Removing some mingw stuff from setup.py
illume Aug 3, 2018
dc4a344
py2 py3 fix for config_win.py import
illume Aug 3, 2018
49eb0a9
Make setup.py -config -auto run config.py
illume Aug 3, 2018
742711f
Make the manylinux build work again.
illume Aug 3, 2018
ea1705c
Get the test runner working. Do not use subprocess by default.
illume Aug 4, 2018
e03822e
Fix so python setup.py docs builds the documentation.
illume Aug 4, 2018
257908b
Use the buildconfig/MANIFEST.in with setup.py change.
illume Aug 6, 2018
4946d37
gitignore wheelhouse moved.
illume Aug 6, 2018
72584d7
tga does not have a magic number header, disabling bad test.
illume Aug 6, 2018
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+9 −7
Diff settings

Always

Just for now

Make the manylinux build work again.

  • Loading branch information...
illume committed Aug 3, 2018
commit 742711f7e9a38e22cd84859c6fb02300d6bb5a4e
@@ -1,10 +1,10 @@
REPO_ROOT = $(abspath ..)
REPO_ROOT = $(abspath ../..)

wheels-x64:
docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux1_base_x86_64 /io/manylinux-build/build-wheels.sh
docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux1_base_x86_64 /io/buildconfig/manylinux-build/build-wheels.sh

wheels-x86:
docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux1_base_i686 /io/manylinux-build/build-wheels.sh
docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux1_base_i686 /io/buildconfig/manylinux-build/build-wheels.sh

wheels: wheels-x64 wheels-x86

@@ -112,7 +112,7 @@ These aren't meant to be copypasta'd in. Perhaps these can be worked into a scri
sudo service docker start


cd /vagrant_pygame/manylinux-build
cd /vagrant_pygame/buildconfig/manylinux-build

# To make the base docker images and push them to docker hub do these commands.
# Note, these have already been built, so only needed if rebuilding dependencies.
@@ -142,7 +142,7 @@ These aren't meant to be copypasta'd in. Perhaps these can be worked into a scri
cd ..
mkdir -p dist
rm -f dist/*.whl
cp manylinux-build/wheelhouse/*.whl dist/
cp buildconfig/manylinux-build/wheelhouse/*.whl dist/

pip install twine

@@ -5,6 +5,8 @@ SUPPORTED_PYTHONS="cp27-cp27mu cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m"

export PORTMIDI_INC_PORTTIME=1

ls -la /io

# Compile wheels
for PYVER in $SUPPORTED_PYTHONS; do
rm -rf /io/Setup /io/build/
@@ -14,7 +16,7 @@ done

# Bundle external shared libraries into the wheels
for whl in wheelhouse/*.whl; do
auditwheel repair $whl -w /io/manylinux-build/wheelhouse/
auditwheel repair $whl -w /io/buildconfig/manylinux-build/wheelhouse/
done

# Dummy options for headless testing
@@ -24,6 +26,6 @@ export SDL_VIDEODRIVER=dummy
# Install packages and test
for PYVER in $SUPPORTED_PYTHONS; do
PYBIN="/opt/python/${PYVER}/bin"
${PYBIN}/pip install pygame --no-index -f /io/manylinux-build/wheelhouse
${PYBIN}/pip install pygame --no-index -f /io/buildconfig/manylinux-build/wheelhouse
(cd $HOME; ${PYBIN}/python -m pygame.tests --exclude opengl,music)
done
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.