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.

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

Switching windows to Python 3.10 #2197

Merged
merged 3 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Note all install methods after "main" take
<tensorflow source="pip">2.13</tensorflow>
<grpcio source="pip" />
<!-- conda is really slow on windows if the version is not specified.-->
<python skip_check='True' os='windows'>3.8</python>
<python skip_check='True' os='windows'>3.10</python>
<python skip_check='True' os='mac,linux'>3</python>
<hdf5 skip_check='True'/>
<swig skip_check='True'/>
Expand Down
12 changes: 6 additions & 6 deletions developer_tools/check_pip_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ ls -l dist
#python -m pip install -f file://${RAVEN_DIR}/dist raven_framework || exit -1

echo
echo Checking Python 3.8
echo Checking Python 3.9

conda activate python38_pip
conda activate python39_pip
python -m pip uninstall -y raven_framework || echo not installed
python -m pip install dist/raven_framework*cp38*.whl || exit -1
python -m pip install dist/raven_framework*cp39*.whl || exit -1


echo
echo Checking Python 3.9
echo Checking Python 3.10

conda activate python39_pip
conda activate python310_pip
python -m pip uninstall -y raven_framework || echo not installed
python -m pip install dist/raven_framework*cp39*.whl || exit -1
python -m pip install dist/raven_framework*cp310*.whl || exit -1
10 changes: 5 additions & 5 deletions developer_tools/make_pip_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ source $RAVEN_DIR/scripts/read_ravenrc.sh
CONDA_DEFS=$(read_ravenrc "CONDA_DEFS")
source ${CONDA_DEFS}

conda env remove --name python38_pip
conda create -y --name python38_pip python=3.8 swig

conda env remove --name python39_pip
conda create -y --name python39_pip python=3.9 swig

conda env remove --name python310_pip
conda create -y --name python310_pip python=3.10 swig

cd $RAVEN_DIR

rm -f setup.cfg
python ./scripts/library_handler.py pip --action=setup.cfg > setup.cfg

conda activate python38_pip
conda activate python39_pip
command -v python
python -m ensurepip
python -m pip install --upgrade build
python -m build

