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.

Sign up for GitHub

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

Fixing build system to use setuptools and wheel install #376

Closed
wants to merge 5 commits into from
Closed

Fixing build system to use setuptools and wheel install #376

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1d6cd9
Fixing build system to use setuptools and wheel install
E3V3A Nov 29, 2018
628c071
Fix PEP-508 setup.cfg issue and disable Py3.3
E3V3A Nov 29, 2018
008bd36
Fix PEP-508 setup.cfg issue and disable Py3.3 part2
E3V3A Nov 29, 2018
1b98a7d
Removed setup from disutils import
E3V3A Nov 29, 2018
7662a95
Fixed PEP-0440 version string issue #377
E3V3A Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,19 @@ classifiers =
[options]
zip_safe = true
include_package_data = true
python_requires = >= 2.7, != 3.0.*, != 3.1.*, != 3.2.*
#, != 3.3.*
python_requires = >= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*
setup_requires =
setuptools
install_requires =
setuptools

#test_suite = tests.tests.Tests
dependency_links = ['git+https://github.com/devttys0/yaffshiv.git']
#'git+https://github.com/devttys0/sasquatch.git',

[options.extras_require]
plots = matplotlib
x86 = capstone
YAFFS = yaffshiv
#SQUASH = sasquatch
#YAFFS = yaffshiv @ git+https://github.com/devttys0/yaffshiv.git
Copy link
Contributor

Choose a reason for hiding this comment

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

This breaks things. You need to comment out the part starting from @, not to comment out the line entirely.

#SQUASH = sasquatch @ git+https://github.com/devttys0/sasquatch.git'
Copy link
Contributor

Choose a reason for hiding this comment

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

you have forgotten the tick

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I just remove them altogether then?

Copy link
Contributor

@KOLANICH KOLANICH Nov 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I guess, no. YAFFS should be kept - 3rd party packages may depend on it, if you removed this optional dependency, they would be broken.

I prefer to keep these commented out lines as a reminder to fix them in future when the bug in pip will be fixed.


[options.entry_points]
console_scripts = binwalk = binwalk.__main__:main
Expand Down