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.

Sign up for GitHub

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

Jump to bottom

Combine patches needed for 0.55.2 #8072

Closed
wants to merge 9 commits into from
Closed

Combine patches needed for 0.55.2 #8072

wants to merge 9 commits into from

Commits on May 19, 2022

  1. Backport numba#8027: Support for NumPy 1.22

    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    159abfc View commit details
    Browse the repository at this point in the history

  2. update changelog for 0.55.2 

    As title
    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    d32be8c View commit details
    Browse the repository at this point in the history

  3. Install llvmlite 0.38 for Numba 0.55.* 

    The public CI configuration assumes that the latest llvmlite should be
installed. This is 0.39.0dev0 at the time of writing. However, Numba
0.55.* requires llvmlite 0.38.* -- so we install that instead.

```
Traceback (most recent call last):
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 579, in _build_master
    ws.require(__requires__)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 897, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 788, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (llvmlite 0.39.0.dev0+80.g409cd6d (/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages), Requirement.parse('llvmlite<0.39,>=0.38.0rc1'), {'numba'})

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/home/vsts/miniconda3/envs/azure_ci/bin/numba", line 4, in <module>
    __import__('pkg_resources').require('numba==0.55.1+2.g4bb1964e1')
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 3246, in <module>
    @_call_aside
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 3221, in _call_aside
    f(*args, **kwargs)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 3259, in _initialize_master_working_set
    working_set = WorkingSet._build_master()
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 581, in _build_master
    return cls._build_from_requirements(__requires__)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 594, in _build_from_requirements
    dists = ws.resolve(reqs, Environment())
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.7/site-packages/pkg_resources/__init__.py", line 783, in resolve
    raise DistributionNotFound(req, requirers)
pkg_resources.DistributionNotFound: The 'llvmlite<0.39,>=0.38.0rc1' distribution was not found and is required by numba
```
    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    9254c7e View commit details
    Browse the repository at this point in the history

  4. update max NumPy for 0.55.2 

    As title
    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    7b299ff View commit details
    Browse the repository at this point in the history

  5. bump version in __init__.py too 

    As title
    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    7e1c7e9 View commit details
    Browse the repository at this point in the history

  6. fixup error message 

    As title
    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    972194f View commit details
    Browse the repository at this point in the history

  7. Merge pull request numba#7804 from esc/rename_master_main 

    update local references from master -> main
    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    1cea2de View commit details
    Browse the repository at this point in the history

  8. update the target branch to match the release branch 

    This is needed to stop public CI from melting.
    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    6f2894b View commit details
    Browse the repository at this point in the history

  9. Merge branches 'backport/0.55/numpy_122', '0.55.2/update_max_numpy', … 

    …'backport/0.55/7804', 'public_ci/pin_llvmlite' and 'changelog/0.55.2' into combine_8067_8069

* backport/0.55/numpy_122:
  Backport numba#8027: Support for NumPy 1.22

* 0.55.2/update_max_numpy:
  fixup error message
  bump version in __init__.py too
  update max NumPy for 0.55.2

* backport/0.55/7804:
  update the target branch to match the release branch
  Merge pull request numba#7804 from esc/rename_master_main

* public_ci/pin_llvmlite:
  Install llvmlite 0.38 for Numba 0.55.*

* changelog/0.55.2:
  update changelog for 0.55.2
    @esc
    esc committed May 19, 2022
    Configuration menu
    Copy the full SHA
    a83adb4 View commit details
    Browse the repository at this point in the history