Skip to content

Commit

Permalink
Revert "Merge remote-tracking branch 'upstream/develop' into GEOPY-1617"
Browse files Browse the repository at this point in the history
- do not force usage of intel OpenMP as it conlfict with LLVM on Linux
- do not force versions from simpeg (yet). Other packages can specify them

This reverts commit 525b023, reversing
changes made to 06efe92.
  • Loading branch information
sebhmg committed Jul 5, 2024
1 parent 525b023 commit 35d7ea9
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ geoh5py = {version = ">=0.9.1, <0.11", allow-prereleases = true}

matplotlib = "*"
numpy = ">=1.20"
mkl = "2023.2.0" # from simpeg
pydiso = "~0.0.5" # from simpeg
tbb = "2021.12.0"
tzdata = "2023.4" # through pandas from SimPEG
intel-openmp = "2023.2.0" # from simpeg
pandas = "*"
pymatsolver = ">=0.2"
scikit-learn = ">=1.2"
Expand Down Expand Up @@ -103,7 +98,7 @@ dask = [

[tool.conda-lock]
platforms = ['win-64', 'osx-64', 'linux-64']
channels = ['conda-forge', 'intel']
channels = ['conda-forge', 'defaults']

[tool.black]
# defaults are just fine
Expand Down

0 comments on commit 35d7ea9

Please sign in to comment.