Dj-stripe: Can't run dj-stripe 2.2.0 migration

[PabloCastellano]

Hello!

Describe the bug
I want to migrate to the latest dj-stripe 2.2.0. However there seems to be some conflict with the migrations

$ ./manage.py migrate
CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0005_2_2, 0011_auto_20191214_0453 in djstripe).
To fix them run 'python manage.py makemigrations --merge'

To Reproduce

1. Create a django project
2. pip install dj-stripe==2.2.0
3. ./manage.py migrate

Expected behavior
Normal DB migration

Environment

• dj-stripe version: 2.2.0
• Database: Postgresql 10.10
• Python version: 3.6.9
• Django version: 2.2.7

Can you reproduce the issue with the latest version of master?

No

Additional context

It looks to me like the published version on pypi doesn't correspond to 6c909104793f1ed49f52772a201deb978ff97348. Maybe 51506de23371f276148b1fadd720a9369b94edac (before migrations were squashed)

[therefromhere]

Yeah apologies, I'm not sure what happened with that - the tar.gz 2.2.0 has setup.cfg with version 2.3.0dev (I'm surprised this uploaded as version 2.2.0??), the wheel has the pre-squashed migrations.

I'll do a 2.2.1 release later today to fix.

In the mean time 2.2.0rc0 should work correctly (and should fix your db if it's in an inconsistent state due to the above).

[PabloCastellano]

No worries, these things happen. It was just a heads-up :-)

[therefromhere]

I've released 2.2.1 that should fix the issue (no code changes from 2.2.0).

I think the bad package was due to a stable build dir