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

Add python-debug build feature #86

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ before_install:

install:
- |
MINICONDA_URL="http://repo.continuum.io/miniconda"
MINICONDA_URL="https://repo.continuum.io/miniconda"
MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh"
curl -O "${MINICONDA_URL}/${MINICONDA_FILE}"
curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}"
bash $MINICONDA_FILE -b

source /Users/travis/miniconda3/bin/activate root
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ conda search python --channel conda-forge
```



About conda-forge
=================

Expand Down
27 changes: 20 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

environment:

CONDA_INSTALL_LOCN: "C:\\conda"

# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
# /E:ON and /V:ON options are not enabled in the batch script intepreter
# See: http://stackoverflow.com/a/13751649/163740
Expand All @@ -14,16 +12,20 @@ environment:
# We set a default Python version for the miniconda that is to be installed. This can be
# overridden in the matrix definition where appropriate.
CONDA_PY: "27"
CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"

BINSTAR_TOKEN:
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC

matrix:
- TARGET_ARCH: x86
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35

- TARGET_ARCH: x64
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64


# We always use a 64-bit machine, but can build x86 distributions
Expand All @@ -44,14 +46,25 @@ install:

# Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.)
- cmd: rmdir C:\cygwin /s /q
- appveyor DownloadFile "https://raw.githubusercontent.com/pelson/Obvious-CI/master/bootstrap-obvious-ci-and-miniconda.py"
- cmd: python bootstrap-obvious-ci-and-miniconda.py %CONDA_INSTALL_LOCN% %TARGET_ARCH% %CONDA_PY:~0,1% --without-obvci
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- cmd: set PYTHONUNBUFFERED=1

# Add our channels.
- cmd: set "OLDPATH=%PATH%"
- cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%"
- cmd: conda config --set show_channel_urls true
- cmd: conda install -c pelson/channel/development --yes --quiet obvious-ci
- cmd: conda config --add channels conda-forge

# Add a hack to switch to `conda` version `4.1.12` before activating.
# This is required to handle a long path activation issue.
# Please see PR ( https://github.com/conda/conda/pull/3349 ).
- cmd: conda install --yes --quiet conda=4.1.12
- cmd: set "PATH=%OLDPATH%"
- cmd: set "OLDPATH="

# Actually activate `conda`.
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- cmd: set PYTHONUNBUFFERED=1

- cmd: conda install -n root --quiet --yes obvious-ci
- cmd: conda install -n root --quiet --yes conda-forge-build-setup
- cmd: run_conda_forge_build_setup

Expand Down
8 changes: 8 additions & 0 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ conda clean --lock
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup


# Install the yum requirements defined canonically in the
# "recipe/yum_requirements.txt" file. After updating that file,
# run "conda smithy rerender" and this line be updated
# automatically.
yum install -y valgrind-devel


# Embarking on 1 case(s).
set -x
export CONDA_PY=35
Expand Down
2 changes: 1 addition & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if "%ARCH%"=="64" (
)

cd PCbuild
call build.bat -e -p %PLATFORM%
call build.bat -e -p %PLATFORM% -d
if errorlevel 1 exit 1
cd ..

Expand Down
6 changes: 5 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ if [ `uname` == Darwin ]; then
--prefix=$PREFIX \
--with-ensurepip=no \
--with-tcltk-includes="-I$PREFIX/include" \
--with-tcltk-libs="-L$PREFIX/lib -ltcl8.5 -ltk8.5"
--with-tcltk-libs="-L$PREFIX/lib -ltcl8.5 -ltk8.5" \
--with-pydebug \
--without-pymalloc
fi
if [ `uname` == Linux ]; then
./configure --enable-shared --enable-ipv6 --with-ensurepip=no \
--prefix=$PREFIX \
--with-tcltk-includes="-I$PREFIX/include" \
--with-tcltk-libs="-L$PREFIX/lib -ltcl8.5 -ltk8.5" \
--with-pydebug \
--without-pymalloc
CPPFLAGS="-I$PREFIX/include" \
LDFLAGS="-L$PREFIX/lib -Wl,-rpath=$PREFIX/lib,--no-as-needed"
fi
Expand Down
2 changes: 2 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ build:
- vc14 # [win]
script_env:
- python_branding
features:
- python_debug

requirements:
build:
Expand Down