Commit Graph

186 Commits

Author SHA1 Message Date
Sylvain Tricot c9aa391634 Merge branch 'hotfix/1.7.post13' 2023-03-29 11:45:01 +02:00
Sylvain Tricot cf74431c31 Fix new dtype values for Numpy.
Numpy does not allow anylonger types np.int or np.float.
These are replaced simply by int and float python native types.
2023-03-29 11:41:52 +02:00
Sylvain Tricot 0699f193b3 Merge branch 'hotfix/1.7.post12' 2022-10-06 18:24:31 +02:00
Sylvain Tricot 2bdc9943b9 Fix numpy bug with alen()
* The numpy.alen() function is deprecated. We use len() instead
* The use of pkg_resources is discouraged. We use importlib.metadata
  instead. I also removed setuptools_scm get_version. I switch to
  a simple call to "git describe", easier now that we use git flow
* The build fails with python3.10 if compiling wx from sources.
  A fix in the Makefile will be proposed in a future commit.
2022-10-06 18:19:16 +02:00
Sylvain Tricot b6f2531999 Merge branch 'hotfix/1.7.post11' 2022-10-05 13:44:04 +02:00
Sylvain Tricot a4351f5606 Add a "light" installation of msspec
This is similar to a "devel" installation, but only the
virtualenv is created and the msspec package is installed
inside (not in edit mode). Bindings to the Fortran code
are not built.

It is intended to use msspec functions to create clusters but
without having to install wx.
2022-10-05 13:40:22 +02:00
Sylvain Tricot 74ca8f467f Removed malloc NPH_M parameter.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
In get_theta_phi_scan, the malloc keyword was given
with NPH_M=8000. It was enough for most of calculations
but it was also impossible to change in cases where more
memory was needed. The keyword is now removed so that
it can be direclty specified by the user if needed.
The default value was increased to 8000 instead of 2000.
2021-12-13 18:51:12 +01:00
Sylvain Tricot 38023dcd52 Bug in matplotlib 3.5.0
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
There is presumably a bug when using pcolormesh
with msspec in matplotlib 3.5.0. The stereo projection
does not work properly and the CPU is rising at 100% as
well as the memory usage. Meanwhile, the event loop of Wx
is affected freezing the GUI. Reverting to last stable 3.4.3
version fixes the problem for now. A true fix should be found
asap.
2021-12-02 12:20:40 +01:00
Sylvain Tricot 75c599de95 Added 'other_parameters' keyword in _get_scan.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
This allows to set or modify any option right before runing
Phagen and Spec. Mostly for debug purposes.
2021-11-30 17:53:47 +01:00
Sylvain Tricot e36373a576 Fixed bug in 'mean_free_path' option.
It was impossible to enter a numerical value.
The 'allowed_values' keyword was set in the definition
of the 'mean_free_path' parameter, I commented it to
allow any value for this option.
2021-11-30 16:56:20 +01:00
Sylvain Tricot 8269d35420 Updated venv target in Makefile.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
The 'venv' target has been modified to ensure that
setuptools is at the latest version, otherwise the
docker image could not be created.

Dockerfile was modified to pull the master branch
instead of the devel one.
2021-09-27 15:50:52 +02:00
Sylvain Tricot d6882b57b9 Tried to fix the broken 'syncing website' stage.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
This last stage is not working due to permission
issues on the server side. I tried to just update
existing files instead of removing everything and
copying new files. Let's see...
2021-09-27 14:17:25 +02:00
Sylvain Tricot e1659db33b Updated the git repo link in 'install section'
The previous link pointed to the devel branch of the repo.
Replaced by the master branch
2021-09-27 14:16:07 +02:00
Sylvain Tricot 89b2a378a5 Fixed bug in copper tutorial.
In the first example lines of the copper tutorial, the line
'view(cluster)' raised an error since the 'cluster' variable
was not yet declared. Replaced by 'view(copper)'.
2021-09-27 14:14:27 +02:00
Sylvain Tricot 4d3ac28343 Added the syncing website section in CI
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
A stage to update the website was added to the
Jenkinsfile.
2021-09-24 17:02:03 +02:00
Sylvain Tricot bdbd320bf4 Modified JenkinsFile.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
2021-09-24 16:50:08 +02:00
Sylvain Tricot 75784d4c01 Merge branch 'devel'
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-09-24 16:36:53 +02:00
Sylvain Tricot 58194a38dd Updated CI Jenkinsfile.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-09-24 16:34:13 +02:00
Sylvain Tricot 85d8936f8e Merge branch 'master' of https://git.ipr.univ-rennes1.fr/epsi/msspec_python3 2021-09-24 16:32:33 +02:00
Sylvain Tricot 419c55b744 Removed pdf building of the documentation.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
For the moment, the building of the pdf from the
website is deactivated. It may be activated again
in future commits.
2021-09-24 16:14:50 +02:00
Sylvain Tricot b011e4348c Updated documentation and tutorials.
Download and install section contains now information about
how to install MsSpec using Docker.
Tutorials have been updated a bit.
2021-09-24 16:13:14 +02:00
Sylvain Tricot 08c6ea7a34 Updated installation instructions.
The README.md file contains now more information on how to
install MsSpec (compilation and Python package) either in
standard or devel mode.
2021-09-24 16:04:34 +02:00
Sylvain Tricot 8c04b700f1 Added Windows Docker frontend files.
The Powershell script (*.ps1) equivalent to the Linux Bash script is
used under Windows as a frontend to the Docker image of MsSpec.
It is converted to an *.exe file (msspec.exe) which is installed
by the setup program (msspec_setup.exe) created by Inno Setup using
the *.iss scripts. The end user will just download the msspec_setup.exe
file.
2021-09-24 15:39:05 +02:00
Sylvain Tricot 928771ac4e Changed mode of msspec docker frontend. 2021-09-23 16:55:16 +02:00
Sylvain Tricot 13f0001dde Change how pip is installed in Makefile
Previously, the ensurepip method was used
but it is not working as expected in some
Python distributions were it is not included.
Falling back to the bootstraping get-pip.py is
safer.
2021-09-23 16:53:02 +02:00
Sylvain Tricot dfa693dfb6 Change the "uninstall" option name to "-u"
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
The script for dockerized MsSpec could be uninstalled
with the "msspec uninstall" command whereas it is
"msspec -u" for the non containered version. It is
now "-u" for both scripts.
2021-09-22 14:29:59 +02:00
Sylvain Tricot 34d0e720f5 Add the frontend to the linux dockerized MsSpec.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
This script is the frontend of the dockerized MsSpec
for Linux. The user has just to download it, make it
executable and place it in the $PATH to run MsSpec.
2021-09-21 17:52:10 +02:00
Sylvain Tricot a57b8d138b Fix bug in "msspec -p" command.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
When using python options (like "-c" for example), all
arguments from the command line were not passed to the
launch_script function because of missing double quotes
around the $@ array.
2021-09-20 11:17:26 +02:00
Sylvain Tricot 230340b1fd Work on docker support.
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
pip was not the default script in the virtualenv in the docker image (pip3 was).
So we had to use "ensurepip" as recommended by the pip team.

The Dockerfile was a bit simplified.
2021-09-17 11:55:23 +02:00
Sylvain Tricot 4b23806482 Specify gfortran executables for f2py3
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-07-21 23:06:41 +02:00
Sylvain Tricot df5c0de8b7 Fix bug, the rank was not set properly 2021-07-21 23:06:12 +02:00
Sylvain Tricot 391c4629a7 Split wx target to avoid compiling two times 2021-07-21 23:05:34 +02:00
Sylvain Tricot 0e04dd4a75 Remove config of logging in looper
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
Because it overriveded the global logging level...
2021-07-21 10:45:34 +02:00
Sylvain Tricot 74f970e7dd Add pandas to the list
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-07-20 16:48:29 +02:00
Sylvain Tricot 3743cb8d17 Changed return values of Looper.run
Instead of returning a panda dataframe, return both a list
of [x0, y0, x1, y1,...] values for all the calculations and the
corresponding dict of parameters
2021-07-20 16:45:37 +02:00
Sylvain Tricot c2b9e9a572 Changed installation instructions. 2021-07-20 16:42:46 +02:00
Sylvain Tricot 7ebd1d25e2 Work on documentation:installation section
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-07-05 17:50:49 +02:00
Sylvain Tricot d520405a73 Concatenated the last RUN in a single one.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
2021-07-02 18:21:10 +02:00
Sylvain Tricot ac3b0a2ad5 Remove coverage report page for the moment.
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
2021-06-30 17:08:43 +02:00
Sylvain Tricot c9f4236cb1 Remove tutorial pages for Les Houches
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
The index.rst has been renamed to index.rst.hidden to
hide the tutorials section from the website for les Houches school.
A warning message has been added at the top of the downlod section
to tell that this page is deprecated.
2021-06-30 16:42:28 +02:00
Sylvain Tricot 36fdfd6f93 work on Jenkinsfile 2021-06-30 16:28:10 +02:00
Sylvain Tricot c9243362cd work on Jenkinsfile
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
2021-06-30 16:18:47 +02:00
Sylvain Tricot 6a449eec75 work on Jenkinsfile
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-06-30 16:12:48 +02:00
Sylvain Tricot 72d932f1e9 work on Jenkinsfile
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
2021-06-30 15:34:34 +02:00
Sylvain Tricot 2784227bd3 Added the build code target
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-06-30 15:31:55 +02:00
Sylvain Tricot a33a42e9db Fix bug in build doc target
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
There was no closing single quote
2021-06-30 15:25:14 +02:00
Sylvain Tricot 16a550ee26 Changes the build doc target
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-06-30 15:21:29 +02:00
Sylvain Tricot de85a3f0c7 Merge branch 'devel' of https://git.ipr.univ-rennes1.fr/epsi/msspec_python3 into devel
epsi-builds/msspec_python3/pipeline/head There was a failure building this commit Details
2021-06-30 15:04:08 +02:00
Sylvain Tricot c3ab5d5a07 Add the build doc target in Jenkins 2021-06-30 15:02:54 +02:00
Sylvain Tricot 70f0433bf6 Small changes on DockerFile
epsi-builds/msspec_python3/pipeline/head This commit looks good Details
2021-06-30 12:44:06 +02:00