From 278bd26256d455874dd04e91620b750c8c06380e Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Fri, 4 Feb 2022 21:44:22 +1000 Subject: [PATCH 01/38] Add pyjion --- recipes/pyjion/meta.yaml | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 recipes/pyjion/meta.yaml diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml new file mode 100644 index 0000000000000..f9b0083e81d58 --- /dev/null +++ b/recipes/pyjion/meta.yaml @@ -0,0 +1,55 @@ +{% set name = "pyjion" %} +{% set version = "1.2.6" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + git_url: https://github.com/tonybaloney/Pyjion.git + git_tag: {{ version }} + + +build: + skip: True # [not linux or py < 310] + number: 0 + script: | + git submodule update --init --recursive + {{ PYTHON }} -m pip install . -vv + entry_points: + - pyjion = pyjion.__main__:main + +requirements: + build: + - cmake + - dotnet + - git + - ninja + host: + - python >=3.10 + - pip + - ssetuptools + - wheel + - scikit-build + run: + - python >=3.10 + - dotnet ~=6 + +test: + imports: + - pyjion + +about: + home: https://github.com/tonybaloney/Pyjion + license: MIT + license_family: MIT + license_file: LICENSE.md + summary: 'Pyjion - A JIT for Python based upon CoreCLR' + description: | + Pyjion, a JIT extension for CPython that compiles your Python code + into native CIL and executes it using the .NET CLR. + dev_url: https://github.com/tonybaloney/Pyjion + +extra: + recipe-maintainers: + - dhirschfeld From d99f9c80c37f5027f5988ad0809b173136184d20 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Fri, 4 Feb 2022 22:22:33 +1000 Subject: [PATCH 02/38] lint --- recipes/pyjion/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index f9b0083e81d58..df8c534a53ed3 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -26,13 +26,13 @@ requirements: - git - ninja host: - - python >=3.10 + - python - pip - ssetuptools - wheel - scikit-build run: - - python >=3.10 + - python - dotnet ~=6 test: From b467384d1f4c89e687e6c1adf889e39fb7f7e636 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sat, 5 Feb 2022 07:39:02 +1000 Subject: [PATCH 03/38] Build for all platforms --- recipes/pyjion/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index df8c534a53ed3..fbf1618f06d26 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -11,7 +11,7 @@ source: build: - skip: True # [not linux or py < 310] + skip: True # [py < 310] number: 0 script: | git submodule update --init --recursive From a7cc9653fec8663d798d75e37138dbb68810a3eb Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 13:49:03 +1000 Subject: [PATCH 04/38] Add `tonybaloney` as maintainer --- recipes/pyjion/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index fbf1618f06d26..601cefd5bcb0c 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -53,3 +53,4 @@ about: extra: recipe-maintainers: - dhirschfeld + - tonybaloney From b605f4be81c4a6b989a35ab07bebe6252a2e3bdc Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 13:56:09 +1000 Subject: [PATCH 05/38] Add `dotnet/runtime` license --- recipes/pyjion/thirdparty_licenses/dotnet.md | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 recipes/pyjion/thirdparty_licenses/dotnet.md diff --git a/recipes/pyjion/thirdparty_licenses/dotnet.md b/recipes/pyjion/thirdparty_licenses/dotnet.md new file mode 100644 index 0000000000000..a9aa5bc799216 --- /dev/null +++ b/recipes/pyjion/thirdparty_licenses/dotnet.md @@ -0,0 +1,31 @@ +## `dotnet/runtime` License + +*Source:* https://github.com/dotnet/runtime/blob/main/LICENSE.TXT + +---- + +``` +The MIT License (MIT) + +Copyright (c) .NET Foundation and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` From a67943571798be102682c6d2d3a6d973e419d8dd Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 21:05:09 +1000 Subject: [PATCH 06/38] Try enabling tests --- recipes/pyjion/meta.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 601cefd5bcb0c..d2941b6bbaef7 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -38,6 +38,18 @@ requirements: test: imports: - pyjion + requires: + # - distorm3 + - django + - flask + - numpy + - pandas + - pyyaml + - pytest >=6.2.5 + - rich + - sqlalchemy + commands: + - python -X dev -m pytest Tests/ -v --opt-level 0 about: home: https://github.com/tonybaloney/Pyjion From e8bef654ee5c47db4c5e1258a136d953a9f2eb15 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 23:19:12 +1000 Subject: [PATCH 07/38] Force python 3.10 (for testing) --- recipes/pyjion/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index d2941b6bbaef7..9b22dfbfea507 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -26,13 +26,13 @@ requirements: - git - ninja host: - - python + - python 3.10.* *_cpython - pip - ssetuptools - wheel - scikit-build run: - - python + - python 3.10.* *_cpython - dotnet ~=6 test: From fa4317cb9d8b95033a17ec15540b88df94c7cb45 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 23:23:50 +1000 Subject: [PATCH 08/38] Unskip (for testing) --- recipes/pyjion/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 9b22dfbfea507..f72d138cf8be1 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -11,7 +11,7 @@ source: build: - skip: True # [py < 310] + # skip: True # [py < 310] number: 0 script: | git submodule update --init --recursive From db1560ee446acfdcb7792d4897a57e428aa71489 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 23:28:38 +1000 Subject: [PATCH 09/38] Fix typo --- recipes/pyjion/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index f72d138cf8be1..6af1975f93fb6 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -28,7 +28,7 @@ requirements: host: - python 3.10.* *_cpython - pip - - ssetuptools + - setuptools - wheel - scikit-build run: From ecd55487dbc926d121c08a0ee8f9e27c0c7944aa Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 23:35:40 +1000 Subject: [PATCH 10/38] Disable tests --- recipes/pyjion/meta.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 6af1975f93fb6..9a07c565acab2 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -38,18 +38,18 @@ requirements: test: imports: - pyjion - requires: - # - distorm3 - - django - - flask - - numpy - - pandas - - pyyaml - - pytest >=6.2.5 - - rich - - sqlalchemy - commands: - - python -X dev -m pytest Tests/ -v --opt-level 0 + # requires: + # # - distorm3 + # - django + # - flask + # - numpy + # - pandas + # - pyyaml + # - pytest >=6.2.5 + # - rich + # - sqlalchemy + # commands: + # - python -X dev -m pytest Tests/ -v --opt-level 0 about: home: https://github.com/tonybaloney/Pyjion From 41d83f86453af2d2cd8d4b83f179ed639a79f7b1 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 23:43:40 +1000 Subject: [PATCH 11/38] Change pin --- recipes/pyjion/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 9a07c565acab2..50b5970ffda8c 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -33,7 +33,7 @@ requirements: - scikit-build run: - python 3.10.* *_cpython - - dotnet ~=6 + - dotnet >=6 test: imports: From 710176990c5b1d024c7b4cc1774dd107d01a5f04 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Sun, 6 Feb 2022 23:54:22 +1000 Subject: [PATCH 12/38] Add `cxx` compiler --- recipes/pyjion/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 50b5970ffda8c..bf451bc075a23 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -21,6 +21,7 @@ build: requirements: build: + - {{ compiler('cxx') }} - cmake - dotnet - git From 5e55982011e2ee4c47b43b6d11176739fd799513 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 09:06:38 +1000 Subject: [PATCH 13/38] Add `CMAKE_GENERATOR` env var --- recipes/pyjion/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index bf451bc075a23..e7d5c459dce9d 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -13,6 +13,8 @@ source: build: # skip: True # [py < 310] number: 0 + script_env: + - CMAKE_GENERATOR=Ninja script: | git submodule update --init --recursive {{ PYTHON }} -m pip install . -vv From e501f1878b919ea53ba7941deabe7f761356580a Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 09:51:32 +1000 Subject: [PATCH 14/38] Try using `CMAKE_MAKE_PROGRAM` --- recipes/pyjion/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index e7d5c459dce9d..34eb222e3606f 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -13,10 +13,12 @@ source: build: # skip: True # [py < 310] number: 0 - script_env: - - CMAKE_GENERATOR=Ninja script: | git submodule update --init --recursive + echo '####################################################################' + echo "$(which ninja)" + echo '####################################################################' + export CMAKE_MAKE_PROGRAM=$(which ninja) {{ PYTHON }} -m pip install . -vv entry_points: - pyjion = pyjion.__main__:main From a808836e2af5005300b420b87585cbce3445056c Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 10:20:31 +1000 Subject: [PATCH 15/38] wip --- recipes/pyjion/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 34eb222e3606f..d27596b029df2 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -15,10 +15,10 @@ build: number: 0 script: | git submodule update --init --recursive + export CMAKE_MAKE_PROGRAM="$(which ninja)" echo '####################################################################' - echo "$(which ninja)" + echo "${CMAKE_MAKE_PROGRAM}" echo '####################################################################' - export CMAKE_MAKE_PROGRAM=$(which ninja) {{ PYTHON }} -m pip install . -vv entry_points: - pyjion = pyjion.__main__:main From 2385e8603a9c8af7996c2c719455e4f1d6ff7fee Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 10:41:01 +1000 Subject: [PATCH 16/38] Try adding `make` to build deps --- recipes/pyjion/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index d27596b029df2..7e8227185944e 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -29,6 +29,7 @@ requirements: - cmake - dotnet - git + - make - ninja host: - python 3.10.* *_cpython From c1328a4345c0a3031e708655f8e66dd0a90e32a2 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 11:06:09 +1000 Subject: [PATCH 17/38] Add `libclrjit.so` to `missing_dso_whitelist` --- recipes/pyjion/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 7e8227185944e..ba4f56fb46553 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -13,6 +13,8 @@ source: build: # skip: True # [py < 310] number: 0 + missing_dso_whitelist: + - '*/libclrjit.so' # [linux] script: | git submodule update --init --recursive export CMAKE_MAKE_PROGRAM="$(which ninja)" @@ -23,6 +25,8 @@ build: entry_points: - pyjion = pyjion.__main__:main + + requirements: build: - {{ compiler('cxx') }} From 47ca9064752b24c22f2b0d0b8022bc4b0651110c Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 11:47:42 +1000 Subject: [PATCH 18/38] Try forcing `ninja` --- recipes/pyjion/meta.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index ba4f56fb46553..47410838a0135 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -15,11 +15,14 @@ build: number: 0 missing_dso_whitelist: - '*/libclrjit.so' # [linux] + script_env: + - CMAKE_GENERATOR=Ninja script: | git submodule update --init --recursive export CMAKE_MAKE_PROGRAM="$(which ninja)" echo '####################################################################' - echo "${CMAKE_MAKE_PROGRAM}" + echo "CMAKE_GENERATOR=${CMAKE_GENERATOR}" + echo "CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" echo '####################################################################' {{ PYTHON }} -m pip install . -vv entry_points: @@ -33,7 +36,7 @@ requirements: - cmake - dotnet - git - - make + # - make - ninja host: - python 3.10.* *_cpython From a5df7c5f1ddc8418147fcbc9ef34fd06942275a8 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 11:59:09 +1000 Subject: [PATCH 19/38] Export `CMAKE_GENERATOR` env var --- recipes/pyjion/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 47410838a0135..f3f3f30c33905 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -11,14 +11,13 @@ source: build: - # skip: True # [py < 310] + skip: True # [not linux] number: 0 missing_dso_whitelist: - '*/libclrjit.so' # [linux] - script_env: - - CMAKE_GENERATOR=Ninja script: | git submodule update --init --recursive + export CMAKE_GENERATOR="Ninja" export CMAKE_MAKE_PROGRAM="$(which ninja)" echo '####################################################################' echo "CMAKE_GENERATOR=${CMAKE_GENERATOR}" From 6a601b2069fedd18af23d57d3a0ccedae3a21294 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 12:14:15 +1000 Subject: [PATCH 20/38] Remove debug cruft --- recipes/pyjion/meta.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index f3f3f30c33905..7b9604400630d 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -18,24 +18,16 @@ build: script: | git submodule update --init --recursive export CMAKE_GENERATOR="Ninja" - export CMAKE_MAKE_PROGRAM="$(which ninja)" - echo '####################################################################' - echo "CMAKE_GENERATOR=${CMAKE_GENERATOR}" - echo "CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" - echo '####################################################################' {{ PYTHON }} -m pip install . -vv entry_points: - pyjion = pyjion.__main__:main - - requirements: build: - {{ compiler('cxx') }} - cmake - dotnet - git - # - make - ninja host: - python 3.10.* *_cpython @@ -61,7 +53,7 @@ test: # - rich # - sqlalchemy # commands: - # - python -X dev -m pytest Tests/ -v --opt-level 0 + # - python -X dev -m pytest Tests/ -v --opt-level 1 about: home: https://github.com/tonybaloney/Pyjion From 24cf5256c48f8921686fc6c790917da113fce469 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 12:14:41 +1000 Subject: [PATCH 21/38] Try enabling tests --- recipes/pyjion/meta.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 7b9604400630d..9a1d483cf059f 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -42,18 +42,18 @@ requirements: test: imports: - pyjion - # requires: - # # - distorm3 - # - django - # - flask - # - numpy - # - pandas - # - pyyaml - # - pytest >=6.2.5 - # - rich - # - sqlalchemy - # commands: - # - python -X dev -m pytest Tests/ -v --opt-level 1 + requires: + # - distorm3 + - django + - flask + - numpy + - pandas + - pyyaml + - pytest >=6.2.5 + - rich + - sqlalchemy + commands: + - python -X dev -m pytest Tests/ -v --opt-level 1 about: home: https://github.com/tonybaloney/Pyjion From a828b5e9858504f6943522142174efc559d23047 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 19:59:37 +1000 Subject: [PATCH 22/38] Debug `pytest` --- recipes/pyjion/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 9a1d483cf059f..9f593d8d66d0f 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -53,7 +53,8 @@ test: - rich - sqlalchemy commands: - - python -X dev -m pytest Tests/ -v --opt-level 1 + - pytest -VV + - pytest -v --opt-level 1 Tests/ about: home: https://github.com/tonybaloney/Pyjion From b33ffdb4f9f8680065c363b2d28a03ff9c2ae1f2 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 20:13:26 +1000 Subject: [PATCH 23/38] wip --- recipes/pyjion/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 9f593d8d66d0f..d15610b826df6 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -54,7 +54,9 @@ test: - sqlalchemy commands: - pytest -VV - - pytest -v --opt-level 1 Tests/ + - ls -la + - ls -la Tests/ + - pytest -v Tests/ --opt-level 1 about: home: https://github.com/tonybaloney/Pyjion From e346111426de6ed9b81129f83fc54645f9ab0a9c Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 20:52:19 +1000 Subject: [PATCH 24/38] wip --- recipes/pyjion/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index d15610b826df6..066313a8af7ee 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -54,8 +54,9 @@ test: - sqlalchemy commands: - pytest -VV + - pwd - ls -la - - ls -la Tests/ + - env | sort - pytest -v Tests/ --opt-level 1 about: From 3920195a01653d67f350f90ac000758380f4452a Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 21:28:44 +1000 Subject: [PATCH 25/38] Specify `source_files` for tests --- recipes/pyjion/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 066313a8af7ee..84cc72c5c4e70 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -52,6 +52,8 @@ test: - pytest >=6.2.5 - rich - sqlalchemy + source_files: + - Tests/** commands: - pytest -VV - pwd From 3e842d2acf0e435e6ed5af73f2177d94d6b7951c Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 21:58:35 +1000 Subject: [PATCH 26/38] Remove debug cruft --- recipes/pyjion/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 84cc72c5c4e70..f6d4e7e854324 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -55,10 +55,6 @@ test: source_files: - Tests/** commands: - - pytest -VV - - pwd - - ls -la - - env | sort - pytest -v Tests/ --opt-level 1 about: From 0d6cbbf206604ca11dce4203a52f1d283d4215ff Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 22:02:44 +1000 Subject: [PATCH 27/38] Add all tests --- recipes/pyjion/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index f6d4e7e854324..9a8b632f0b21a 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -55,7 +55,11 @@ test: source_files: - Tests/** commands: + - pytest -v --color=yes Tests/ --opt-level 0 - pytest -v Tests/ --opt-level 1 + - pytest -v Tests/ --opt-level 2 + - pytest -v Tests/ --opt-level 0 --external + - pytest -v Tests/ --opt-level 1 --external about: home: https://github.com/tonybaloney/Pyjion From c3199f4663849b551646cba1466dd36d452dd590 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 22:17:16 +1000 Subject: [PATCH 28/38] Add some colour (To the test output!) --- recipes/pyjion/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 9a8b632f0b21a..a9aaf7ea73ed4 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -56,10 +56,10 @@ test: - Tests/** commands: - pytest -v --color=yes Tests/ --opt-level 0 - - pytest -v Tests/ --opt-level 1 - - pytest -v Tests/ --opt-level 2 - - pytest -v Tests/ --opt-level 0 --external - - pytest -v Tests/ --opt-level 1 --external + - pytest -v --color=yes Tests/ --opt-level 1 + - pytest -v --color=yes Tests/ --opt-level 2 + - pytest -v --color=yes Tests/ --opt-level 0 --external + - pytest -v --color=yes Tests/ --opt-level 1 --external about: home: https://github.com/tonybaloney/Pyjion From 4cd9cd90ecb6369718bb1b01aab9fbe2f41d1824 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 22:18:00 +1000 Subject: [PATCH 29/38] Skip external tests They require `distorm3` which isn't available on CF --- recipes/pyjion/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index a9aaf7ea73ed4..2c27ce9c43f4f 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -58,8 +58,9 @@ test: - pytest -v --color=yes Tests/ --opt-level 0 - pytest -v --color=yes Tests/ --opt-level 1 - pytest -v --color=yes Tests/ --opt-level 2 - - pytest -v --color=yes Tests/ --opt-level 0 --external - - pytest -v --color=yes Tests/ --opt-level 1 --external + # External tests require distorm3 + # - pytest -v --color=yes Tests/ --opt-level 0 --external + # - pytest -v --color=yes Tests/ --opt-level 1 --external about: home: https://github.com/tonybaloney/Pyjion From 7f3bfe95388e5c8ad0cc8932086b51d47a5bfca1 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Mon, 7 Feb 2022 22:39:09 +1000 Subject: [PATCH 30/38] Re-enable skip and remove Python pins --- recipes/pyjion/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 2c27ce9c43f4f..bc37c52fd2209 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -11,7 +11,7 @@ source: build: - skip: True # [not linux] + skip: True # [not linux or py<310] number: 0 missing_dso_whitelist: - '*/libclrjit.so' # [linux] @@ -30,13 +30,13 @@ requirements: - git - ninja host: - - python 3.10.* *_cpython + - python - pip - setuptools - wheel - scikit-build run: - - python 3.10.* *_cpython + - python - dotnet >=6 test: From d9432fc9bfd86c59aee00dba4482caaf2e7a0ac4 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Tue, 8 Feb 2022 20:42:02 +1000 Subject: [PATCH 31/38] Move `dotnet` to host deps --- recipes/pyjion/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index bc37c52fd2209..1e4e4646b8c23 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -11,7 +11,7 @@ source: build: - skip: True # [not linux or py<310] + skip: True # [not linux] number: 0 missing_dso_whitelist: - '*/libclrjit.so' # [linux] @@ -26,17 +26,17 @@ requirements: build: - {{ compiler('cxx') }} - cmake - - dotnet - git - ninja host: - - python + - python 3.10.* *_cpython + - dotnet >=6 - pip - setuptools - wheel - scikit-build run: - - python + - python 3.10.* *_cpython - dotnet >=6 test: From f551622c4700c6090808416ec9428ca15d409c7f Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Tue, 8 Feb 2022 21:00:22 +1000 Subject: [PATCH 32/38] Link to exact commit for license file --- recipes/pyjion/thirdparty_licenses/dotnet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyjion/thirdparty_licenses/dotnet.md b/recipes/pyjion/thirdparty_licenses/dotnet.md index a9aa5bc799216..2e39ff06b6b49 100644 --- a/recipes/pyjion/thirdparty_licenses/dotnet.md +++ b/recipes/pyjion/thirdparty_licenses/dotnet.md @@ -1,6 +1,6 @@ ## `dotnet/runtime` License -*Source:* https://github.com/dotnet/runtime/blob/main/LICENSE.TXT +*Source:* https://github.com/dotnet/runtime/blob/4822e3c3aa77eb82b2fb33c9321f923cf11ddde6/LICENSE.TXT ---- From b7e93e64eff07e6b23024de686f32d8fd827c9a4 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Tue, 8 Feb 2022 21:00:42 +1000 Subject: [PATCH 33/38] Re-enable skip --- recipes/pyjion/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 1e4e4646b8c23..920d6521b419f 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -11,7 +11,7 @@ source: build: - skip: True # [not linux] + skip: True # [not linux or py<310] number: 0 missing_dso_whitelist: - '*/libclrjit.so' # [linux] @@ -29,14 +29,14 @@ requirements: - git - ninja host: - - python 3.10.* *_cpython + - python - dotnet >=6 - pip - setuptools - wheel - scikit-build run: - - python 3.10.* *_cpython + - python - dotnet >=6 test: From 68cf978e4fcc763b6c6deed656b9a465e2f1a6de Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Tue, 8 Feb 2022 22:49:49 +1000 Subject: [PATCH 34/38] Use `git_rev` --- recipes/pyjion/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 920d6521b419f..a964ac70389a2 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -7,14 +7,13 @@ package: source: git_url: https://github.com/tonybaloney/Pyjion.git - git_tag: {{ version }} + # https://github.com/tonybaloney/Pyjion/tree/1.2.6 + git_rev: 66a772d48825e2511b9c6e8bbcc739d84f84e800 build: skip: True # [not linux or py<310] number: 0 - missing_dso_whitelist: - - '*/libclrjit.so' # [linux] script: | git submodule update --init --recursive export CMAKE_GENERATOR="Ninja" From f1f3538d54b18cb5685fa3a4bbf61fddd2031176 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Wed, 9 Feb 2022 07:31:13 +1000 Subject: [PATCH 35/38] Re-run the tests --- recipes/pyjion/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index a964ac70389a2..42937af52f6d1 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -12,7 +12,7 @@ source: build: - skip: True # [not linux or py<310] + skip: True # [not linux] number: 0 script: | git submodule update --init --recursive @@ -28,14 +28,14 @@ requirements: - git - ninja host: - - python + - python 3.10.* *_cpython - dotnet >=6 - pip - setuptools - wheel - scikit-build run: - - python + - python 3.10.* *_cpython - dotnet >=6 test: From cc3b71954998e42cf05e9c8b04f8404269eae11a Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Wed, 9 Feb 2022 08:13:44 +1000 Subject: [PATCH 36/38] Add `libclrjit.so` to the `missing_dso_whitelist` Possibly required because `dotnet` is a binary repackage. --- recipes/pyjion/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 42937af52f6d1..3ba4bfd342323 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -14,6 +14,8 @@ source: build: skip: True # [not linux] number: 0 + missing_dso_whitelist: + - '*/libclrjit.so' # [linux] script: | git submodule update --init --recursive export CMAKE_GENERATOR="Ninja" From 8f44c0dda28b94dc86fd7984a1c394a7bd8da2a4 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Wed, 9 Feb 2022 08:41:27 +1000 Subject: [PATCH 37/38] Re-enable skip --- recipes/pyjion/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index 3ba4bfd342323..c2a5fd73c0673 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -12,7 +12,7 @@ source: build: - skip: True # [not linux] + skip: True # [not linux or py<310] number: 0 missing_dso_whitelist: - '*/libclrjit.so' # [linux] @@ -30,14 +30,14 @@ requirements: - git - ninja host: - - python 3.10.* *_cpython + - python - dotnet >=6 - pip - setuptools - wheel - scikit-build run: - - python 3.10.* *_cpython + - python - dotnet >=6 test: From ef6be27f892c6136e546ff75c702ecc3dcf919d7 Mon Sep 17 00:00:00 2001 From: Dave Hirschfeld Date: Thu, 10 Feb 2022 18:18:54 +1000 Subject: [PATCH 38/38] Update recipes/pyjion/meta.yaml Co-authored-by: Chris Burr --- recipes/pyjion/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyjion/meta.yaml b/recipes/pyjion/meta.yaml index c2a5fd73c0673..14fbceb443967 100644 --- a/recipes/pyjion/meta.yaml +++ b/recipes/pyjion/meta.yaml @@ -8,7 +8,7 @@ package: source: git_url: https://github.com/tonybaloney/Pyjion.git # https://github.com/tonybaloney/Pyjion/tree/1.2.6 - git_rev: 66a772d48825e2511b9c6e8bbcc739d84f84e800 + git_rev: {{ version }} build: