Skip to content

Commit 1ea6231

Browse files
committed
Combine requirements.txt files
These used to be split between conda-forge and main, because the main channel would resolve dependencies quicker when installing packages on the fly. Now that we are using specfiles, no dependency resolution happens on CI, so we can install everything from conda-forge.
1 parent f07a12d commit 1ea6231

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
cmake>=3.18
22
doxygen
3+
eigen
4+
git
35
gmock
46
gtest
57
gxx_linux-64>=9,<10
8+
ninja
69
pybind11
10+
pytest
11+
shapely

tools/imagesets/oracle8conda/dev/requirements.txt.main.dev

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
backoff
12
fftw>=3
23
gdal>=2.3
34
h5py
45
hdf5>=1.10.2
6+
libgcc-ng>=9,<10
7+
libstdcxx-ng>=9,<10
58
matplotlib
69
numpy
10+
pyre
711
python>=3.6
812
ruamel.yaml
913
scipy
14+
yamale

tools/imagesets/oracle8conda/runtime/requirements.txt.forge.runtime

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)