Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Hotfix 2.8.4 #1223

Merged
merged 16 commits into from
Nov 14, 2019
Merged

Hotfix 2.8.4 #1223

merged 16 commits into from
Nov 14, 2019

Conversation

amilan
Copy link

@amilan amilan commented Nov 6, 2019

Hotfix to add the fixes to the broken fscan macro (#1218, #1220 )

amilan and others added 10 commits November 5, 2019 17:31
Fixing the FScan macro which was trying to use the sscan as a
deterministic macro without being ready/supported.
Since we are going to document the API of the deterministic scans
it is a good moment to unify naming in sardana and use nb instead
of nr for number.
nr_points was renamed to nb_points, however nr_points was a public API
before. Provide a backwards compatibility property withs simultaneous
deprecation log.
@amilan
Copy link
Author

amilan commented Nov 6, 2019

Hi,

This is a PR to create a new hotfix release including the fixes for the broken fscan macro.

It is in WIP because I cannot make the makeman script from taurus work to update the versions of the documentation pages.

Any help/feedback will be welcome.

@reszelaz
Copy link
Collaborator

reszelaz commented Nov 6, 2019

Thanks for working on the hot fix!
Could you please post here the error from makeman? Some ideas of what may go wrong: Do you have help2man installed? Have you seen that there is a known issue with generating man for Spock?

@amilan
Copy link
Author

amilan commented Nov 7, 2019

Hi,
Thanks for the ideas, unfortunately I have to answer yes to both of them.
I'm running the script from the doc folder and the output that I got is the following:

Installing diffractometeralignment script to /tmp/tmp.XtTvSFtQSs/bin
rm: cannot remove ‘/projects/tmp/sardana/sardana/doc/*.1’: No such file or directory
/tmp/tmp.XtTvSFtQSs/bin
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/diffractometeralignment.1 --version-string= ./diffractometeralignment
help2man: can't get `--help' info from ./diffractometeralignment
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/hklscan.1 --version-string= ./hklscan
help2man: can't get `--help' info from ./hklscan
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/macroexecutor.1 --version-string= ./macroexecutor
help2man: can't get `--help' info from ./macroexecutor
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/MacroServer.1 --version-string= ./MacroServer
help2man: can't get `--help' info from ./MacroServer
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/Pool.1 --version-string= ./Pool
help2man: can't get `--help' info from ./Pool
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/Sardana.1 --version-string= ./Sardana
help2man: can't get `--help' info from ./Sardana
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/sardanatestsuite.1 --version-string= ./sardanatestsuite
help2man: can't get `--help' info from ./sardanatestsuite
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/sequencer.1 --version-string= ./sequencer
help2man: can't get `--help' info from ./sequencer
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/spock.1 --version-string= ./spock
help2man: can't get `--help' info from ./spock
Try `--no-discard-stderr' if option outputs to stderr
--------------------
help2man -N -o /projects/tmp/sardana/sardana/doc/man/ubmatrix.1 --version-string= ./ubmatrix
help2man: can't get `--help' info from ./ubmatrix
Try `--no-discard-stderr' if option outputs to stderr

(I removed the part of moving and installing things from this output)

@reszelaz
Copy link
Collaborator

reszelaz commented Nov 7, 2019

Which version of help2man do you use? I use: GNU help2man 1.47.4.

But I would not worry too much about it. To unblock you I've recreated the manpages and pushed them to your branch.

Actually I think that these man pages do not add too much value and make the release and hotfix process more complicated. Personally I'm more used to see the help with --help.
This may come from the way how Debian packages are created, maybe @cpascual could advice whether we could get rid of them in the upstream release process?

@amilan
Copy link
Author

amilan commented Nov 7, 2019

Thanks a lot @reszelaz!

I'm using help2man 1.47.8 in CentOS and I also tried with the version 1.47.11 in macOS. Both with the same results.

Anyway, thanks for generating the man pages.

@amilan
Copy link
Author

amilan commented Nov 8, 2019

Now that the man pages are updated I think I can remove the WIP statement.

@amilan amilan changed the title WIP: Hotfix 2.8.4 Hotfix 2.8.4 Nov 8, 2019
CHANGELOG.md Show resolved Hide resolved
amilan and others added 2 commits November 13, 2019 14:32
Updating CHANGELOG.md with missing fixes added to the release.
Copy link
Collaborator

@reszelaz reszelaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for updating the CHANGELOG. I just modified the date of the release to today. You can proceed with the rest of the hotfix release process.

@reszelaz reszelaz mentioned this pull request Nov 13, 2019
Fixing an small issue with flake8.
@reszelaz reszelaz merged commit 35941b1 into sardana-org:master Nov 14, 2019
@reszelaz
Copy link
Collaborator

I just realized that the hotfix process was not finished. Since this was not a normal hotfix but more a backport of a fix from the develop branch I had to proceed differently finish with the hotfix process. I just manually added 2.8.4. release to the CHANGELOG.md and now the process is completed.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants