Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebuilding 3.8 #41

Merged
merged 9 commits into from
May 10, 2024
Merged

Rebuilding 3.8 #41

merged 9 commits into from
May 10, 2024

Conversation

cduguet
Copy link

@cduguet cduguet commented May 5, 2024

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

This rebuild is intended to make pycolmap 0.4.0, and consequently pixsfm 1.0 run.

@cduguet cduguet requested a review from Tobias-Fischer as a code owner May 5, 2024 16:47
@conda-forge-webservices
Copy link
Contributor

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

I was trying to look for recipes to lint for you, but it appears we have a merge conflict.
Please try to merge or rebase with the base branch to resolve this conflict.

Please ping the 'conda-forge/core' team (using the @ notation in a comment) if you believe this is a bug.

@jakirkham
Copy link
Member

Could you please share a bit more details on what issue is cropping up?

@cduguet
Copy link
Author

cduguet commented May 7, 2024

@jakirkham pixsfm needs pycolmap 0.4.0 and ceres-solver 2.1.0 to work, which is explained in more detail in this bug.
However, pinning pixsfm to the existing builds of pycolmap 0.4.0, colmap 3.8 and ceres-solver 2.1.0 is not working, and it was suggested to rebuild colmap3.8, pycolmap0.4.0 to make it work.

I'm very new at conda-forge, so I'm not what should be the right procedure to update a build of an old version of a package (3.8). I guess PR'ing into main is not the right step, since I'm getting many merge conflicts with the newest version?

@jakirkham jakirkham changed the base branch from main to v3.8 May 7, 2024 16:03
@jakirkham
Copy link
Member

@conda-forge-admin , please relint

@conda-forge-webservices
Copy link
Contributor

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) and found it was in an excellent condition.

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

For recipe:

  • This recipe is using a compiler, which now requires adding a build dependence on {{ stdlib("c") }} as well. For further details, please see META: {{ stdlib("c") }} migration conda-forge.github.io#2102.

  • You're setting a requirement on sysroot_linux- directly; this should now be done by adding a build dependence on {{ stdlib("c") }}, and overriding c_stdlib_version in recipe/conda_build_config.yaml for the respective platform as necessary. For further details, please see META: {{ stdlib("c") }} migration conda-forge.github.io#2102.

  • In conda-forge.yml: $.test_on_native_only = True.

    'Test On Native Only' is deprecated.
    This was used for disabling testing for cross-compiling.

    This has been deprecated in favor of the top-level `test` field.
    It is now mapped to `test: native_and_emulated`.
    
    Schema
    {
      "anyOf": [
        {
          "type": "boolean"
        },
        {
          "type": "null"
        }
      ],
      "default": false,
      "deprecated": true,
      "title": "Test On Native Only"
    }

@jakirkham
Copy link
Member

Since it sounds like you already talked to Tobias about this and he is the maintainer here, went ahead and created the branch for the old version and retargeted this PR to it

Looks like the linter has a few suggestions. Also we will need to see how CI goes

@conda-forge-webservices
Copy link
Contributor

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) and found it was in an excellent condition.

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

For recipe:

@conda-forge-webservices
Copy link
Contributor

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) and found it was in an excellent condition.

@Tobias-Fischer
Copy link
Contributor

@conda-forge-admin please rerender

@Tobias-Fischer Tobias-Fischer added the automerge Merge the PR when CI passes label May 10, 2024
@Tobias-Fischer
Copy link
Contributor

Thanks @cduguet

@github-actions github-actions bot merged commit 5c3aae3 into conda-forge:v3.8 May 10, 2024
13 checks passed
Copy link
Contributor

Hi! This is the friendly conda-forge automerge bot!

I considered the following status checks when analyzing this PR:

  • linter: passed
  • azure: passed

Thus the PR was passing and merged! Have a great day!

@cduguet cduguet deleted the rebuilding_3.8 branch May 10, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge the PR when CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants