Closed mrakitin closed 1 year ago
@gfreychet, @tacaswell, looks good so far! The logs show it picked up the versions from GitHub. The pyFAI one does not use the versioneer, so the version format is different.
Successfully built pyFAI smi-analysis
Installing collected packages: pyzbar, setuptools, mimesis, pyFAI, pygix, smi-analysis
Attempting uninstall: setuptools
Found existing installation: setuptools 65.4.1
Uninstalling setuptools-65.4.1:
Successfully uninstalled setuptools-65.4.1
Attempting uninstall: pyFAI
Found existing installation: pyFAI 0.21.3
Uninstalling pyFAI-0.21.3:
Successfully uninstalled pyFAI-0.21.3
Successfully installed mimesis-6.1.1 pyFAI-0.22.0a10 pygix-2021.10.7.1 pyzbar-0.1.9 setuptools-59.8.0 smi-analysis-0.1.0.post28+g994316b
Force push 1: to rebase on main
to resolve the conflicts caused by #50 and #52.
Force push 2: excluded accidentally committed .DS_Store
file.
Thanks for merging, @danielballan!
Requested by @gfreychet.
xref https://github.com/NSLS-II-SMI/smi-analysis/pull/11/files#diff-e285c1b9901cd202e89d9f37e3249a6fee524a65428895e1a45fd062cc0f9aca