From f542a9409680a4777d268b2c51437ced2b1a6865 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 16 Jan 2023 06:04:36 -0600 Subject: [PATCH] pyahocorasick v2.0.0 (#33) Closes https://github.com/conda-forge/pyahocorasick-feedstock/pull/32 --- .azure-pipelines/azure-pipelines-win.yml | 6 +- .../linux_64_python3.10.____cpython.yaml | 2 +- .../linux_64_python3.11.____cpython.yaml | 2 +- .../linux_64_python3.8.____73_pypy.yaml | 2 +- .../linux_64_python3.8.____cpython.yaml | 2 +- .../linux_64_python3.9.____73_pypy.yaml | 2 +- .../linux_64_python3.9.____cpython.yaml | 2 +- .../linux_aarch64_python3.10.____cpython.yaml | 2 +- .../linux_aarch64_python3.11.____cpython.yaml | 2 +- .../linux_aarch64_python3.8.____73_pypy.yaml | 2 +- .../linux_aarch64_python3.8.____cpython.yaml | 2 +- .../linux_aarch64_python3.9.____73_pypy.yaml | 2 +- .../linux_aarch64_python3.9.____cpython.yaml | 2 +- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 +- .scripts/run_osx_build.sh | 5 +- README.md | 58 +++++++++---------- recipe/meta.yaml | 6 +- 18 files changed, 54 insertions(+), 51 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 2a9a7b1..9594b7b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -29,6 +29,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -50,7 +51,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -87,6 +88,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 7ca53e0..b8beea0 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 681e29d..872f4fe 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.8.____73_pypy.yaml b/.ci_support/linux_64_python3.8.____73_pypy.yaml index e7cf6d5..5fd2f06 100644 --- a/.ci_support/linux_64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.8.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index fb4c940..4dfb4a0 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml index fa7a2e9..190dbe4 100644 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index c3b34b9..5cb88ef 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 74c2252..eda8012 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 9b51220..1c8ba2a 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml index b982349..65d10f7 100644 --- a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index c0c864d..45f9406 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml index 6f9af79..9965923 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 9d56d75..02c0d4b 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..84431a6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..b3abaeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index d5e3255..1c1de6d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ About pyahocorasick Home: https://github.com/WojciechMula/pyahocorasick -Package license: BSD 3-clause +Package license: BSD-3-Clause Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/pyahocorasick-feedstock/blob/main/LICENSE.txt) @@ -40,196 +40,196 @@ Current build status linux_64_python3.10.____cpython - variant + variant linux_64_python3.11.____cpython - variant + variant linux_64_python3.8.____73_pypy - variant + variant linux_64_python3.8.____cpython - variant + variant linux_64_python3.9.____73_pypy - variant + variant linux_64_python3.9.____cpython - variant + variant linux_aarch64_python3.10.____cpython - variant + variant linux_aarch64_python3.11.____cpython - variant + variant linux_aarch64_python3.8.____73_pypy - variant + variant linux_aarch64_python3.8.____cpython - variant + variant linux_aarch64_python3.9.____73_pypy - variant + variant linux_aarch64_python3.9.____cpython - variant + variant osx_64_python3.10.____cpython - variant + variant osx_64_python3.11.____cpython - variant + variant osx_64_python3.8.____73_pypy - variant + variant osx_64_python3.8.____cpython - variant + variant osx_64_python3.9.____73_pypy - variant + variant osx_64_python3.9.____cpython - variant + variant osx_arm64_python3.10.____cpython - variant + variant osx_arm64_python3.11.____cpython - variant + variant osx_arm64_python3.8.____cpython - variant + variant osx_arm64_python3.9.____cpython - variant + variant win_64_python3.10.____cpython - variant + variant win_64_python3.11.____cpython - variant + variant win_64_python3.8.____73_pypy - variant + variant win_64_python3.8.____cpython - variant + variant win_64_python3.9.____73_pypy - variant + variant win_64_python3.9.____cpython - variant + variant diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c62d1c5..aae399c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pyahocorasick" %} -{% set version = "1.4.4" %} +{% set version = "2.0.0" %} package: name: {{ name|lower }} @@ -7,10 +7,10 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 32545cad135660ceef556f1d987aee3206e00096735405d7a8de84eb0a15bb27 + sha256: 2985cac6d99c0e9165617fe154b4db0b50c4c2819791c2ad5f0aac0c6a6e58c5 build: - number: 3 + number: 0 script: python -m pip install . -vv requirements: