Skip to content

Commit df35c92

Browse files
authored
update lock files
1 parent 464ece0 commit df35c92

18 files changed

+1495
-1637
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"remoteUser": "vscode",
99

1010
// Setup conda environment
11-
"onCreateCommand": ".devcontainer/onCreate-conda.sh",
11+
"onCreateCommand": ".devcontainer/onCreate-conda.sh || true",
1212

1313
// Install additional features.
1414
"features": {
+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env pwsh
2+
3+
$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
4+
$rootDir = Join-Path -Path $scriptDir -ChildPath ..\..\
5+
6+
& "$rootDir/bootstrap-conda"
7+
8+
$platforms = @{
9+
"linux-64" = "linux"
10+
"osx-64" = "macos"
11+
}
12+
$pythons = "3.9", "3.10", "3.11"
13+
$tags = "", "-dev"
14+
$sources = "", "src"
15+
16+
foreach ($platform in $platforms.GetEnumerator()) {
17+
foreach ($python in $pythons) {
18+
foreach ($tag in $tags) {
19+
foreach ($src in $sources) {
20+
$envFile = Join-Path -Path $rootDir -ChildPath "$src\environment$tag-$python.yml"
21+
$lockFile = Join-Path -Path $rootDir -ChildPath "$src\environment$tag-$python-$($platform.Value)"
22+
23+
if (-not (Test-Path $envFile)) {
24+
continue
25+
}
26+
27+
echo "Updating lock file for $envFile at $lockFile"
28+
& "conda-lock" --channel conda-forge --kind env --platform $platform.Key --file $envFile --lockfile $lockFile --filename-template $lockFile
29+
}
30+
}
31+
}
32+
}

.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@
3434
"sagemath",
3535
"Cython"
3636
],
37-
"editor.formatOnType": true
37+
"editor.formatOnType": true,
38+
"esbonio.sphinx.confDir": ""
3839
}

bootstrap-conda

+2-1
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,6 @@ for python_version in 3.9 3.10 3.11; do
152152
done
153153
fi
154154
done
155-
) 4>> src/environment-dev-$python_version.yml 5>> src/environment-optional-$python_version.yml
155+
#) 4>> src/environment-dev-$python_version.yml 5>> src/environment-optional-$python_version.yml
156+
) 4>> /dev/null 5>> src/environment-optional-$python_version.yml
156157
done

build/pkgs/_prereq/distros/conda.txt

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
compilers
2-
make
3-
m4
4-
perl
5-
python
6-
tar
7-
bc
1+
# Not needed on conda
2+
#compilers
3+
#make
4+
#m4
5+
#perl
6+
#python
7+
#tar
8+
#bc

build/pkgs/patchelf/distros/conda.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
patchelf
1+
# Not available on macos
2+
# patchelf

environment-3.10-linux.yml

+70-113
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,46 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 3e531235a513060f63b991c223aa35c0cb0c16aef417e93c3df677572197bc24
3+
# input_hash: 722f5cecf921eb12ba9c645f0b616fed4ffaff10b7e29c286b3a70f8df40a036
44

