Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5edaadb

Browse filesBrowse files
dopplershiftdopplershift
committed
MNT: Remove conda recipe
Just defer to the conda-forge recipe, since that's what's really being used. Also stop building conda packages on AppVeyor to save some build time.
1 parent 84a1c0d commit 5edaadb
Copy full SHA for 5edaadb

File tree

Expand file treeCollapse file tree

10 files changed

+11
-316
lines changed
Filter options
Expand file treeCollapse file tree

10 files changed

+11
-316
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+11-50Lines changed: 11 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,26 @@ branches:
1111
environment:
1212

1313
global:
14-
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
15-
# /E:ON and /V:ON options are not enabled in the batch script intepreter
16-
# See: http://stackoverflow.com/a/13751649/163740
17-
CMD_IN_ENV: cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd
18-
# Workaround for https://github.com/conda/conda-build/issues/636
1914
PYTHONIOENCODING: UTF-8
2015
PYTEST_ARGS: -rawR --numprocesses=auto --timeout=300 --durations=25
2116
--cov-report= --cov=lib -m "not network"
2217

2318
matrix:
24-
# for testing purpose: numpy 1.8 on py2.7, for the rest use 1.10/latest
2519
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
2620
# one for 64bit because we construct envs anyway. But using one for the
2721
# right python version is hopefully making it fast due to package caching.
28-
- TARGET_ARCH: "x64"
29-
CONDA_PY: "27"
30-
CONDA_NPY: "18"
31-
PYTHON_VERSION: "2.7"
32-
TEST_ALL: "no"
22+
- PYTHON_VERSION: "2.7"
3323
CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
34-
- TARGET_ARCH: "x64"
35-
CONDA_PY: "35"
36-
CONDA_NPY: "110"
37-
PYTHON_VERSION: "3.5"
24+
TEST_ALL: "no"
25+
- PYTHON_VERSION: "3.5"
3826
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
3927
TEST_ALL: "no"
40-
- TARGET_ARCH: "x64"
41-
CONDA_PY: "36"
42-
PYTHON_VERSION: "3.6"
43-
CONDA_NPY: "111"
28+
- PYTHON_VERSION: "3.6"
4429
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
4530
TEST_ALL: "no"
4631

4732
# We always use a 64-bit machine, but can build x86 distributions
48-
# with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
33+
# with the PYTHON_ARCH variable
4934
platform:
5035
- x64
5136

@@ -62,16 +47,11 @@ init:
6247
install:
6348
- set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
6449
- set PYTHONUNBUFFERED=1
65-
# for obvci_appveyor_python_build_env.cmd
66-
- conda update --all --yes
67-
- conda install anaconda-client=1.6.3 --yes
68-
- conda install -c conda-forge --yes obvious-ci
6950
# for msinttypes and newer stuff
70-
- conda config --prepend channels conda-forge
71-
- conda config --set show_channel_urls yes
7251
- conda config --set always_yes true
73-
# For building conda packages
74-
- conda install --yes conda-build jinja2 anaconda-client
52+
- conda update --all
53+
- conda config --set show_channel_urls yes
54+
- conda config --prepend channels conda-forge
7555
# this is now the downloaded conda...
7656
- conda info -a
7757

@@ -116,7 +96,7 @@ install:
11696

11797
test_script:
11898
# Now build the thing..
119-
- '%CMD_IN_ENV% pip install -ve .'
99+
- pip install -ve .
120100
# these should show no z, png, or freetype dll...
121101
- set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
122102
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
@@ -136,28 +116,9 @@ test_script:
136116
- python tests.py %PYTEST_ARGS%
137117

138118
after_test:
139-
# After the tests were a success, build packages (wheels and conda)
140-
141-
# Build the wheel with the static libs
119+
# After the tests were a success, build wheels with the static libs
142120
# Hide the output, the copied files really clutter the build log...
143-
- '%CMD_IN_ENV% python setup.py bdist_wheel > NUL:'
144-
145-
# And now the conda build after a cleanup...
146-
# cleanup build files so that they don't pollute the conda build but keep the wheel in dist...
147-
- git clean -xdfq -e dist/
148-
# cleanup the environment so that the test-environment does not leak into the conda build...
149-
- set MPLBASEDIRLIST=
150-
- set LIBRARY_LIB=
151-
- deactivate
152-
- path
153-
- where python
154-
- '%CMD_IN_ENV% conda config --get channels'
155-
- '%CMD_IN_ENV% conda build -q .\ci\conda_recipe'
156-
157-
# Move the conda package into the dist directory, to register it
158-
# as an "artifact" for Appveyor.
159-
- copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"
160-
- copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"
121+
- 'python setup.py bdist_wheel > NUL:'
161122
- dir dist\
162123
- echo finished...
163124

‎ci/conda_recipe/README.md

Copy file name to clipboardExpand all lines: ci/conda_recipe/README.md
-3Lines changed: 0 additions & 3 deletions
This file was deleted.

‎ci/conda_recipe/bld.bat

Copy file name to clipboardExpand all lines: ci/conda_recipe/bld.bat
-16Lines changed: 0 additions & 16 deletions
This file was deleted.

‎ci/conda_recipe/build.sh

Copy file name to clipboardExpand all lines: ci/conda_recipe/build.sh
-37Lines changed: 0 additions & 37 deletions
This file was deleted.

‎ci/conda_recipe/cfg_qt4agg.patch

Copy file name to clipboardExpand all lines: ci/conda_recipe/cfg_qt4agg.patch
-13Lines changed: 0 additions & 13 deletions
This file was deleted.

‎ci/conda_recipe/condaversion.patch

Copy file name to clipboardExpand all lines: ci/conda_recipe/condaversion.patch
-15Lines changed: 0 additions & 15 deletions
This file was deleted.

‎ci/conda_recipe/meta.yaml

Copy file name to clipboardExpand all lines: ci/conda_recipe/meta.yaml
-75Lines changed: 0 additions & 75 deletions
This file was deleted.

‎ci/conda_recipe/osx-tk.patch

Copy file name to clipboardExpand all lines: ci/conda_recipe/osx-tk.patch
-60Lines changed: 0 additions & 60 deletions
This file was deleted.

‎ci/conda_recipe/rctmp_pyside.patch

Copy file name to clipboardExpand all lines: ci/conda_recipe/rctmp_pyside.patch
-19Lines changed: 0 additions & 19 deletions
This file was deleted.

‎ci/conda_recipe/run_test.py

Copy file name to clipboardExpand all lines: ci/conda_recipe/run_test.py
-28Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.