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

Add (failing) tests for issue #32 and #33 #35

Merged
merged 22 commits into from
Feb 8, 2021
Merged

Add (failing) tests for issue #32 and #33 #35

merged 22 commits into from
Feb 8, 2021

Conversation

tompaton
Copy link
Contributor

No description provided.

@tompaton tompaton marked this pull request as draft December 30, 2020 11:31
@tompaton
Copy link
Contributor Author

tompaton commented Jan 2, 2021

I think i've got an adequate fix for #32, but I haven't got the faintest idea how to deal with #33.

This was referenced Jan 2, 2021
Closed
Open
@ssbarnea ssbarnea self-requested a review January 2, 2021 11:58
@dHannasch dHannasch mentioned this pull request Feb 5, 2021
Closed
dHannasch and others added 20 commits February 5, 2021 13:36
@dHannasch
Explicit relative import for roundtrip.
78f16b8
@dHannasch
Use relative import for roundtrip everywhere.
058dac9
@dHannasch
allow relative import
dfe84d1
@dHannasch
isort
44c2c9d
@smurfix
Removed .hgignore file
047a125 
We're not using Mercurial
@smurfix
Run "ryd convert" and drop the .ryd files
70b3003 
git recognizes this as renaming
@smurfix
Made indents more consistent
cb020ba 
4 spaces please
@smurfix
Updated contributing.rst
2d68211
@smurfix
mypy fixes
f9c1910 
we don't use Python 3.0 any more.
@smurfix
Ignore more cruft
6dbef5b
@smurfix
Drop dependency on "ryd" tool
fe365e1
@smurfix
Fix test to skip itself when the C extension doesn't exist
74a5696
@smurfix
drop remaining Python <3.5 workarounds
02c8c71
@smurfix
Removed .rydinc file
725f2c6
@smurfix
Skip lib/* tests because of various missing "*_filename" fixtures
999823c
@smurfix
superfluous imports
e6bc5fb
@smurfix
Ignore "import not on top" error because of _test/lib skips
f4c2aa2
@smurfix
Ignore generated doc files
29863c5
@smurfix
Merge remote-tracking branch 'dhannasch/explicit-relative-import-roun…
a7a2760 
…dtrip'
@smurfix
Merge remote-tracking branch 'tompaton/issue_32'
666075b
@smurfix
Copy link
Collaborator

smurfix commented Feb 8, 2021

Do you have an idea how to go about fixing #33? Otherwise I'd merge this as at least it does fix #32.

@ssbarnea ssbarnea marked this pull request as ready for review February 8, 2021 16:03
ssbarnea
ssbarnea approved these changes Feb 8, 2021
View reviewed changes
Copy link
Member

@ssbarnea ssbarnea left a comment

Choose a reason for hiding this comment

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

Keep in mind to merge this by keeping original commits, as there are lots of them and we want to be able to revert particular ones if needed.

Usually I would use squash, but that is the counter-example.

@smurfix smurfix merged commit 12fbe3d into pycontribs:master Feb 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ssbarnea ssbarnea ssbarnea approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tompaton @smurfix @ssbarnea @dHannasch