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

Jump to bottom

Update Cottle version #1834

Closed
wants to merge 5 commits into from
Closed

Update Cottle version #1834

wants to merge 5 commits into from

Conversation

Tkael
Copy link
Member

@Tkael Tkael commented Jun 20, 2020

Resolves #1687.

@Tkael
To Cottle version 1.5.4
d7829f1
@Tkael
To Cottle version 1.6.2
79cf038
@Tkael
To Cottle version 2.0.1
7a8bc31 
Note: There is 1 failing unit test which may represent a change to how Cottle handles nested functions?
- Test method is unchanged from version 1.6.2 (which passed)
- Test method is a pure test of Cottle functionality - it does not invoke the ScriptResolver class and is unaffected by changes to that class.
@Tkael
To Cottle version 2.0.2
6d7a13b
@Tkael
Update links to Cottle documentation
bdaac75
@Tkael Tkael self-assigned this Jun 20, 2020
@Tkael Tkael added the 10. work unit (user unaffected) A job that needs to be done but which doesn't affect the user. label Jun 20, 2020
richardbuckle
richardbuckle approved these changes Jun 20, 2020
View reviewed changes
Copy link
Member

@richardbuckle richardbuckle left a comment

Choose a reason for hiding this comment

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

Taking this on trust.

richardbuckle
richardbuckle requested changes Jun 20, 2020
View reviewed changes
Copy link
Member

@richardbuckle richardbuckle left a comment

Choose a reason for hiding this comment

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

I can't resolve the merge conflicts here. I recommend closing this and opening a new one once the dust has settled

@Tkael
Copy link
Member Author

Tkael commented Jun 21, 2020

Will do.

@Tkael
Copy link
Member Author

Tkael commented Jun 21, 2020

Closing to rebase.

@Tkael Tkael closed this Jun 21, 2020
@Tkael Tkael deleted the hotfix/1687-cottle branch June 21, 2020 07:37
@Tkael Tkael mentioned this pull request Jun 21, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardbuckle richardbuckle richardbuckle requested changes

Assignees

@Tkael Tkael

Labels
10. work unit (user unaffected) A job that needs to be done but which doesn't affect the user.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cottle version is out of date
2 participants
@Tkael @richardbuckle