Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #780 - Update do.sh #781

Merged
merged 15 commits into from
Feb 23, 2015
Merged

fix #780 - Update do.sh #781

merged 15 commits into from
Feb 23, 2015

Conversation

drtamermansour
Copy link
Member

Fix #780 :In the do.sh script, the old argument --savehash has been updated to --savetable

@ged-jenkins
Copy link

Can one of the admins verify this patch?

1 similar comment
@ged-jenkins
Copy link

Can one of the admins verify this patch?

@mr-c mr-c mentioned this pull request Feb 19, 2015
@mr-c
Copy link
Contributor

mr-c commented Feb 19, 2015

Jenkins, add to testlist

@mr-c
Copy link
Contributor

mr-c commented Feb 19, 2015

Hey, @drtamermansour can you add the line bash -ex 'cd examples/stamps/; ./do.sh' to jenkins-build.sh as part of this pull request?

@mr-c
Copy link
Contributor

mr-c commented Feb 19, 2015

You'll also need to change the mode of the 'examples/stamps/do.sh' file. This can only be done at the command line (via mode u+x examples/stamps/do.sh)

@drtamermansour
Copy link
Member Author

I can not see a special format of the jenkins-build.sh file so I just added the line of code to the end of the file. Also I assume that you meant chmod

@mr-c
Copy link
Contributor

mr-c commented Feb 19, 2015

Jenkins, test this please

@@ -64,3 +64,5 @@ if type sloccount >/dev/null 2>&1
then
make sloccount.sc
fi

bash -ex 'cd examples/stamps/; ./do.sh'
Copy link
Contributor

Choose a reason for hiding this comment

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

mea culpa; add -c after -ex

@mr-c
Copy link
Contributor

mr-c commented Feb 20, 2015

@mr-c
Copy link
Contributor

mr-c commented Feb 20, 2015

Jenkins, test this please

@drtamermansour
Copy link
Member Author

  • Is it mergable?
  • Did it pass the tests?
  • If it introduces new functionality in scripts/ is it tested?
    Check for code coverage.
  • Is it well formatted? Look at make pep8, make diff_pylint_report,
    make cppcheck, and make doc output. Use make format and manual
    fixing as needed.
  • Did it change the command-line interface? Only additions are allowed
    without a major version increment. Changing file formats also requires a
    major version number increment.
  • Is it documented in the ChangeLog?
  • Was a spellchecker run on the source code and documentation after
    changes were made?

@drtamermansour
Copy link
Member Author

When I try: make doc test pep8

This is what I get:
./setup.py build_sphinx --fresh-env
/mnt/home/mansourt/env/lib/python2.7/site-packages/setuptools/dist.py:291: UserW
arning: The version specified ('1.3-204-gd89c575-dirty') is an invalid version,
this may not work as expected with newer versions of setuptools, pip, and PyPI.
Please see PEP 440 for more details.
"details." % self.metadata.version
usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
or: setup.py --help [cmd1 cmd2 ...]
or: setup.py --help-commands
or: setup.py cmd --help

error: invalid command 'build_sphinx'

Note: I am working on MSU-HPC using the virtual environment. I installed the dependencies and the make test passed ok

@mr-c
Copy link
Contributor

mr-c commented Feb 20, 2015

Turns out that the HPCC used an old version of virtualenv; local upgrade fixed that.

Next he ran into python-versioneer/python-versioneer#52 which he fixed via multiple pip uninstall screeds followed by pip install bz2file; pip install -i https://testpypi.python.org/pypi --pre screed

@drtamermansour
Copy link
Member Author

ready for review

@@ -64,3 +64,5 @@ if type sloccount >/dev/null 2>&1
then
make sloccount.sc
fi

bash -ex -c 'cd examples/stamps/; ./do.sh'
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, I just had an idea: if this test doesn't work there won't be a good indication of why

if you add || { echo examples/stamps/do.sh no longer runs; /bin/false } to the end of line 68 that will fix this.

@drtamermansour
Copy link
Member Author

ready for review

2015-02-20 Tamer A. Mansour <drtamermansour@gmail.com>

* In the do.sh script, the old argument --savehash has been updated to
--savetable
Copy link
Contributor

Choose a reason for hiding this comment

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

Wrapped lines should be indented to match the line above. In this instance you need three space before --savetable

@mr-c
Copy link
Contributor

mr-c commented Feb 21, 2015

Otherwise this is ready to merge

@drtamermansour
Copy link
Member Author

@mr-c
I do not know why Jenkins failed !!
When I run: make pep8, it gives me
pep8 --exclude=_version.py setup.py khmer/ scripts/ tests/ || true
Is this an error?

@ctb
Copy link
Member

ctb commented Feb 23, 2015

This passes 'make test' and 'make pep8' on my laptop; looks like Jenkins may be barfing on it.

Jenkins, test this please.

@ctb
Copy link
Member

ctb commented Feb 23, 2015

please test this

@drtamermansour
Copy link
Member Author

I think you need to mention "Jenkins" in the test request

@mr-c
Copy link
Contributor

mr-c commented Feb 23, 2015

jenkins-build.sh: line 69: syntax error: unexpected end of file

@drtamermansour
Copy link
Member Author

Jenkins, test this please

1 similar comment
@mr-c
Copy link
Contributor

mr-c commented Feb 23, 2015

Jenkins, test this please

mr-c added a commit that referenced this pull request Feb 23, 2015
@mr-c mr-c merged commit dab6612 into dib-lab:master Feb 23, 2015
@mr-c
Copy link
Contributor

mr-c commented Feb 23, 2015

Thanks, @drtamermansour

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

Successfully merging this pull request may close these issues.

khmer user doc, do.sh script uses the old argument --savehash
4 participants