diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 9964e05..04f0b1b 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,5 +1,3 @@ -cdt_name: -- conda channel_sources: - conda-forge channel_targets: @@ -7,4 +5,4 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 python_min: -- '3.9' +- '3.10' diff --git a/README.md b/README.md index 4cafecd..3bbd00a 100644 --- a/README.md +++ b/README.md @@ -138,12 +138,12 @@ it is possible to build and upload installable packages to the [conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. -To manage the continuous integration and simplify feedstock maintenance +To manage the continuous integration and simplify feedstock maintenance, [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. -For more information please check the [conda-forge documentation](https://conda-forge.org/docs/). +For more information, please check the [conda-forge documentation](https://conda-forge.org/docs/). Terminology =========== @@ -170,7 +170,7 @@ merged, the recipe will be re-built and uploaded automatically to the everybody to install and use from the `conda-forge` channel. Note that all branches in the conda-forge/python-can-feedstock are immediately built and any created packages are uploaded, so PRs should be based -on branches in forks and branches in the main repository should only be used to +on branches in forks, and branches in the main repository should only be used to build distinct package versions. In order to produce a uniquely identifiable distribution: diff --git a/recipe/1980-wrapt_version.patch b/recipe/1980-wrapt_version.patch new file mode 100644 index 0000000..a5bd231 --- /dev/null +++ b/recipe/1980-wrapt_version.patch @@ -0,0 +1,22 @@ +From 3911395a85f0b259155865d3f39cb002053741a1 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Tue, 12 Aug 2025 08:35:30 -0400 +Subject: [PATCH] Allow wrapt 2.x + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index e36b50ad0..e125ea84f 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -8,7 +8,7 @@ dynamic = ["readme", "version"] + description = "Controller Area Network interface module for Python" + authors = [{ name = "python-can contributors" }] + dependencies = [ +- "wrapt~=1.10", ++ "wrapt >= 1.10, < 3", + "packaging >= 23.1", + "typing_extensions>=3.10.0.0", + ] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4d8a08e..5d4e3b0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,10 +7,12 @@ package: source: url: https://pypi.org/packages/source/p/python_can/python_can-{{ version }}.tar.gz sha256: 290fea135d04b8504ebff33889cc6d301e2181a54099116609f940825ffe5005 + patches: + - 1980-wrapt_version.patch build: noarch: python - number: 0 + number: 1 script: - sed -i 's/dynamic = .*/version = "{{ version }}"/' pyproject.toml - echo "__version__ = '{{ version }}'" >> can/__init__.py @@ -28,7 +30,7 @@ requirements: - pyserial - typing - typing_extensions >=3.10.0.0 - - wrapt >=1.10.0 + - wrapt >=1.10.0,<3 # - pywin32 # [win] # - windows-curses # [win]