55
channels:
66
- conda-forge
77
dependencies:
88
- _libgcc_mutex=0.1=conda_forge
9-
- _r-mutex=1.0.1=anacondar_1
109
- ca-certificates=2023.7.22=hbcca054_0
1110
- font-ttf-dejavu-sans-mono=2.37=hab24e00_0
1211
- font-ttf-inconsolata=3.000=h77eed37_0
1312
- font-ttf-source-code-pro=2.038=h77eed37_0
1413
- font-ttf-ubuntu=0.83=hab24e00_0
1514
- kernel-headers_linux-64=2.6.32=he073ed8_16
1615
- ld_impl_linux-64=2.40=h41732ed_0
17-
- libgcc-devel_linux-64=12.3.0=h8bca6fd_0
18-
- libgfortran5=13.1.0=h15d22d2_0
19-
- libstdcxx-devel_linux-64=12.3.0=h8bca6fd_0
20-
- libstdcxx-ng=13.1.0=hfd8a6a1_0
16+
- libboost-headers=1.82.0=ha770c72_2
17+
- libgcc-devel_linux-64=12.3.0=h8bca6fd_2
18+
- libstdcxx-ng=13.2.0=h7e041cc_2
19+
- mathjax=3.2.2=ha770c72_0
2120
- pari-elldata=0.0.20161017=0
2221
- pari-galdata=0.0.20180411=0
2322
- pari-galpol=0.0.20180625=0
2423
- pari-seadata-small=0.0.20090618=0
25-
- python_abi=3.11=3_cp311
24+
- python_abi=3.10=4_cp310
2625
- tzdata=2023c=h71feb2d_0
2726
- fonts-conda-forge=1=0
28-
- libgfortran-ng=13.1.0=h69a702a_0
29-
- libgomp=13.1.0=he5830b7_0
27+
- libgomp=13.2.0=h807b86a_2
3028
- pari-seadata=0.0.20090618=0
3129
- sysroot_linux-64=2.12=he073ed8_16
3230
- binutils_impl_linux-64=2.40=hf600244_0
3331
- fonts-conda-ecosystem=1=0
3432
- binutils=2.40=hdd6e379_0
35-
- binutils_linux-64=2.40=hbdbef99_1
33+
- binutils_linux-64=2.40=hbdbef99_2
3634
- _openmp_mutex=4.5=2_kmp_llvm
37-
- libgcc-ng=13.1.0=he5830b7_0
38-
- bc=1.07.1=h7f98852_0
35+
- libgcc-ng=13.2.0=h807b86a_2
3936
- bdw-gc=8.0.6=h4bd325d_0
4037
- bzip2=1.0.8=h7f98852_4
4138
- c-ares=1.19.1=hd590300_0
4239
- cliquer=1.22=h36c2ea0_0
43-
- fribidi=1.0.10=h36c2ea0_0
4440
- gengetopt=2.23=h9c3ff4c_0
45-
- gettext=0.21.1=h27087fc_0
4641
- gf2x=1.3.0=ha476b99_2
4742
- giflib=5.2.1=h0b41bf4_3
4843
- gmp=6.2.1=h58526e2_0
49-
- graphite2=1.3.13=h58526e2_1001
5044
- icu=72.1=hcb278e6_0
5145
- keyutils=1.6.1=h166bdaf_0
5246
- lerc=4.0.0=h27087fc_0
@@ -56,171 +50,134 @@ dependencies:
5650
- libev=4.33=h516909a_1
5751
- libexpat=2.5.0=hcb278e6_1
5852
- libffi=3.4.2=h7f98852_5
53+
- libgfortran5=13.2.0=ha4646dd_2
5954
- libiconv=1.17=h166bdaf_0
60-
- libjpeg-turbo=2.1.5.1=h0b41bf4_0
61-
- libnsl=2.0.0=h7f98852_0
62-
- libopenblas=0.3.23=pthreads_h80387f5_0
63-
- libsanitizer=12.3.0=h0f45ef3_0
55+
- libjpeg-turbo=2.1.5.1=hd590300_1
56+
- libnsl=2.0.0=hd590300_1
57+
- libsanitizer=12.3.0=h0f45ef3_2
6458
- libsodium=1.0.18=h36c2ea0_1
6559
- libtool=2.4.7=h27087fc_0
6660
- libuuid=2.38.1=h0b41bf4_0
67-
- libuv=1.44.2=h166bdaf_0
61+
- libuv=1.46.0=hd590300_0
6862
- libwebp-base=1.3.1=hd590300_0
6963
- libzlib=1.2.13=hd590300_5
7064
- lrcalc=2.1=h27087fc_5
7165
- m4=1.4.18=h516909a_1001
72-
- make=4.3=hd18ef5c_1
73-
- metis=5.1.1=h59595ed_0
66+
- metis=5.1.0=h59595ed_1007
7467
- nauty=2.7.2=h7f98852_0
7568
- ncurses=6.4=hcb278e6_0
7669
- ninja=1.11.1=h924138e_0
77-
- openssl=3.1.1=hd590300_1
70+
- openssl=3.1.3=hd590300_0
7871
- palp=2.20=h36c2ea0_0
7972
- patch=2.7.6=h7f98852_1002
80-
- pixman=0.40.0=h36c2ea0_0
8173
- pkg-config=0.29.2=h36c2ea0_1008
8274
- planarity=3.0.0.5=h36c2ea0_1002
8375
- primesieve=11.1=h59595ed_0
84-
- pthread-stubs=0.4=h36c2ea0_1001
85-
- qd=2.3.22=h2cc385e_1004
8676
- qhull=2020.2=h4bd325d_2
87-
- rhash=1.4.3=h166bdaf_0
88-
- sed=4.8=he412f7d_0
77+
- rhash=1.4.4=hd590300_0
8978
- symmetrica=3.0.1=hcb278e6_0
90-
- xorg-kbproto=1.0.7=h7f98852_1002
91-
- xorg-libice=1.0.10=h7f98852_0
92-
- xorg-libxau=1.0.11=hd590300_0
93-
- xorg-libxdmcp=1.1.3=h7f98852_0
94-
- xorg-renderproto=0.11.1=h7f98852_1002
95-
- xorg-xextproto=7.3.0=h0b41bf4_1003
96-
- xorg-xproto=7.0.31=h7f98852_1007
79+
- tbb=2021.7.0=h924138e_0
9780
- xz=5.2.6=h166bdaf_0
9881
- cddlib=1!0.94m=h9202a9a_0
9982
- ecm=7.0.4=h9202a9a_1002
10083
- expat=2.5.0=hcb278e6_1
101-
- gcc_impl_linux-64=12.3.0=he2b93b0_0
84+
- gcc_impl_linux-64=12.3.0=he2b93b0_2
10285
- givaro=4.1.1=h192cbe9_1
10386
- glpk=5.0=h445213a_0
104-
- libblas=3.9.0=17_linux64_openblas
10587
- libedit=3.1.20191231=he28a2e2_2
88+
- libgfortran-ng=13.2.0=h69a702a_2
10689
- libhomfly=1.02r6=h36c2ea0_0
10790
- libnghttp2=1.52.0=h61bc06f_0
10891
- libpng=1.6.39=h753d276_0
109-
- libsqlite=3.42.0=h2797004_0
92+
- libsqlite=3.43.0=h2797004_0
11093
- libssh2=1.11.0=h0841786_0
111-
- libxcb=1.15=h0b41bf4_0
11294
- libxml2=2.10.4=hfdac1af_0
11395
- mpfr=4.2.0=hb012696_0
11496
- ntl=11.4.3=hef3c4d3_1
115-
- openblas=0.3.23=pthreads_h855a84d_0
116-
- pcre2=10.40=hc3806b6_0
11797
- perl=5.32.1=4_hd590300_perl5
11898
- primecount=7.9=hcb278e6_0
11999
- readline=8.2=h8228510_1
120-
- tar=1.34=hb2e2bae_1
121-
- tk=8.6.12=h27826a3_0
122-
- xorg-libsm=1.2.3=hd9c2040_1000
100+
- tk=8.6.13=h2797004_0
123101
- zeromq=4.3.4=h9c3ff4c_1
124102
- zlib=1.2.13=hd590300_5
125-
- zstd=1.5.2=hfc55251_7
103+
- zstd=1.5.5=hfc55251_0
126104
- autoconf=2.71=pl5321h2b4cb7a_1
127-
- boost-cpp=1.82.0=he19a28c_1
128-
- bwidget=1.9.14=ha770c72_1
129105
- ecl=21.2.1=h9d73b02_2
130-
- fplll=5.4.4=h8780c30_0
131-
- freetype=2.12.1=hca18f0e_1
132-
- gcc=12.3.0=h8d2909c_1
133-
- gcc_linux-64=12.3.0=h76fc315_1
106+
- freetype=2.12.1=h267a509_2
107+
- gcc=12.3.0=h8d2909c_2
108+
- gcc_linux-64=12.3.0=h76fc315_2
134109
- gfan=0.6.2=hb86e20a_1003
135-
- gfortran_impl_linux-64=12.3.0=hfcedea8_0
136-
- gxx_impl_linux-64=12.3.0=he2b93b0_0
137-
- krb5=1.20.1=h81ceb04_0
138-
- libcblas=3.9.0=17_linux64_openblas
110+
- gfortran_impl_linux-64=12.3.0=hfcedea8_2
111+
- krb5=1.21.2=h659d440_0
112+
- libboost=1.82.0=h1bacd13_2
139113
- libflint=2.9.0=h2f819a4_ntl_100
140-
- libglib=2.76.4=hebfc3b9_0
141-
- libhwloc=2.9.1=hd6dc26d_0
142-
- liblapack=3.9.0=17_linux64_openblas
143-
- libtiff=4.5.1=h8b53f26_0
144-
- llvm-openmp=16.0.6=h4dfa4b3_0
114+
- libopenblas=0.3.24=pthreads_h413a1c8_0
115+
- libtiff=4.5.1=h8b53f26_1
116+
- llvm-openmp=17.0.2=h4dfa4b3_0
145117
- m4ri=20140914=h7ca028e_1005
146118
- mpc=1.3.1=hfe3b2da_0
147119
- mpfi=1.5.4=h9f54685_1001
148120
- pari=2.15.4=h4d4ae9b_2_pthread
149121
- ppl=1.2=h6ec01c2_1006
150-
- python=3.11.4=hab00c5b_0_cpython
151-
- sqlite=3.42.0=h2c6b66d_0
122+
- python=3.10.12=hd12c33a_0_cpython
123+
- qd=2.3.22=h2cc385e_1004
124+
- sqlite=3.43.0=h2c6b66d_0
152125
- tachyon=0.99b6=0
153126
- texinfo=7.0=pl5321h0f457ee_0
154-
- tktable=2.10=hb7b940f_3
155-
- xorg-libx11=1.8.6=h8ee46fc_0
156127
- appdirs=1.4.4=pyh9f0ad1d_0
157128
- arb=2.23.0=h44d021b_0
158-
- arpack=3.7.0=hdefa2d7_2
159129
- automake=1.16.5=pl5321ha770c72_0
160130
- c-compiler=1.6.0=hd590300_0
161131
- cachetools=5.3.1=pyhd8ed1ab_0
162-
- chardet=5.1.0=py311h38be061_0
132+
- chardet=5.2.0=py310hff52083_1
163133
- colorama=0.4.6=pyhd8ed1ab_0
164134
- distlib=0.3.7=pyhd8ed1ab_0
165135
- eclib=20230424=hdef1efb_0
166-
- fflas-ffpack=2.4.3=h912ac81_2
167-
- filelock=3.12.2=pyhd8ed1ab_0
136+
- filelock=3.12.4=pyhd8ed1ab_0
168137
- fontconfig=2.14.2=h14ed4e7_0
169-
- gfortran=12.3.0=h499e0f7_1
170-
- gfortran_linux-64=12.3.0=h7fe76b4_1
171-
- gsl=2.7=he838d99_0
172-
- gxx=12.3.0=h8d2909c_1
173-
- gxx_linux-64=12.3.0=h8a814eb_1
174-
- iml=1.0.5=hd75c201_1003
138+
- fplll=5.4.4=h8780c30_0
139+
- gfortran=12.3.0=h499e0f7_2
140+
- gfortran_linux-64=12.3.0=h7fe76b4_2
175141
- lcalc=2.0.5=h6a8a7c6_1
176-
- libbrial=1.2.12=h138cd66_0
177-
- libcurl=8.1.2=h409715c_0
178-
- liblapacke=3.9.0=17_linux64_openblas
142+
- libblas=3.9.0=18_linux64_openblas
143+
- libboost-devel=1.82.0=h00ab1b0_2
144+
- libbrial=1.2.12=h3155cbd_1
145+
- libcurl=8.3.0=hca28451_0
179146
- libwebp=1.3.1=hbf2b3c1_0
180147
- m4rie=20150908=h7ca028e_1001
181-
- markupsafe=2.1.3=py311h459d7ec_0
182148
- maxima=5.45.0=h9d73b02_3
183-
- packaging=23.1=pyhd8ed1ab_0
184-
- pluggy=1.2.0=pyhd8ed1ab_0
185-
- pycparser=2.21=pyhd8ed1ab_0
186-
- pytz=2023.3=pyhd8ed1ab_0
187-
- simplegeneric=0.8.1=py_1
149+
- openblas=0.3.24=pthreads_h7a3da1a_0
150+
- packaging=23.2=pyhd8ed1ab_0
151+
- pluggy=1.3.0=pyhd8ed1ab_0
188152
- singular=4.2.1.p3=h1ea75ed_2
189153
- sympow=2.023.6=hc6ab17c_3
190-
- tbb=2021.9.0=hf52228f_0
191-
- toml=0.10.2=pyhd8ed1ab_0
192154
- tomli=2.0.1=pyhd8ed1ab_0
193-
- typing_extensions=4.7.1=pyha770c72_0
194-
- tzlocal=5.0.1=py311h38be061_0
195-
- xorg-libxext=1.3.4=h0b41bf4_2
196-
- xorg-libxrender=0.9.11=hd590300_0
197-
- xorg-libxt=1.3.0=hd590300_0
198-
- zipp=3.16.2=pyhd8ed1ab_0
199-
- blas-devel=3.9.0=17_linux64_openblas
200-
- brial=1.2.12=pyha3edaa6_0
201-
- cairo=1.16.0=hbbf8b49_1016
202-
- cffi=1.15.1=py311h409f033_3
203-
- cmake=3.26.4=hcfe8598_0
204-
- curl=8.1.2=h409715c_0
205-
- cxx-compiler=1.6.0=h00ab1b0_0
155+
- typing_extensions=4.8.0=pyha770c72_0
156+
- zipp=3.17.0=pyhd8ed1ab_0
157+
- boost-cpp=1.82.0=h789c474_2
158+
- brial=1.2.12=pyh694c41f_1
159+
- cmake=3.27.6=hcfe8598_0
160+
- curl=8.3.0=hca28451_0
206161
- fortran-compiler=1.6.0=heb67821_0
207-
- giac=1.9.0.21=h673759e_1
208162
- importlib-metadata=6.8.0=pyha770c72_0
209-
- jinja2=3.1.2=pyhd8ed1ab_1
163+
- libcblas=3.9.0=18_linux64_openblas
210164
- libgd=2.3.3=hfa28ad5_6
211-
- linbox=1.6.3=h9d78c56_7
212-
- pyproject-api=1.5.3=pyhd8ed1ab_0
165+
- liblapack=3.9.0=18_linux64_openblas
166+
- pyproject-api=1.6.1=pyhd8ed1ab_0
167+
- typing-extensions=4.8.0=hd8ed1ab_0
168+
- arpack=3.7.0=hdefa2d7_2
169+
- fflas-ffpack=2.4.3=h912ac81_2
170+
- gsl=2.7=he838d99_0
171+
- iml=1.0.5=hd75c201_1003
172+
- importlib_metadata=6.8.0=hd8ed1ab_0
173+
- liblapacke=3.9.0=18_linux64_openblas
174+
- platformdirs=3.11.0=pyhd8ed1ab_0
213175
- suitesparse=5.10.1=h9e50725_1
214-
- typing-extensions=4.7.1=hd8ed1ab_0
215-
- blas=2.117=openblas
216-
- compilers=1.6.0=ha770c72_0
217-
- harfbuzz=7.3.0=hdb3a94d_0
176+
- blas-devel=3.9.0=18_linux64_openblas
177+
- giac=1.9.0.21=h673759e_1
218178
- igraph=0.9.10=ha1f048c_1
219-
- importlib_metadata=6.8.0=hd8ed1ab_0
220-
- platformdirs=3.9.1=pyhd8ed1ab_0
221-
- pango=1.50.14=heaa33ce_1
179+
- linbox=1.6.3=h9d78c56_7
180+
- virtualenv=20.24.4=pyhd8ed1ab_0
181+
- blas=2.118=openblas
222182
- rw=0.9=h7f98852_0
223-
- virtualenv=20.24.1=pyhd8ed1ab_0
224-
- r-base=4.3.0=h0fc540b_0
225-
- tox=4.6.4=pyhd8ed1ab_0
226-
- rpy2=3.5.11=py311r43h1f0f07a_2
183+
- tox=4.11.3=pyhd8ed1ab_0

0 commit comments

Comments
 (0)