diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3a63e6d..65a0bab 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,10 +10,6 @@ jobs: strategy: maxParallel: 8 matrix: - linux_python2.7.____cpython: - CONFIG: linux_python2.7.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 linux_python3.6.____73_pypy: CONFIG: linux_python3.6.____73_pypy UPLOAD_PACKAGES: True diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7a064a3..83de38d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -10,9 +10,6 @@ jobs: strategy: maxParallel: 8 matrix: - osx_python2.7.____cpython: - CONFIG: osx_python2.7.____cpython - UPLOAD_PACKAGES: True osx_python3.6.____73_pypy: CONFIG: osx_python3.6.____73_pypy UPLOAD_PACKAGES: True @@ -54,7 +51,7 @@ jobs: source activate base echo "Configuring conda." - setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml + setup_conda_rc ./ "./recipe" ./.ci_support/${CONFIG}.yaml export CI=azure source run_conda_forge_build_setup conda update --yes --quiet --override-channels -c conda-forge -c defaults --all @@ -65,23 +62,23 @@ jobs: - script: | source activate base - mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml + mangle_compiler ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Mangle compiler - script: | source activate base - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml + make_build_number ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Generate build number clobber file - script: | source activate base - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + conda build "./recipe" -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml displayName: Build recipe - script: | source activate base export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + upload_package ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7ece486..c6bed0d 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -10,10 +10,6 @@ jobs: strategy: maxParallel: 4 matrix: - win_python2.7.____cpython: - CONFIG: win_python2.7.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True win_python3.6.____cpython: CONFIG: win_python3.6.____cpython CONDA_BLD_PATH: D:\\bld\\ @@ -76,11 +72,12 @@ jobs: - script: set PYTHONUNBUFFERED=1 # Configure the VM - - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml + - script: setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml # Configure the VM. - script: | set "CI=azure" + call activate base run_conda_forge_build_setup displayName: conda-forge build setup @@ -92,7 +89,8 @@ jobs: # Special cased version setting some more things! - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml displayName: Build recipe (vs2008) env: VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" @@ -100,7 +98,8 @@ jobs: condition: contains(variables['CONFIG'], 'vs2008') - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml displayName: Build recipe env: PYTHONUNBUFFERED: 1 @@ -108,7 +107,8 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + call activate base + upload_package .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.ci_support/linux_python2.7.____cpython.yaml b/.ci_support/linux_python2.7.____cpython.yaml deleted file mode 100644 index 7201bb6..0000000 --- a/.ci_support/linux_python2.7.____cpython.yaml +++ /dev/null @@ -1,12 +0,0 @@ -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 2.7.* *_cpython diff --git a/.ci_support/osx_python2.7.____cpython.yaml b/.ci_support/osx_python2.7.____cpython.yaml deleted file mode 100644 index e6084b8..0000000 --- a/.ci_support/osx_python2.7.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 2.7.* *_cpython diff --git a/.ci_support/win_python2.7.____cpython.yaml b/.ci_support/win_python2.7.____cpython.yaml deleted file mode 100644 index e2931a7..0000000 --- a/.ci_support/win_python2.7.____cpython.yaml +++ /dev/null @@ -1,10 +0,0 @@ -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 2.7.* *_cpython diff --git a/README.md b/README.md index d81826f..3a4242d 100644 --- a/README.md +++ b/README.md @@ -88,13 +88,6 @@ Current build status variant - - linux_python2.7.____cpython - - - variant - - linux_python3.6.____73_pypy @@ -123,13 +116,6 @@ Current build status variant - - osx_python2.7.____cpython - - - variant - - osx_python3.6.____73_pypy @@ -158,13 +144,6 @@ Current build status variant - - win_python2.7.____cpython - - - variant - - win_python3.6.____cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3ede31e..19ab83f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.16.0" %} +{% set version = "0.17.0" %} package: name: jedi @@ -6,11 +6,11 @@ package: source: url: https://pypi.io/packages/source/j/jedi/jedi-{{ version }}.tar.gz - sha256: d5c871cb9360b414f981e7072c52c33258d598305280fef91c6cae34739d65d5 + sha256: df40c97641cb943661d2db4c33c2e1ff75d491189423249e989bcea4464f3030 build: - number: 1 - script: "{{ PYTHON }} -m pip install . --no-deps -vv" + number: 0 + script: {{ PYTHON }} -m pip install . --no-deps -vv requirements: host: @@ -18,7 +18,7 @@ requirements: - pip run: - python - - parso >=0.5.2 + - parso >=0.7.0 test: imports: