Skip to content

Upgrade to numpy 2 in conda #39267

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

Closed
wants to merge 3 commits into from
Closed

Upgrade to numpy 2 in conda #39267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5f1da0
Update conda to use Python 3.12, drop 3.9 and 3.10
tobiasdiez Dec 19, 2024
9ea715f
Merge branch 'develop' into conda-python-upgrade
tobiasdiez Dec 23, 2024
18b9b80
Upgrade to numpy 2 in conda
tobiasdiez Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions .github/workflows/ci-conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,12 @@ jobs:
# On pushes to tags or branches, test the whole matrix.
os: >-
${{ github.event_name == 'pull_request'
&& fromJson('["ubuntu-latest"]')
&& fromJson('["ubuntu-latest", "macos-latest"]')
|| fromJson('["ubuntu-latest", "macos-latest", "macos-13"]') }}
python: >-
${{ github.event_name == 'pull_request'
&& fromJson('["3.9"]')
|| fromJson('["3.9", "3.10", "3.11"]') }}
python: ['3.11', '3.12']
# Optional environment is disabled for now as its not yet working
# environment: [environment, environment-optional]
conda-env: [environment]
# On pull requests, only test two jobs:
# Ubuntu with Python 3.9, macOS (arm64) with Python 3.11.
# Build & Test currently uses Python 3.10 (on ubuntu-jammy).
# Together, they cover the supported minor Python versions.
include: >-
${{ github.event_name == 'pull_request'
&& fromJson('[{"os": "macos-latest", "python": "3.11", "conda-env": "environment"}]')
|| fromJson('[]') }}

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-meson.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu]
python: ['3.9', '3.10', '3.11']
python: ['3.11', '3.12']

steps:
- uses: actions/checkout@v4
Expand Down
10 changes: 4 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@
# no longer generated, but may still be in user worktrees
/src/lib/pkgconfig

# Conda environment files
# The files without Python version, with -dev or in src are no longer generated
# but may still be in users' directories.
# Conda environment files (auto-generated)
/environment-3.[0-9].yml
/environment-3.[0-9][0-9].yml
# The following files are no longer generated but may still be in users' directories
/environment.yml
/environment-3.9.yml
/environment-3.10.yml
/environment-3.11.yml
/environment-dev-3.9.yml
/environment-dev-3.10.yml
/environment-dev-3.11.yml
Expand Down
Loading
Loading