Skip to content

Conversation

@Guillemdb
Copy link
Contributor

@Guillemdb Guillemdb commented Apr 24, 2019

Making PR according to @vmarkovtsev suggestions.

Add CI. The repo is empty so it passes. CI should additionally test packaging btw.

I don't know how to test packaging. Can you send me a tutorial or something? I was planning to do it after the first PR was merged.

@zurk
Copy link
Contributor

zurk commented Apr 24, 2019

.ci directory should be added to .gitignore
Makefile pulls it automatically.

@zurk
Copy link
Contributor

zurk commented Apr 24, 2019

can you squash it into one commit to avoid having '`ci' in git history?

.travis.yml Outdated
language: python
sudo: true
dist: xenial
git:
Copy link
Collaborator

Choose a reason for hiding this comment

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

The depth is not required here

requirements.txt Outdated
bblfsh==2.12.7
modelforge==0.12.1
numpy==1.16.2
humanize==0.5.1
Copy link
Collaborator

Choose a reason for hiding this comment

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

humanize is probably included into modelforge

@Guillemdb Guillemdb requested a review from vmarkovtsev April 25, 2019 07:16
@Guillemdb Guillemdb force-pushed the ci branch 2 times, most recently from 8a376c0 to bb6cb1c Compare April 25, 2019 08:33
Copy link
Collaborator

@vmarkovtsev vmarkovtsev left a comment

Choose a reason for hiding this comment

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

LGTM. What's left here:

  • Rebase
  • Pass the CI

@Guillemdb
Copy link
Contributor Author

Guillemdb commented Apr 26, 2019

@vmarkovtsev As there is no code yet the CI won't pass. I can choose to screw up the CI files to make the CI checks pass, or I can wait for the next PR to include the code.

And If I merge the code from the refactor branch here, the tests will fail because they need fixing.

Should I also add a commit witht the tests fixing? (I am asking this because you told me to make no changes to the code functionality)

@zurk
Copy link
Contributor

zurk commented Apr 26, 2019

you can add @unittest.skip decorator for now. I think it is fine

Guillem Duran added 4 commits April 26, 2019 12:55
Signed-off-by: Guillem Duran <guillem@sourced.tech>
Signed-off-by: Guillem Duran <guillem@sourced.tech>
Signed-off-by: Guillem Duran <guillem@sourced.tech>
Signed-off-by: Guillem Duran <guillem@sourced.tech>
@zurk
Copy link
Contributor

zurk commented Apr 26, 2019

@Guillemdb CI is failed. Please request a review when you fix it.

@Guillemdb
Copy link
Contributor Author

Guillemdb commented Apr 26, 2019

@zurk I have no idea why the build fails. It is obviously missing some files, but I don't know what are the files that need to be there so the CI passes.

PR#4 is working like a charm. Is really necessary that I spend more time trying to fix something that works there, and then rebasing everything?

EDIT: cd $(pip show sourced.ml.core|grep Location|cut -d' ' -f2)/sourced/ml/core This is the line which is making the travis build fail. With the whole project in the folder it works, but I don't know which are the required files and why.

Signed-off-by: Guillem Duran <guillem@sourced.tech>
Copy link
Contributor

@zurk zurk left a comment

Choose a reason for hiding this comment

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

Is really necessary that I spend more time trying to fix something that works there, and then rebasing everything?

Yes, because we do not merge if CI fails as a rule without exclusion.

I am ok to merge it if you check all that Vadim asks to check (I mention you there)

@zurk
Copy link
Contributor

zurk commented Apr 26, 2019

Vadim's feedback is fulfilled so I am merging

@zurk zurk merged commit e4151aa into src-d:master Apr 26, 2019
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.

4 participants