Bug Fix: anaDACScan.py capitalization inconsistency and file extension problem

AndrewLevin commented 6 years ago

The name of the .rst file associated with anaDACScan.py should be consistent with the the index rst file. Also, the file extension .py should not be used to identify the script in that file.

Description

The name of the file .rst file associated with anaDACScan.py was changed from anaDACscan.rst to anaDACScan.rst. Also, in that file anaDACScan.py was changed to anaDACScan in the first line.

Types of changes

[x] Bug fix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Breaking change (fix or feature that would cause existing functionality to change)

Motivation and Context

The rpm does not compile due to this bug, as reported in https://github.com/cms-gem-daq-project/gem-plotting-tools/issues/164

How Has This Been Tested?

Yes, I have checked that the rpm compiles now.

Screenshots (if appropriate):

Checklist:

[x] My code follows the code style of this project.
[ ] My change requires a change to the documentation.
[ ] I have updated the documentation accordingly.
[ ] I have added tests to cover my changes.
[ ] All new and existing tests passed.

bdorney commented 6 years ago

This is out of date with HEAD of develop. You need to rebase off develop after updating your local develop.

Also please show this actually does compile, i.e. with terminal output.

jsturdy commented 6 years ago

This is out of date with HEAD of develop.

This is OK, provided no conflicts, the maintainer will have the option to rebase and merge.

Currently this fails on travis, due to sphinx.ext.pngmath error, following up with @lmoureaux as in #166. It compiled locally, so might just need to update the docker image, or (preferred) remove yet another added dependency (these need to be kept to a bare minimum, not adding everything we like for some feature)

AndrewLevin commented 6 years ago

I have rebased off of the HEAD of develop. Here is the output of make rpm:

PythonModules=["gempython.gemplotting", "gempython.gemplotting.utils", "gempython.gemplotting.fitting", "gempython.gemplotting.macros", "gempython.gemplotting.mapping" ]
Using BUILD_HOME=/home/amlevin
OS Detected: centos7
BUILD_VERSION 0.0.6.365.dev5
PREREL_VERSION -dev6.dev365
mkdir -p pkg/gempython/gemplotting
python /usr/bin/sphinx-build -b man -d /home/amlevin/gem-plotting-tools/doc/_build/doctrees   /home/amlevin/gem-plotting-tools/doc /home/amlevin/gem-plotting-tools/doc/_build/man
Running Sphinx v1.1.3
loading pickled environment... done
building [man]: all manpages
updating environment: 0 added, 0 changed, 0 removed
looking for now-outdated files... none found
writing... gemplotting.1 { setup coding virtualenv-p5 scandate-list-formats masking analyzing-scans scurve-plotting-tools man-index man/plot_eff man/anaDACScan man/gemPlotter man/gemTreeDrawWrapper man/gemSCurveAnaToolkit man/plotSCurveFitResults man/timeHistoryAnalyzer man/clusterAnaScurve man/packageFiles4Docker modules-index modules/fitting/fitScanData modules/mapping/PanChannelMaps modules/mapping/amcInfo modules/mapping/chamberInfo modules/mapping/channelMaps modules/utils/anaInfo modules/utils/anahistory modules/utils/anaoptions modules/utils/anautilities } gemPlotter.py.1 { } gemSCurveAnaToolkit.py.1 { } gemTreeDrawWrapper.py.1 { } packageFiles4Docker.py.1 { } plotSCurveFitResults.py.1 { } plot_eff.py.1 { } anaDACScan.py.1 { } timeHistoryAnalyzer.py.1 { } clusterAnaScurve.py.1 { } 
build succeeded.
...
...
...
warning: File listed twice: /usr/lib/python2.7/site-packages/gempython/scripts/packageFiles4Docker.py
warning: File listed twice: /usr/lib/python2.7/site-packages/gempython/scripts/packageFiles4Docker.py
warning: Ignoring invalid regex ^%{_scl_prefix}/.*$|%{_root_sysconfdir}/rpm/macros.rh-ruby24-config$
Provides: config(gempython_gemplotting) = 1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7 gempython_gemplotting = 1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7
Requires(interp): /bin/sh
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PartialHardlinkSets) <= 4.0.4-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Requires(post): /bin/sh
Requires: /bin/env /usr/bin/env python(abi) = 2.7
Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/amlevin/gem-plotting-tools/rpm/build/bdist.linux-x86_64/rpm/BUILDROOT/gempython_gemplotting-1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7.x86_64
Wrote: /home/amlevin/gem-plotting-tools/rpm/build/bdist.linux-x86_64/rpm/SRPMS/gempython_gemplotting-1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7.src.rpm
Wrote: /home/amlevin/gem-plotting-tools/rpm/build/bdist.linux-x86_64/rpm/RPMS/noarch/gempython_gemplotting-1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7.noarch.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.fOlj6R
+ umask 022
+ cd /home/amlevin/gem-plotting-tools/rpm/build/bdist.linux-x86_64/rpm/BUILD
+ cd gempython_gemplotting-1.0.0
+ rm -rf /home/amlevin/gem-plotting-tools/rpm/build/bdist.linux-x86_64/rpm/BUILDROOT/gempython_gemplotting-1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7.x86_64
+ exit 0
Executing(--clean): /bin/sh -e /var/tmp/rpm-tmp.5z5xIT
+ umask 022
+ cd /home/amlevin/gem-plotting-tools/rpm/build/bdist.linux-x86_64/rpm/BUILD
+ rm -rf gempython_gemplotting-1.0.0
+ exit 0
moving build/bdist.linux-x86_64/rpm/SRPMS/gempython_gemplotting-1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7.src.rpm -> dist
moving build/bdist.linux-x86_64/rpm/RPMS/noarch/gempython_gemplotting-1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7.noarch.rpm -> dist
Running _rpmall target
find /home/amlevin/gem-plotting-tools/rpm/dist \( -iname "*.tar.gz" \
-o -iname "*.tar.bz2" \
-o -iname "*.tgz" \
-o -iname "*.zip" \
-o -iname "*.tbz2" \) -print0 -exec mv -t /home/amlevin/gem-plotting-tools/rpm/ {} \+
/home/amlevin/gem-plotting-tools/rpm/dist/gempython_gemplotting-1.0.0-dev6.dev365.tar.gz/home/amlevin/gem-plotting-tools/rpm/dist/gempython_gemplotting-1.0.0-dev6.dev365.zip/home/amlevin/gem-plotting-tools/rpm/dist/gempython_gemplotting-1.0.0-dev6.dev365.tar.bz2/home/amlevin/gem-plotting-tools/rpm/dist/gempython_gemplotting-1.0.0.tar.gzrename tar. t /home/amlevin/gem-plotting-tools/rpm/*tar*
Running rpm target
find /home/amlevin/gem-plotting-tools/rpm/dist -iname "*.rpm" -print0 -exec mv -t /home/amlevin/gem-plotting-tools/rpm {} \+
/home/amlevin/gem-plotting-tools/rpm/dist/gempython_gemplotting-1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7.noarch.rpm/home/amlevin/gem-plotting-tools/rpm/dist/gempython_gemplotting-1.0.0-0.0.6.365.dev5.6d0755dgit.centos7.python2.7.src.rpm

bdorney commented 6 years ago

Can you also resolve https://github.com/cms-gem-daq-project/gem-plotting-tools/issues/167

AndrewLevin commented 6 years ago

Yes, I just made a PR: https://github.com/cms-gem-daq-project/gem-plotting-tools/pull/168

cms-gem-daq-project / gem-plotting-tools