Skip to content

Cleanup ci module and setup#695

Merged
rahulporuri merged 2 commits into
masterfrom
cln/ci-module
Apr 21, 2021
Merged

Cleanup ci module and setup#695
rahulporuri merged 2 commits into
masterfrom
cln/ci-module

Conversation

@rahulporuri
Copy link
Copy Markdown
Contributor

This PR makes a number of changes to the ci module and setup script

  • removes use of use_2to3 in setup script
  • fixes flake8 errors and failures in setup script
  • fixes flake8 errors in ci module
  • moves coverage from requirements file to edmtool so it can be installed via edm instead of pypi
  • removes unused travis-ci-requirements.txt
  • update tox config file to remove fixed up files from flake8 ignore list

Poruri Sai Rahul added 2 commits April 20, 2021 12:43
	modified:   ci/edmtool.py
	modified:   ci/requirements.txt
	modified:   setup.py
	modified:   tox.ini
	deleted:    travis-ci-requirements.txt
Copy link
Copy Markdown
Contributor

@aaronayres35 aaronayres35 left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines -3 to -4
pillow
git+http://github.com/nucleic/kiwi.git#egg=kiwi
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This file looks like it was unused, but I don't see these anywhere else explicitly. Im assuming they come from enable, and so don't need to be listed as deps

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

not sure where these came from. i didn't bother looking for when this was added to the repo. but you're probably right - they were possible needed for source installs of enable, which are handled by the ci module now.

@rahulporuri rahulporuri merged commit f21e067 into master Apr 21, 2021
@rahulporuri rahulporuri deleted the cln/ci-module branch April 21, 2021 01:01
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.

2 participants