Skip to content

Commit

Permalink
rerender with auto
Browse files Browse the repository at this point in the history
  • Loading branch information
ocefpaf committed Jan 8, 2017
1 parent e412e8a commit 04b92b7
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ env:
- CONDA_PY=27
- CONDA_PY=34
- CONDA_PY=35
- CONDA_PY=36
global:
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
- secure: "jQ2W+EVuv34VW6tQKHiIs8Zl1LRqXeEQGbq+kSfXtrDHBZA6PEg8GB0VOZsT50yM+nLqnaLcBCCGd58R54C1eyZ0OcrZZXNg+qbMM9z0TvfyVxQnkTzdDpfN8CHPtX9GXBo8TAYD3mLbAHq1FajJl/7o1YrInPTcu173IBIKEfBHHfoyTho3Ta9j9vkmS/ecXWbsy9MqxfaFnRkAFx8ha9DZ9UVYto3Xyzua/VwYRY+FoBiNEbh8g70U8+XUAKKs7kL3oJyQclHxT0WNBXqTVjq57DesFeIsGD7zQd3tVCxm3ow4wc2pgmBoWEuPRRAKisbGn1EL44NtEO+UPQyi2luj2T8GDNO5522V4FfYLd2+Ftgwzu2kUXgX+xLfMOAGYcHnB4KmPfkgPoK3bC8hI+Xqm4Rs++gfsGvk5miOXKl19Jpci3XOGmZYnJuqtbmjNFVD/b5V7uTnch0Tl2DO8en6xn3pHkP3IgV7CD0FfkaMHtLtJv+9hhR1ljvomtnrQrpqKJxvkDYcBNE/+xq1kLUwTHakhbXveZ78itoG0ofi2sBBOWjbOM8lOcUhUqas/+NZmDGDxiCMM0NohSU/C78Mjjao+fQuDyAt01jMaI9G90LqlKWN0WylhU2e+3bsFAKQ98LLmzgbWqEOmOIYi4RRfkNFVJ7dN+oxY30PPsU="
Expand All @@ -31,6 +32,8 @@ install:
bash $MINICONDA_FILE -b
source /Users/travis/miniconda3/bin/activate root
conda config --remove channels defaults
conda config --add channels defaults
conda config --add channels conda-forge
conda config --set show_channel_urls true
conda install --yes --quiet conda-forge-build-setup
Expand Down
31 changes: 18 additions & 13 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ environment:
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64

- TARGET_ARCH: x86
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda

- TARGET_ARCH: x64
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda-x64


# We always use a 64-bit machine, but can build x86 distributions
# with the TARGET_ARCH variable.
Expand All @@ -58,23 +66,20 @@ install:
# Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.)
- cmd: rmdir C:\cygwin /s /q

# Add our channels.
- cmd: set "OLDPATH=%PATH%"
# Add path, activate `conda` and update conda.
- cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%"
- cmd: conda config --set show_channel_urls true
- 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: conda update --yes --quiet conda
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat

- cmd: set PYTHONUNBUFFERED=1

# Add our channels.
- cmd: conda config --set show_channel_urls true
- cmd: conda config --remove channels defaults
- cmd: conda config --add channels defaults
- cmd: conda config --add channels conda-forge

# Configure the VM.
- 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
14 changes: 10 additions & 4 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ config=$(cat <<CONDARC
channels:
- conda-forge
- defaults # As we need conda-build
- defaults
conda-build:
root-dir: /feedstock_root/build_artefacts
Expand All @@ -25,8 +25,8 @@ CONDARC
)

cat << EOF | docker run -i \
-v ${RECIPE_ROOT}:/recipe_root \
-v ${FEEDSTOCK_ROOT}:/feedstock_root \
-v "${RECIPE_ROOT}":/recipe_root \
-v "${FEEDSTOCK_ROOT}":/feedstock_root \
-a stdin -a stdout -a stderr \
condaforge/linux-anvil \
bash || exit $?
Expand All @@ -41,7 +41,7 @@ conda clean --lock
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup
# Embarking on 3 case(s).
# Embarking on 4 case(s).
set -x
export CONDA_PY=27
set +x
Expand All @@ -59,4 +59,10 @@ source run_conda_forge_build_setup
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
set -x
export CONDA_PY=36
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
EOF
5 changes: 3 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "1.10.4" %}
{% set version = "1.10.5" %}

package:
name: django
Expand All @@ -7,7 +7,7 @@ package:
source:
fn: django-{{ version }}.tar.gz
url: https://github.com/django/django/archive/{{ version }}.tar.gz
sha256: bb7a3b4752fd96a29e72168049b04cfa1aeaf69e6c265023bb9baa2b568e8ddf
sha256: 65e2e8bcfb630cc26ac40599d3b0745efd66c5da138843e933e13fafeccb4742
patches:
# Hard-code gdal and geos' paths to the corresponding conda packages.
- libgdal.patch
Expand Down Expand Up @@ -221,6 +221,7 @@ test:
about:
home: http://www.djangoproject.com/
license: BSD 3-Clause
license_file: LICENSE
summary: 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.'

extra:
Expand Down

0 comments on commit 04b92b7

Please sign in to comment.