Skip to content

Commit 5891953

Browse files
committed
fix: use python, drop Conda 2.7 on Windows
1 parent ee6126f commit 5891953

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

.appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ environment:
1111
matrix:
1212
- PYTHON: 27
1313
- PYTHON: 36
14-
- CONDA: 27
1514
- CONDA: 36
1615
install:
1716
- cmd: '"%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PLATFORM%'

.github/workflows/wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
workflow_dispatch:
55
pull_request:
66
push:
7-
# branches:
8-
# - master
7+
branches:
8+
- master
99
release:
1010
types:
1111
- published

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: cpp
2-
dist: trusty
2+
dist: xenial
33
matrix:
44
include:
55
- os: linux

conda.recipe/meta.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,18 @@ build:
99
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
1010
{% if environ.get('GIT_DESCRIBE_NUMBER', '0') == '0' %}string: py{{ environ.get('PY_VER').replace('.', '') }}_0
1111
{% else %}string: py{{ environ.get('PY_VER').replace('.', '') }}_{{ environ.get('GIT_BUILD_STR', 'GIT_STUB') }}{% endif %}
12-
script_env:
13-
- CC
14-
- CXX
1512
script: |
1613
# This is a total hack because we are not using conda-forge pybind11. Remove after 2.6.0.
1714
# And never do this yourself unless you know what you are doing (it
1815
# explicitly is okay with pybind11, but may not be with arbitrary
1916
# libraries)
20-
{{ PYTHON }} -m pip install -vvv "git+https://github.com/pybind/pybind11.git@master"
21-
{{ PYTHON }} -m pip install . -vvv --no-deps
22-
{{ PYTHON }} -m pip uninstall -y pybind11
17+
python -m pip install -vvv "git+https://github.com/pybind/pybind11.git@master"
18+
python -m pip install . -vvv --no-deps
19+
python -m pip uninstall -y pybind11
2320
2421
requirements:
2522
build:
2623
- {{ compiler('cxx') }}
27-
- vs2017_{{ target_platform }} # [win]
2824
# This is a hack because we are not using conda-forge pybind11. Remove after 2.6.0
2925
- cmake
3026

0 commit comments

Comments
 (0)