From 065b5d9f6dd2a803d9626ad5a4707f155127a092 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 14:58:18 +0000 Subject: [PATCH 1/6] Bump mamba-org/setup-micromamba from 1.1.0 to 1.4.1 Bumps [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba) from 1.1.0 to 1.4.1. - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/f0ef657642d0da8033efd9cdc514001dbb8e40e7...5d5dbebd87f7b9358c403c7a66651fa92b310105) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02d73d2..3ac01b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: - name: Fetch full git history run: git fetch --prune --unshallow - name: Set up Micromamba env - uses: mamba-org/setup-micromamba@f0ef657642d0da8033efd9cdc514001dbb8e40e7 + uses: mamba-org/setup-micromamba@5d5dbebd87f7b9358c403c7a66651fa92b310105 with: environment-file: environment.yml create-args: >- From e1a773f293ef4e86b5a9c20c17b61bf256dba337 Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Mon, 15 May 2023 17:03:39 +0200 Subject: [PATCH 2/6] Update environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 853ee31..04d9e58 100644 --- a/environment.yml +++ b/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python>=3.4 + - python>=3.6 - pyahocorasick - pip - pre-commit From 06d740ad4610ea30338e0342de9b74b0ef6e53c9 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Wed, 17 May 2023 16:56:53 +0200 Subject: [PATCH 3/6] =?UTF-8?q?=E2=86=97=EF=B8=8F=20python>=3D3.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 3 ++- environment.yml | 2 +- pyproject.toml | 7 ++----- setup.cfg | 7 ++----- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ac01b5..13c08b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,9 @@ jobs: fail-fast: false matrix: include: - - { python-version: "3.6", os: windows-2019 } - { python-version: "3.8", os: windows-latest } + - { python-version: "3.10", os: windows-latest } + - { python-version: "3.11", os: windows-latest } - { python-version: "3.10", os: ubuntu-latest } - { python-version: "3.11", os: ubuntu-latest } steps: diff --git a/environment.yml b/environment.yml index 04d9e58..7fd00e4 100644 --- a/environment.yml +++ b/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python>=3.6 + - python>=3.8 - pyahocorasick - pip - pre-commit diff --git a/pyproject.toml b/pyproject.toml index bc33be7..0a9477e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,13 +10,10 @@ maintainers = [{name = "Jonas Haag", email = "jonas.haag@quantco.com"}] classifiers = [ "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10" + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11" ] readme = "README.md" diff --git a/setup.cfg b/setup.cfg index d88ecae..09dad86 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,18 +8,15 @@ author = QuantCo, Inc. author_email = noreply@quantco.com classifiers = Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 - Programming Language :: Python :: 3.5 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 [options] include_package_data = true install_requires = pyahocorasick -python_requires = >=3.4 +python_requires = >=3.8 package_dir= =src packages = find: From 75c0b9d19ddb3ac2661f886220b91141af77f1fb Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 19 May 2023 09:52:47 +0200 Subject: [PATCH 4/6] What happens now? --- .github/workflows/ci.yml | 1 + environment.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13c08b2..5465305 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ jobs: fail-fast: false matrix: include: + - { python-version: "3.6", os: windows-latest } - { python-version: "3.8", os: windows-latest } - { python-version: "3.10", os: windows-latest } - { python-version: "3.11", os: windows-latest } diff --git a/environment.yml b/environment.yml index 7fd00e4..04d9e58 100644 --- a/environment.yml +++ b/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python>=3.8 + - python>=3.6 - pyahocorasick - pip - pre-commit From ca9dea102d5c1780716675c865f9f032de849780 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 19 May 2023 09:55:22 +0200 Subject: [PATCH 5/6] 2019? --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5465305..6f7358f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: include: - - { python-version: "3.6", os: windows-latest } + - { python-version: "3.6", os: windows-2019 } - { python-version: "3.8", os: windows-latest } - { python-version: "3.10", os: windows-latest } - { python-version: "3.11", os: windows-latest } From 86b6a8b74615c3fcfa1b4f1cafc0298f9fcb106b Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 19 May 2023 10:00:35 +0200 Subject: [PATCH 6/6] all combinations --- .github/workflows/ci.yml | 9 ++------- README.md | 3 +++ pyproject.toml | 2 ++ setup.cfg | 2 ++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f7358f..224173c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,13 +17,8 @@ jobs: strategy: fail-fast: false matrix: - include: - - { python-version: "3.6", os: windows-2019 } - - { python-version: "3.8", os: windows-latest } - - { python-version: "3.10", os: windows-latest } - - { python-version: "3.11", os: windows-latest } - - { python-version: "3.10", os: ubuntu-latest } - - { python-version: "3.11", os: ubuntu-latest } + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] + os: ['ubuntu-latest', 'windows-latest', 'macos-latest'] steps: - name: Checkout branch uses: actions/checkout@v3 diff --git a/README.md b/README.md index 0fd0b2e..0d1f899 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,9 @@ [![CI](https://github.com/Quantco/multiregex/actions/workflows/ci.yml/badge.svg)](https://github.com/Quantco/multiregex/actions/workflows/ci.yml) [![Documentation](https://img.shields.io/badge/docs-latest-success?style=plastic)](https://docs.dev.quantco.cloud/qc-github-artifacts/Quantco/multiregex/latest/index.html) +[![conda-forge](https://img.shields.io/conda/vn/conda-forge/multiregex?logoColor=white&logo=conda-forge)](https://anaconda.org/conda-forge/multiregex) +[![pypi-version](https://img.shields.io/pypi/v/multiregex.svg?logo=pypi&logoColor=white)](https://pypi.org/project/multiregex) +[![python-version](https://img.shields.io/pypi/pyversions/multiregex?logoColor=white&logo=python)](https://pypi.org/project/multiregex) Quickly match many regexes against a string. Provides 2-10x speedups over naïve regex matching. diff --git a/pyproject.toml b/pyproject.toml index 0a9477e..ca02885 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,8 @@ maintainers = [{name = "Jonas Haag", email = "jonas.haag@quantco.com"}] classifiers = [ "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/setup.cfg b/setup.cfg index 09dad86..fa82d01 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,6 +8,8 @@ author = QuantCo, Inc. author_email = noreply@quantco.com classifiers = Programming Language :: Python :: 3 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10