From d7fcf6f1cde154a9b3af13cdcb284264ad5097d3 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Wed, 31 Jan 2024 13:08:40 -0500 Subject: [PATCH 01/16] Added qh3 as a package --- recipes/qh3/meta.yaml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 recipes/qh3/meta.yaml diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml new file mode 100644 index 0000000000000..df549e1ccf4fa --- /dev/null +++ b/recipes/qh3/meta.yaml @@ -0,0 +1,43 @@ +{% set name = "qh3" %} +{% set version = "0.14.0" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://github.com/jawah/qh3/archive/v{{ version }}.tar.gz + sha256: 871e89b6e6fa8042e2dfbfa9ea21e015f1e4b1c141956183227b02bf0c8b18be + +build: + skip: True # [py<37] + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + number: 0 + +requirements: + build: + - {{ compiler('c') }} + host: + - python + - pip + run: + - python + - cryptography >=41.0.0,<42.0.0 + +test: + imports: + - qh3 + commands: + - pip check + requires: + - pip + +about: + home: https://github.com/jawah/qh3 + summary: Maintained fork of aioquic; an implementation of QUIC and HTTP/3 + license: BSD-3-Clause + license_file: LICENSE + +extra: + recipe-maintainers: + - thewchan From 7f6f02c6e8ce2187651ca5e9ed39fc559aeadac6 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Wed, 31 Jan 2024 13:20:04 -0500 Subject: [PATCH 02/16] Add pylsqpack to host --- recipes/qh3/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index df549e1ccf4fa..f1ae7bf0643f4 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -20,6 +20,9 @@ requirements: host: - python - pip + + # Adding this here as otherwise it relies on vendor lsqpack + - pylsqpack run: - python - cryptography >=41.0.0,<42.0.0 From eefd7519fc0f7b82b80587751b5577120b43f9a9 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Wed, 31 Jan 2024 13:43:57 -0500 Subject: [PATCH 03/16] Put pylsqpack in build instead --- recipes/qh3/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index f1ae7bf0643f4..a4489eba7be82 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -17,12 +17,12 @@ build: requirements: build: - {{ compiler('c') }} - host: - - python - - pip # Adding this here as otherwise it relies on vendor lsqpack - pylsqpack + host: + - python + - pip run: - python - cryptography >=41.0.0,<42.0.0 From 4cf38385fe89859841de3c5e0eade703bc8c3ef8 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Mon, 5 Feb 2024 12:27:53 -0500 Subject: [PATCH 04/16] Move C compiler and pylsqpack to host --- recipes/qh3/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index a4489eba7be82..953183cde5a54 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -15,12 +15,11 @@ build: number: 0 requirements: - build: + host: - {{ compiler('c') }} # Adding this here as otherwise it relies on vendor lsqpack - pylsqpack - host: - python - pip run: From 046a42d3a71d163084479d8f2263cf2fec4ece95 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Wed, 7 Feb 2024 11:55:47 -0500 Subject: [PATCH 05/16] Move C compiler back to build --- recipes/qh3/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index 953183cde5a54..913f4e1ae6a76 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -15,11 +15,12 @@ build: number: 0 requirements: - host: + build: - {{ compiler('c') }} - + host: # Adding this here as otherwise it relies on vendor lsqpack - pylsqpack + - python - pip run: From 4a09d3e87634b9459586fc83953193d1a0ef7b45 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Fri, 10 May 2024 16:07:06 -0400 Subject: [PATCH 06/16] Revamp recipe with >1.0.0 version --- recipes/qh3/meta.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index 913f4e1ae6a76..d1a2597a97d34 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -1,13 +1,13 @@ {% set name = "qh3" %} -{% set version = "0.14.0" %} +{% set version = "1.0.7" %} package: name: {{ name|lower }} version: {{ version }} source: - url: https://github.com/jawah/qh3/archive/v{{ version }}.tar.gz - sha256: 871e89b6e6fa8042e2dfbfa9ea21e015f1e4b1c141956183227b02bf0c8b18be + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/qh3-{{ version }}.tar.gz + sha256: eb527d8317746209509b9c575527577cdc9b3cfb0f49294fc1cd109b0570362c build: skip: True # [py<37] @@ -16,16 +16,15 @@ build: requirements: build: + - {{ stdlib('c') }} - {{ compiler('c') }} + - {{ compiler('rust') }} host: - # Adding this here as otherwise it relies on vendor lsqpack - - pylsqpack - - python + - maturin >=1.2,<2.0 - pip run: - python - - cryptography >=41.0.0,<42.0.0 test: imports: @@ -37,7 +36,7 @@ test: about: home: https://github.com/jawah/qh3 - summary: Maintained fork of aioquic; an implementation of QUIC and HTTP/3 + summary: A lightway and fast implementation of QUIC and HTTP/3 license: BSD-3-Clause license_file: LICENSE From 931ecd9d0ca360546bbda8f760c2cc4711cddcdf Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Fri, 10 May 2024 16:46:23 -0400 Subject: [PATCH 07/16] Add cmake to build --- recipes/qh3/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index d1a2597a97d34..b55e1a1fd0ba6 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -19,6 +19,7 @@ requirements: - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('rust') }} + - cmake host: - python - maturin >=1.2,<2.0 From d821452c8445cb1e568f1e918ddddc592d493202 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Fri, 10 May 2024 17:00:14 -0400 Subject: [PATCH 08/16] libclang to build --- recipes/qh3/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index b55e1a1fd0ba6..4467ca61cf32a 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -20,6 +20,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('rust') }} - cmake + - libclang host: - python - maturin >=1.2,<2.0 From 2c2d15330ca9d27e72d425ae7d72d5c0ea428b97 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Fri, 10 May 2024 19:50:27 -0400 Subject: [PATCH 09/16] Add osx rust support and nasm to win build --- recipes/qh3/conda_build_config.yaml | 2 ++ recipes/qh3/meta.yaml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 recipes/qh3/conda_build_config.yaml diff --git a/recipes/qh3/conda_build_config.yaml b/recipes/qh3/conda_build_config.yaml new file mode 100644 index 0000000000000..debca20a89d0e --- /dev/null +++ b/recipes/qh3/conda_build_config.yaml @@ -0,0 +1,2 @@ +c_stdlib_version: # [osx and x86] + - '10.12' # [osx and x86] diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index 4467ca61cf32a..8fe1b6365b7f4 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -20,7 +20,8 @@ requirements: - {{ compiler('c') }} - {{ compiler('rust') }} - cmake - - libclang + - libclang # [linux] + - nasm # [win] host: - python - maturin >=1.2,<2.0 From e47773ff45915eda790df48dde23e4c789be17d4 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Sat, 11 May 2024 10:24:20 -0400 Subject: [PATCH 10/16] Bump cstdlib for osx and use clang instead of libclang --- recipes/qh3/conda_build_config.yaml | 2 +- recipes/qh3/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qh3/conda_build_config.yaml b/recipes/qh3/conda_build_config.yaml index debca20a89d0e..38cd60ed2d4bf 100644 --- a/recipes/qh3/conda_build_config.yaml +++ b/recipes/qh3/conda_build_config.yaml @@ -1,2 +1,2 @@ c_stdlib_version: # [osx and x86] - - '10.12' # [osx and x86] + - '10.13' # [osx and x86] diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index 8fe1b6365b7f4..822ec0951cc2a 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -20,7 +20,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('rust') }} - cmake - - libclang # [linux] + - clang # [linux] - nasm # [win] host: - python From 9c4a4f4e8cd1ba278d46311d2ce56bebe3d05b4a Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Sat, 11 May 2024 11:03:43 -0400 Subject: [PATCH 11/16] Use clangdev instead --- recipes/qh3/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index 822ec0951cc2a..f9ec1c1f6d44b 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -20,7 +20,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('rust') }} - cmake - - clang # [linux] + - clangdev - nasm # [win] host: - python From f65dea46b0bffac7f9acf7b6ea11ab8fc6d1b8f2 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Sat, 11 May 2024 11:17:19 -0400 Subject: [PATCH 12/16] Add openssl to host for osx, add c++ compiler for everyone --- recipes/qh3/meta.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index f9ec1c1f6d44b..f3d4e17f8960c 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -11,13 +11,16 @@ source: build: skip: True # [py<37] - script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + script: + - export OPENSSL_DIR=$PREFIX # [osx] + - {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 requirements: build: - {{ stdlib('c') }} - {{ compiler('c') }} + - {{ compiler('cxx') }} - {{ compiler('rust') }} - cmake - clangdev @@ -26,6 +29,7 @@ requirements: - python - maturin >=1.2,<2.0 - pip + - openssl # [osx] run: - python From a1c9de4cd911b3b6f7443d4d503ca5c4a738e6b0 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Sat, 11 May 2024 11:41:46 -0400 Subject: [PATCH 13/16] AWS_LC_SYS_CMAKE_BUILDER=1 --- recipes/qh3/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index f3d4e17f8960c..83def5100f16b 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -13,6 +13,7 @@ build: skip: True # [py<37] script: - export OPENSSL_DIR=$PREFIX # [osx] + - export AWS_LC_SYS_CMAKE_BUILDER=1 - {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 From 122072460547cae5076726a749dd75cbbf96ead1 Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Sat, 11 May 2024 16:15:41 -0400 Subject: [PATCH 14/16] make to build --- recipes/qh3/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index 83def5100f16b..f0898eb1f1bc7 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -22,9 +22,10 @@ requirements: - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('rust') }} - - cmake + - {{ compiler('rust') }}\ - clangdev + - cmake + - make - nasm # [win] host: - python From 8d4f10cd73261e9d1604c761d81d6c9e0cdc749c Mon Sep 17 00:00:00 2001 From: Matt Chan Date: Mon, 13 May 2024 09:25:45 -0400 Subject: [PATCH 15/16] Move clangdev to host --- recipes/qh3/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qh3/meta.yaml b/recipes/qh3/meta.yaml index f0898eb1f1bc7..685caaa8af1c5 100644 --- a/recipes/qh3/meta.yaml +++ b/recipes/qh3/meta.yaml @@ -22,8 +22,7 @@ requirements: - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('rust') }}\ - - clangdev + - {{ compiler('rust') }} - cmake - make - nasm # [win] @@ -32,6 +31,7 @@ requirements: - maturin >=1.2,<2.0 - pip - openssl # [osx] + - clangdev # [linux] run: - python From 938f06aa757e39fb55c120494aaa2b4a371a7952 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 1 Jul 2024 15:23:00 +0200 Subject: [PATCH 16/16] Bump macOS SDK --- recipes/qh3/conda_build_config.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/qh3/conda_build_config.yaml b/recipes/qh3/conda_build_config.yaml index 38cd60ed2d4bf..b5f411790ca29 100644 --- a/recipes/qh3/conda_build_config.yaml +++ b/recipes/qh3/conda_build_config.yaml @@ -1,2 +1,4 @@ c_stdlib_version: # [osx and x86] - - '10.13' # [osx and x86] + - '10.15' # [osx and x86] +MACOSX_SDK_VERSION: # [osx and x86] + - '10.15' # [osx and x86]