conda activate python39_pip
conda activate python310_pip
command -v python
python -m ensurepip
python -m pip install --upgrade build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ x,y,ans,accepted,solutionValue
8.84211651465,6.62051273454,-78.1951868605,rejected,-79.2905052366
5.72007624601,7.84163176218,25.6828908488,rejected,-79.2905052366
3.80592644897,0.199930488877,-8.71452482837,rejected,-79.2905052871
10.0,6.42495893539,-98.0495138479,accepted,-98.0495132805
0.0,10.0,83.9071529076,rejected,-98.049513161
0.0,0.0,-0.0,rejected,-98.049513145
10.0,0.0,-70.4041030907,rejected,-98.0495132036
10.0,1.94365430451,68.5179890856,rejected,-98.0495133219
4.6325872729,5.62179064719,10.8523413272,rejected,-98.0495133727
10.0,5.83506582109,-81.1398533776,rejected,-98.0495103864
10.0,6.31547622521,-98.4120254739,accepted,-98.4120104646
7.57086426385,6.49239697637,-5.59330429725,rejected,-98.4120098671
9.40117507901,6.21019763638,-126.539947756,accepted,-126.539941817
1.89261982758,0.0,-0.358357773233,rejected,-126.539941789
9.51058205387,6.39649094142,-129.559125869,accepted,-129.559101526
9.53225316355,6.315764934,-129.17884256,rejected,-129.559015039
6.45084229521,0.0,-40.4545804914,rejected,-129.559017878
9.47312741903,6.36427903765,-129.511939152,rejected,-129.558483669
9.49938175003,6.37565224813,-129.600910514,accepted,-129.603178374
9.49868989713,6.37662949303,-129.601762123,accepted,-129.603096098
9.49838873313,6.37697663529,-129.602027486,accepted,-129.602945709
9.49838873313,6.37697663529,-129.602945709,final,-129.602945709
10.0,6.42495890369,-98.0495141981,accepted,-98.0495136307
0.0,10.0,83.9071529076,rejected,-98.0495135111
0.0,0.0,-0.0,rejected,-98.0495134951
10.0,0.0,-70.4041030907,rejected,-98.0495135537
10.0,1.94365419972,68.5179786891,rejected,-98.049513672
4.63258874373,5.62179261825,10.8522968064,rejected,-98.0495137228
10.0,5.83506542289,-81.1398274378,rejected,-98.0495107365
10.0,6.23724545493,-97.6470240787,rejected,-98.0495170216
7.57435638089,6.49046603735,-5.44921916576,rejected,-98.0495203953
9.40062984674,6.20901282938,-126.500704167,accepted,-126.500698296
1.89249254267,0.0,-0.358036041912,rejected,-126.500698269
9.51109319967,6.39298367984,-129.564254438,accepted,-129.564229425
9.53231849718,6.31410439845,-129.164422046,rejected,-129.564136738
6.44974444029,0.0,-40.4557929424,rejected,-129.564139618
9.47285225244,6.3633614153,-129.508216964,rejected,-129.56363366
9.49856043432,6.37665037695,-129.601829018,accepted,-129.603075985
9.49828926456,6.37700808729,-129.602076502,accepted,-129.602860226
9.49818773486,6.37712659199,-129.602154658,accepted,-129.602725362
9.49818773486,6.37712659199,-129.602725362,final,-129.602725362
Original file line number Diff line number Diff line change
Expand Up @@ -16,42 +16,42 @@ x,y,ans,accepted,solutionValue
-8.00347119046,-9.36386497335,3.4789114654,accepted,3.47885336534
-8.00519814877,-9.31863097388,3.43242700123,accepted,3.43238495319
-8.03394242672,-9.1335926016,3.24955021626,accepted,3.24954768537
-8.15724354784,-8.72324870204,2.92960064463,accepted,2.92961867008
-7.37272225537,-7.85260000181,2.37567504123,accepted,2.37567624648
-7.29609904352,-7.46783586422,2.1871111235,accepted,2.18711879905
-7.26960292149,-7.33450604703,2.13385309157,accepted,2.13385792924
-7.18322877131,-6.90502906834,2.00413885825,accepted,2.00414175068
-6.47686119604,-6.12825296814,1.61927095506,accepted,1.61927138177
-5.66448913489,-5.75657062225,1.30652580984,accepted,1.30652865632
-5.15024864408,-5.54080334383,1.18111916946,accepted,1.18126472092
-4.84352166054,-5.40236312698,1.12785749694,accepted,1.12790782048
-4.18135006545,-4.69997394312,0.856021843074,accepted,0.855986882381
-3.21687884963,-3.55520572259,0.487227562774,accepted,0.487245681156
-2.02377159638,-2.09174567899,0.170529943416,accepted,0.170574895741
-1.12428010555,-1.00754526452,0.0488535498627,accepted,0.0489440348338
-0.774336699212,-0.59946379231,0.0265184112972,accepted,0.0266002547087
0.467570528693,0.282056411752,0.0142232773946,accepted,0.0141764940491
10.0,10.0,4.0,rejected,0.0141476155655
7.24194059977,9.99095815325,4.85900237165,rejected,0.0141086830348
4.06525974065,4.39683220028,0.743555074162,rejected,0.0141477139095
-0.0764759526566,-0.0895511435784,0.000318390121253,accepted,0.000246110338354
10.0,6.494806513,5.79238176434,rejected,0.000315787100759
-10.0,10.0,100.0,rejected,0.000336769762659
10.0,-10.0,100.0,rejected,0.000364790984458
0.582489015884,0.983832069693,0.0648026791414,rejected,0.000384612805458
-0.00167763930653,-0.00086969043895,2.28084231478e-07,accepted,5.39992193893e-05
-9.99996831534,-2.14442834423,16.9022407617,rejected,5.42777699071e-05
7.80897658628,7.44277849307,2.35968559087,rejected,5.54964750066e-05
-0.189142195627,-10.0,25.1014189012,rejected,5.13940462401e-05
0.407986288268,0.0136335791517,0.0406561479229,rejected,9.13780932166e-05
-0.00130799283976,-0.00118392290416,6.5944777978e-08,accepted,7.91703305971e-05
0.192334536731,-0.220198422024,0.0425536244758,rejected,9.51252114127e-05
-9.99408604315,-7.72272444864,4.42862461328,rejected,9.54512257234e-05
-2.22448857066,-1.35804723083,0.316025776532,rejected,0.000116161129705
0.288629460285,0.603139574999,0.0326816731874,rejected,0.000112030720642
-0.000783008974603,-0.00135884376711,1.28771758736e-07,accepted,0.000101433906337
1.02592648841,0.751660703644,0.0504035924264,rejected,9.24067202099e-05
0.571259466295,1.36122504578,0.193356368087,rejected,0.000130940497618
1.99792864337,1.46082563251,0.191749722475,rejected,0.000129635363152
-0.284299933857,-0.494924445967,0.0171625776165,rejected,0.000139772921173
-0.000783008974603,-0.00135884376711,0.000139772921173,final,0.000139772921173
-8.15724399541,-8.72322049758,2.92958316525,accepted,2.92960119
-7.37619376564,-7.85968636861,2.37976170893,accepted,2.37976292031
-7.30055379807,-7.47605322697,2.19118116411,accepted,2.19118891595
-7.27413687628,-7.34173544567,2.13737962896,accepted,2.13738353979
-7.18891462752,-6.91349483989,2.00774354272,accepted,2.00774613754
-6.48410484187,-6.13541603261,1.62291904244,accepted,1.62291947251
-5.67240227511,-5.76227265175,1.30953707798,accepted,1.30953993407
-5.15995152735,-5.54673728273,1.1837326579,accepted,1.18387901829
-4.85883422977,-5.410833565,1.13083658268,accepted,1.13089110959
-4.24358518342,-4.75113195253,0.873450294265,accepted,0.873413218424
-3.28508644903,-3.61246038568,0.50255494697,accepted,0.50257190918
-2.1193257028,-2.18638402592,0.186515567355,accepted,0.186559379254
-1.21950496164,-1.10540493245,0.0573067643217,accepted,0.0573918486458
-0.854979117036,-0.678145600139,0.0313222371586,accepted,0.0314265604858
0.387344698725,0.227884494509,0.0101419587842,accepted,0.010096904066
10.0,10.0,4.0,rejected,0.0100686951777
7.42797759625,10.0,4.6911688423,rejected,0.0100279457668
4.07672924921,4.41045318432,0.748165572816,rejected,0.0100623746268
-0.0590495621564,-0.0737989658879,0.000230873541644,accepted,0.00016310678662
-10.0,10.0,100.0,rejected,0.000183253276127
9.99781651662,6.49649789237,5.78543210535,rejected,0.000241490787836
10.0,-10.0,100.0,rejected,0.000270105378883
0.523429082806,0.94944251335,0.0670653681388,rejected,0.000291095452807
-0.000523412070018,-0.000406388754044,1.20689098447e-08,accepted,4.88187546814e-05
-9.99832231151,-1.96853890992,17.551413044,rejected,4.91935786702e-05
7.76755291621,7.39982930379,2.33429999786,rejected,4.97917985918e-05
-0.268063785343,-10.0,24.7319769605,rejected,4.74205339422e-05
0.479596426067,0.10672613817,0.0381958043925,rejected,8.9777662005e-05
-0.00122628600673,-0.001339392323,6.90253126119e-08,accepted,7.76746240305e-05
0.144714598859,-0.269595144983,0.0430690924686,rejected,9.93933516629e-05
-10.0,-7.80238525908,4.3766268465,rejected,9.91484376289e-05
-2.28363834836,-1.34205572653,0.353101033681,rejected,0.000118721096685
0.31849849081,0.591954084807,0.0269837293966,rejected,0.000107419468831
-0.000812946907029,-0.00153423074043,1.85155021168e-07,accepted,9.71677762198e-05
1.00299755378,0.73622524838,0.0480408252884,rejected,8.87233378624e-05
0.517921183078,1.37872137205,0.221216771151,rejected,0.000130529129688
1.9341994045,1.48646243655,0.167126372424,rejected,0.000127468391163
-0.28120605386,-0.453862490963,0.0128558189742,rejected,0.000135671481635
-0.000812946907029,-0.00153423074043,0.000135671481635,final,0.000135671481635
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ x,y,ans,accepted,solutionValue
-5.0,-5.10714285714,4.2099637918,rejected,-21.0681575311
-2.47239203902,-0.685930228241,-39.844086943,accepted,-39.8440864496
-2.48767577428,-0.696944558865,-41.1638226464,accepted,-41.1638094378
-2.67771141599,-0.876422759122,-61.4477888709,accepted,-61.4477849737
-2.79249354457,-1.23241365495,-89.0192341196,accepted,-89.0192320695
-2.7010016643,-1.53340124184,-93.0254793302,accepted,-93.0254804617
-3.04888454122,-1.49930682196,-105.678451753,accepted,-105.678447262
-3.25404862652,-1.5882004948,-105.366383217,rejected,-105.678438552
-3.13766337958,-1.54825020009,-106.627179998,accepted,-106.62713488
-3.11113174227,-1.63954206094,-106.56871884,rejected,-106.627160378
-3.1221022346,-1.58909760192,-106.787671349,accepted,-106.787519386
-0.715249189981,-2.42300359022,22.6533981195,rejected,-106.787512326
-3.11497624635,-1.58818134929,-106.782458089,rejected,-106.787175906
-3.12532595913,-1.59032455378,-106.787181525,rejected,-106.787535574
-3.12400576137,-1.58984843172,-106.787617254,rejected,-106.787606282
-3.12366944496,-1.58973147933,-106.787676367,rejected,-106.787639995
-3.12329925724,-1.58961080377,-106.787717233,rejected,-106.787657838
-3.12284555872,-1.58947174833,-106.7877334,accepted,-106.787670172
-3.12273933065,-1.5894354974,-106.787731778,accepted,-106.787681591
-3.12264279731,-1.58941535522,-106.787728755,accepted,-106.787688878
-3.12259676489,-1.58939668235,-106.787726562,accepted,-106.787692835
-3.12256872483,-1.58938490465,-106.787725018,accepted,-106.787695538
-3.12244309775,-1.58933639071,-106.787716371,accepted,-106.787697684
-3.12244313815,-1.58933638945,-106.787716373,accepted,-106.787698631
-3.12244314115,-1.58933638927,-106.787716374,accepted,-106.7876995
-3.12244314115,-1.58933638927,-106.7876995,final,-106.7876995
-2.67771141583,-0.876422758878,-61.4477888465,accepted,-61.4477849493
-2.79249292518,-1.23241441493,-89.019244074,accepted,-89.0192420238
-2.70101175003,-1.53340042228,-93.0260717216,accepted,-93.0260728529
-3.04889241552,-1.49931662152,-105.678689631,accepted,-105.67868514
-3.25405600965,-1.58820465607,-105.366226172,rejected,-105.67867643
-3.13766126054,-1.54825266142,-106.627202279,accepted,-106.627157162
-3.1111316128,-1.63954358189,-106.568706005,rejected,-106.627182661
-3.12210215287,-1.58909749771,-106.787671332,accepted,-106.787519368
-0.715245149927,-2.42301030759,22.6533113865,rejected,-106.787512285
-3.1150131645,-1.58819307703,-106.782508495,rejected,-106.787176164
-3.12577720884,-1.59050432068,-106.786955703,rejected,-106.787553627
-3.12383890158,-1.58978741459,-106.787649311,rejected,-106.787613452
-3.12382433812,-1.58978749361,-106.787651644,rejected,-106.787647149
-3.12304349213,-1.58953984651,-106.787730897,rejected,-106.787660497
-3.1228628136,-1.58948748382,-106.787733544,accepted,-106.78767254
-3.12271555878,-1.58941017727,-106.787730822,accepted,-106.787685743
-3.12263257253,-1.58940078963,-106.787728096,accepted,-106.787691592
-3.12257354237,-1.58939383181,-106.787725449,accepted,-106.787695131
-3.12248229686,-1.58935042714,-106.787719357,accepted,-106.787697508
-3.12237374203,-1.58930368072,-106.787710107,rejected,-106.78769801
-3.12244350863,-1.58933556959,-106.787716373,rejected,-106.787698919
-3.12240640433,-1.58932350842,-106.787713325,rejected,-106.787699559
-3.12248229686,-1.58935042714,-106.787699559,final,-106.787699559