Make changes to the setup.py originally suggested by @MohitS10 #83
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changed around the directory structure to have the files a part of the VHostScan package so it could be used for pkg_resources. Also changed the DEFAULT_WORDLIST_FILE to use pkg_resources instead of __file__. Also changed some of the imports so they are using relative imports instead of the full path. This appears to work with atleast the -t flag, however, more testing should be done and the tests that already exist should be able to run when running `python setup.py test`
Changed the tests to include the proper namespace along with being able to run the tests by using `python setup.py test`.
Numpy sometimes fails to properly install when just within the install_requires (see [#2434](numpy/numpy#2434)) so I also added it to setup_requires. Also changed from using scripts => entry_points:{'console_scripts'} and the command to `VHostScan` within the README for consistency.
|
Not ignoring this but been a bit snowed. Hoping to get some time to review before the end of the week. |
|
Testing this now - do you mind resolving this with master and then we can merge @ccsplit? |
|
@codingo, sure. I'll try to get it done by tomorrow at the latest. |
* 'master' of github:codingo/VHostScan: Update __version__.py Supress insecure warnings within requests Update README.md
|
@codingo, wanted to let you know I have resolved the merge conflicts. |
codingo
approved these changes
Dec 6, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Going off of #73, I used it as a base in order the default wordlist work in situations where it is installed as a
.egg/zip instead of a folder. Also worked on getting the install to properly install all of the dependencies when runningpython setup.py install. The tests can also be ran by simply runningpython setup.py testwhich will use pytest-runner in order to run the current tests.Note: These changes have been partially tested on linux.