Merge upstream changes #110
Conversation
…e-4.4.2-to-4.5.1 Update coverage to 4.5.1
… pytest to 3.4.1 audreyfeldroy#412, update sphinx to 1.7.0 audreyfeldroy#407, removed unnecessary requirements audreyfeldroy#396
…1.7.0-to-1.7.1 Update sphinx to 1.7.1
…3.4.0-to-3.4.2 Update pytest to 3.4.2
Pin twine to latest version 1.10.0
…ache added `.pytest_cache/` to .gitignore
fix release target in makefile
Per twoscoops/Creating-and-Distributing-Python-Packages#16, we've added .pytest_cache so this isn't added to a git repo.
Sorry to hear that it was time-consuming. I would suggest you merge instead of rebase. When you merge and something goes wrong, you still have the previous state before the merge to compare against or to revert back to. When you rebase, you lose that previous state and trying to go back will be even more time-consuming. |
|
@tlvu I did end up making a merge commit instead, as rebasing was a nightmare. In any case, it seems to be working and now we have functional tests! I'm not sure how much of a change this will translate into vis-à-vis our projects. Thoughts? |
|
@Zeitsperre just made a quick check building babybird from cookiecutter. Only comments:
Could also be done by another PR (at least for github ci) ... this PR has already many changes. |
|
Thanks for the review @cehbrecht! I'm going to wait for @tlvu as well before anything. You're right that there's a lot going on here, so I'll add those to the next PR and afterwards we should be more or less in sync with upstream. |
|
Yes sorry @Zeitsperre will try to finish this review tonight or tomorrow. |
There was a problem hiding this comment.
LGTM. Minor remarks, you can ignore if needed.
The expensive question is have you tried to cruft update this with our existing birds to test for a smooth transition?
I suggest merge this PR, then open a new PR for anything you find when trying to cruft update with existing birds. Maybe one bird at a time, then merge after each bird, so the "fix PR" so not stay open for too long. Also do not have to refresh all birds at once.
| cookiecutter>=1.6.0 | ||
| pytest-cookies==0.5.1 | ||
| alabaster==0.7.12 | ||
| watchdog==0.9.0 |
There was a problem hiding this comment.
Oh la pinning of dependencies. We'll have keep up-to-date with upstream often to get newer versions.
|
@Zeitsperre feel free to merge when ready. |
Overview
This PR fixes #99
Changes:
toxRelated Issue / Discussion
Re-enabling
toxis particularly high in the priorities list, given the changes that have come to pass with Travis CI. At the very least, we now know the risks associated with tying ourselves to a specific service API.There are quite a lot of changes in here. Even though I performed a rebase-type merge to gradually solve the merge conflicts (time-consuming), there is likely a lot here to unpack. Some of my goals were as follows:
pytestoptional (selecting against it removes much of the pytest-based code we have).toxwhere possible and have CI services rely more onmakefilerecipes.Additional Information
#99
Ouranosinc/xclim#509