diff --git a/make.bat b/make.bat index 4e80dd2..8f9a14f 100755 --- a/make.bat +++ b/make.bat @@ -1,3 +1,7 @@ +:: Make sure to use conda version 4.6.14 or lower +:: mingwpy just runs in Python 3.4, newer versions of Conda +:: dont support it + :: Install py37 for site-packages: call conda create -p py37 -qy python=3.7 wheel || goto :error call conda activate .\py37 || goto :error @@ -26,10 +30,11 @@ call move pkg\Lib\site-packages\cpymad pkg\ call move pkg\Lib\site-packages\hit_acs pkg\ :: Performance tweaks: remove .py files and zip up pure thirdparty packages: -call pip install distlib || goto :error -call python minify.py pkg\Lib\site-packages || goto :error -call python purelib.py pkg\Lib\site-packages || goto :error -call move purelib.zip pkg +:: call pip install distlib || goto :error +:: call python minify.py pkg\Lib\site-packages || goto :error +:: call python purelib.py pkg\Lib\site-packages || goto :error +:: call move purelib.zip pkg +:: This actually didnt work last time :: Install py34 for mingwpy: call conda create -p py34 -qy python=3.4 -c conda-forge || goto :error diff --git a/requirements.txt b/requirements.txt index db5248d..5030ddf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ cpymad==1.4.1 minrpc==0.0.11 -madgui==19.8.0 -hit_acs==19.8.00 +madgui==20.2.1 +hit_acs==20.1.0