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 the failing build #299

Merged
merged 21 commits into from
Aug 13, 2020
Merged

Fix the failing build #299

merged 21 commits into from
Aug 13, 2020

Conversation

dutchedge
Copy link
Contributor

I saw your last build was failing after a pull request #298 from yalechen-cyw/master.
These changes (my mastrer version 1bdf8e2) should give a working build again (I've added a build.sh to work locally and should be safe to ignore.)
Due to my unfamiliarity with travis I needed some commits to get it to work, but the changes in the end are just a few.
Further this is my first pull request so I'm not sure if the patch files get automatically added or if the reference to the working version is included.

  • Build failed mainly because one line was too long
  • I needed to fix the pygments to version 2.3.1 to have the build on version 3.4 succeed.
  • Not sure how you work with the version. I just added a very small increment.

Patric Theune added 21 commits August 12, 2020 13:27
@terryyin
Copy link
Owner

Hi @dutchedge , thanks for fixing the build and sorry for my previous neglecting. The last pull request I got doesn't have a corresponding unit test, so I'm still waiting for the committer to provide a new unit test case.

Yeah, I can see you did many revert commits:-) I'm not a big fan of keeping the git log clean, and I usually don't mind having many small and even irrelevant commits. But in this case since it's very easy, I will do a 'squash and merge' so it will become just one commit.

The versioning is not by change lizard_ext/version.py. Once I add a new version to CHANGELOG.md and than do make release it will take the topmost version and overwrite lizard_ext/version.py.

Thanks!

@terryyin terryyin merged commit 5d7790a into terryyin:master Aug 13, 2020
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.

None yet

2 participants