Fix `version` contaminated by versioneer due to local patch #100

conda-forge-admin · 2024-12-13T02:40:35Z

Hi! This is the friendly automated conda-forge-webservice.

I've started rerendering the recipe as instructed in #99.

If I find any needed changes to the recipe, I'll push them to this PR shortly. Thank you for waiting!

Here's a checklist to do before merging.

Bump the build number if needed

Fixes #99
xref: NVIDIA/cuda-python#308

conda-forge-admin · 2024-12-13T02:42:03Z

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.

I do have some suggestions for making it better though...

For recipe/meta.yaml:

ℹ️ The recipe is not parsable by parser conda-souschef (grayskull). Your recipe may not receive automatic updates and/or may not be compatible with conda-forge's infrastructure. Please check the logs for more information and ensure your recipe can be parsed.
ℹ️ The recipe is not parsable by parser conda-recipe-manager. Your recipe may not receive automatic updates and/or may not be compatible with conda-forge's infrastructure. Please check the logs for more information and ensure your recipe can be parsed.

_{This message was generated by GitHub Actions workflow run https://github.com/conda-forge/conda-forge-webservices/actions/runs/12309442179. Examine the logs at this URL for more detail.}

conda-forge-admin · 2024-12-13T02:42:44Z

Hi! This is the friendly automated conda-forge-webservice.

I tried to rerender for you but ran into some issues. Please check the output logs of the GitHub Actions workflow below for more details. You can also ping conda-forge/core (using the @ notation) for further assistance or you can try rerendering locally.

The following suggestions might help debug any issues:

Is the recipe/{meta.yaml,recipe.yaml} file valid?
If there is a recipe/conda-build-config.yaml file in the feedstock make sure that it is compatible with the current global pinnnings.
Is the fork used for this PR on an organization or user GitHub account? Automated rerendering via the webservices admin bot only works for user GitHub accounts.

_{This message was generated by GitHub Actions workflow run https://github.com/conda-forge/conda-forge-webservices/actions/runs/12308580391. Examine the logs at this URL for more detail.}

leofang · 2024-12-13T03:13:25Z

@conda-forge-admin, please rerender

conda-forge-admin · 2024-12-13T03:15:43Z

Hi! This is the friendly automated conda-forge-webservice.

I tried to rerender for you but ran into some issues. Please check the output logs of the GitHub Actions workflow below for more details. You can also ping conda-forge/core (using the @ notation) for further assistance or you can try rerendering locally.

The following suggestions might help debug any issues:

Is the recipe/{meta.yaml,recipe.yaml} file valid?
If there is a recipe/conda-build-config.yaml file in the feedstock make sure that it is compatible with the current global pinnnings.
Is the fork used for this PR on an organization or user GitHub account? Automated rerendering via the webservices admin bot only works for user GitHub accounts.

_{This message was generated by GitHub Actions workflow run https://github.com/conda-forge/conda-forge-webservices/actions/runs/12308888227. Examine the logs at this URL for more detail.}

leofang · 2024-12-13T03:22:52Z

It seems every few weeks I need to catch up with the latest conda-forge development... I suspect this has to do with the global pinning updated to 12.6, but I can't tell what's the right solution. Time to ping @conda-forge/cuda 😄

INFO:conda_smithy.configure_feedstock:Downloading conda-forge-pinning-2024.12.12.18.06.52
INFO:conda_smithy.configure_feedstock:Extracting conda-forge-pinning to /tmp/tmp7lj7ehdq/conda-smithy
INFO:conda_smithy.configure_feedstock:README rendering is skipped
INFO:conda_smithy.configure_feedstock:__pycache__ rendering is skipped
INFO:conda_smithy.configure_feedstock:python313.yaml from feedstock is ignored and upstream version is used
WARNING: Setting build platform. This is only useful when pretending to be on another platform, such as for rendering necessary dependencies on a non-native platform. I trust that you know what you're doing.
WARNING: Setting build arch. This is only useful when pretending to be on another arch, such as for rendering necessary dependencies on a non-native arch. I trust that you know what you're doing.
WARNING: No numpy version specified in conda_build_config.yaml.  Falling back to default numpy value of 1.23
Adding in variants from internal_defaults
Adding in variants from /tmp/tmp7lj7ehdq/conda-smithy/conda_build_config.yaml
INFO:conda_smithy.configure_feedstock:Applying migrations: /tmp/tmp7lj7ehdq/conda-smithy/share/conda-forge/migrations/python313.yaml,/tmp/tmpym4rgkqg/cuda-python-feedstock/.ci_support/migrations/cuda12x.yaml
Traceback (most recent call last):
  File "/opt/conda/envs/cf-feedstock-ops/bin/conda-smithy", line 10, in <module>
    sys.exit(main())
             ^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/cli.py", line 767, in main
    args.subcommand_func(args)
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/cli.py", line 610, in __call__
    self._call(args, args.temporary_directory)
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/cli.py", line 613, in _call
    configure_feedstock.main(
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/configure_feedstock.py", line 2881, in main
    render_azure(env, config, forge_dir, return_metadata=True)
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/configure_feedstock.py", line 1901, in render_azure
    return _render_ci_provider(
           ^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/configure_feedstock.py", line 1071, in _render_ci_provider
    migrated_combined_variant_spec = migrate_combined_spec(
                                     ^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/configure_feedstock.py", line 902, in migrate_combined_spec
    combined_spec = variant_add(combined_spec, migration)
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/variant_algebra.py", line 289, in variant_add
    return VARIANT_OP[operation](v1, v2)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/variant_algebra.py", line 176, in op_variant_key_add
    new_keys = variant_key_set_union(
               ^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/variant_algebra.py", line 114, in variant_key_set_union
    return sorted(out_v, key=partial(_version_order, ordering=ordering))
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/variant_algebra.py", line 65, in _version_order
    return ordering.index(v)
           ^^^^^^^^^^^^^^^^^
ValueError: '12.6' is not in list
2024-12-13 03:15:08,221 ERROR    conda_forge_webservices.github_actions_integration.rerendering || Rerendering failed: Error running 'conda-forge-feedstock-ops-container rerender --log-level debug' in container - error RuntimeError raised:
'Failed to rerender.
output: Adding in variants from internal_defaults
Adding in variants from /tmp/tmp7lj7ehdq/conda-smithy/conda_build_config.yaml
INFO:conda_smithy.configure_feedstock:Downloading conda-forge-pinning-2024.12.12.18.06.52
INFO:conda_smithy.configure_feedstock:Extracting conda-forge-pinning to /tmp/tmp7lj7ehdq/conda-smithy
INFO:conda_smithy.configure_feedstock:README rendering is skipped
INFO:conda_smithy.configure_feedstock:__pycache__ rendering is skipped
INFO:conda_smithy.configure_feedstock:python313.yaml from feedstock is ignored and upstream version is used
WARNING: Setting build platform. This is only useful when pretending to be on another platform, such as for rendering necessary dependencies on a non-native platform. I trust that you know what you're doing.
WARNING: Setting build arch. This is only useful when pretending to be on another arch, such as for rendering necessary dependencies on a non-native arch. I trust that you know what you're doing.
WARNING: No numpy version specified in conda_build_config.yaml.  Falling back to default numpy value of 1.23
INFO:conda_smithy.configure_feedstock:Applying migrations: /tmp/tmp7lj7ehdq/conda-smithy/share/conda-forge/migrations/python313.yaml,/tmp/tmpym4rgkqg/cuda-python-feedstock/.ci_support/migrations/cuda12x.yaml
Traceback (most recent call last):
  File "/opt/conda/envs/cf-feedstock-ops/bin/conda-smithy", line 10, in <module>
    sys.exit(main())
             ^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/cli.py", line 767, in main
    args.subcommand_func(args)
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/cli.py", line 610, in __call__
    self._call(args, args.temporary_directory)
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/cli.py", line 613, in _call
    configure_feedstock.main(
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/configure_feedstock.py", line 2881, in main
    render_azure(env, config, forge_dir, return_metadata=True)
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/configure_feedstock.py", line 1901, in render_azure
    return _render_ci_provider(
           ^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/configure_feedstock.py", line 1071, in _render_ci_provider
    migrated_combined_variant_spec = migrate_combined_spec(
                                     ^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/configure_feedstock.py", line 902, in migrate_combined_spec
    combined_spec = variant_add(combined_spec, migration)
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/variant_algebra.py", line 289, in variant_add
    return VARIANT_OP[operation](v1, v2)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/variant_algebra.py", line 176, in op_variant_key_add
    new_keys = variant_key_set_union(
               ^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/variant_algebra.py", line 114, in variant_key_set_union
    return sorted(out_v, key=partial(_version_order, ordering=ordering))
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/conda/envs/cf-feedstock-ops/lib/python3.11/site-packages/conda_smithy/variant_algebra.py", line 65, in _version_order
    return ordering.index(v)
           ^^^^^^^^^^^^^^^^^
ValueError: '12.6' is not in list

'
2024-12-13 03:15:08,224 INFO     conda_forge_webservices.github_actions_integration.utils || git patch for diff e64ab497653144c5d153871489da97d828907f35..e64ab497653144c5d153871489da97d828907f35:

jakirkham · 2024-12-13T03:55:53Z

@conda-forge-admin , please re-render

…onda-forge-pinning 2024.12.13.03.36.57

jakirkham · 2024-12-13T04:10:58Z

@conda-forge-admin , please re-render

conda-forge-admin · 2024-12-13T04:13:42Z

Hi! This is the friendly automated conda-forge-webservice.

I tried to rerender for you, but it looks like there was nothing to do.

_{This message was generated by GitHub Actions workflow run https://github.com/conda-forge/conda-forge-webservices/actions/runs/12309444583. Examine the logs at this URL for more detail.}

conda-forge-admin · 2024-12-13T04:15:48Z

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.

.ci_support/migrations/cuda12x.yaml

jakirkham · 2024-12-13T04:27:22Z

recipe/0001-include-pxd-pyx.patch

-From 240fbb78b2a7746a3ad026070cd5e5d6deaaa337 Mon Sep 17 00:00:00 2001
-From: Vladislav Zhurba <[email protected]>
-Date: Fri, 8 Nov 2024 16:28:13 -0800
-Subject: [PATCH] Fix discovery for trampoline files


Don't we need this patch to fix cimports or is there another fix for that?

What happened was that when we figured out the patch, I applied it directly to here (Nov 10, 4:51pm ET) while upstream was still being updated (tagged at Nov 12, 7:14pm ET). So at the time of rebuilding in this feedstock, we were using the previous tag + local patch. Now we are switching to the latest, fixed tag. The validity of the package (cimport is fixed) is ensured through the tests I added when rebuilding. Had I remembered the potential impact of versioneer I would have looked at __version__ and decided to not rush into rebuilding...

leofang

__version__ is still dirty...
https://dev.azure.com/conda-forge/feedstock-builds/_build/results?buildId=1107951&view=logs&j=d818e662-7181-5ce9-b265-50d03742b7af&t=dc9b07c2-72db-585f-80fc-2b606081ad2b&l=2049

jakirkham · 2024-12-13T04:55:23Z

recipe/meta.yaml

-  patches:
-    - 0001-include-pxd-pyx.patch
+  # TODO: remove the hard-coded .post1 in the next release
+  url: https://github.com/NVIDIA/cuda-python/archive/refs/tags/v{{ version }}.post1.tar.gz


Should we move the post1 into version above?

I was trying to not make it as part of the version string (as far as conda is concerned) and only use build number to indicate it's a rebuild (with potential fixes). Do you think it's affecting __version__?

dummy commit for rerendering

9ba9836

conda-forge-webservices bot mentioned this pull request Dec 13, 2024

@conda-forge-admin, please rerender #99

Open

Delete recipe/0001-include-pxd-pyx.patch

4a1536a

update checksum

1c6cb8b

leofang changed the title ~~MNT: rerender~~ Fix __version__ contaminated by versioneer due to local patch Dec 13, 2024

leofang marked this pull request as ready for review December 13, 2024 02:54

leofang requested review from bdice, jakirkham, leofang, m3vaz, mmccarty, vyasr and vzhurba01 as code owners December 13, 2024 02:54

check __version__

e64ab49

Update ordering in CUDA 12 migrator

bfa7d4c

MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.44.9, and c…

54995a7

…onda-forge-pinning 2024.12.13.03.36.57

Use only one skip to make conda-souschef happy

d0788e8

jakirkham force-pushed the conda_forge_admin_99 branch from 596e7a2 to d0788e8 Compare December 13, 2024 04:14

jakirkham reviewed Dec 13, 2024

View reviewed changes

.ci_support/migrations/cuda12x.yaml Show resolved Hide resolved

jakirkham reviewed Dec 13, 2024

View reviewed changes

leofang requested changes Dec 13, 2024

View reviewed changes

jakirkham reviewed Dec 13, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix `version` contaminated by versioneer due to local patch #100

Fix `version` contaminated by versioneer due to local patch #100

conda-forge-admin commented Dec 13, 2024 •

edited by leofang

Loading

conda-forge-admin commented Dec 13, 2024 •

edited

Loading

conda-forge-admin commented Dec 13, 2024

leofang commented Dec 13, 2024

conda-forge-admin commented Dec 13, 2024

leofang commented Dec 13, 2024

jakirkham commented Dec 13, 2024

jakirkham commented Dec 13, 2024

conda-forge-admin commented Dec 13, 2024

conda-forge-admin commented Dec 13, 2024

jakirkham Dec 13, 2024

leofang Dec 13, 2024

leofang left a comment

jakirkham Dec 13, 2024

leofang Dec 17, 2024

Fix __version__ contaminated by versioneer due to local patch #100

Are you sure you want to change the base?

Fix __version__ contaminated by versioneer due to local patch #100

Conversation

conda-forge-admin commented Dec 13, 2024 • edited by leofang Loading

conda-forge-admin commented Dec 13, 2024 • edited Loading

conda-forge-admin commented Dec 13, 2024

leofang commented Dec 13, 2024

conda-forge-admin commented Dec 13, 2024

leofang commented Dec 13, 2024

jakirkham commented Dec 13, 2024

jakirkham commented Dec 13, 2024

conda-forge-admin commented Dec 13, 2024

conda-forge-admin commented Dec 13, 2024

jakirkham Dec 13, 2024

Choose a reason for hiding this comment

leofang Dec 13, 2024

Choose a reason for hiding this comment

leofang left a comment

Choose a reason for hiding this comment

jakirkham Dec 13, 2024

Choose a reason for hiding this comment

leofang Dec 17, 2024

Choose a reason for hiding this comment

Fix `version` contaminated by versioneer due to local patch #100

Fix `version` contaminated by versioneer due to local patch #100

conda-forge-admin commented Dec 13, 2024 •

edited by leofang

Loading

conda-forge-admin commented Dec 13, 2024 •

edited

Loading