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.

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

Add Django 3.0 support, remove Python 2.7 support #515

Merged
merged 15 commits into from Oct 15, 2019

Conversation

benjaoming
Copy link
Contributor

@benjaoming benjaoming commented Oct 14, 2019

#514

TODO:

  • Clean up unicode-related stuff from Python 2.7

@codecov-io
Copy link

codecov-io commented Oct 14, 2019

Codecov Report

Merging #515 into master will decrease coverage by 0.49%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master     #515     +/-   ##
=========================================
- Coverage   98.13%   97.64%   -0.5%     
=========================================
  Files          29       29             
  Lines         913      890     -23     
  Branches      155      155             
=========================================
- Hits          896      869     -27     
- Misses         12       14      +2     
- Partials        5        7      +2
Impacted Files Coverage Δ
djmoney/forms/widgets.py 87.5% <ø> (ø) ⬆️
djmoney/utils.py 100% <ø> (ø) ⬆️
djmoney/apps.py 100% <ø> (ø) ⬆️
djmoney/models/validators.py 100% <ø> (ø) ⬆️
djmoney/templatetags/djmoney.py 100% <ø> (ø) ⬆️
djmoney/models/__init__.py 100% <ø> (ø) ⬆️
djmoney/settings.py 100% <ø> (ø) ⬆️
djmoney/money.py 97.1% <ø> (-2.9%) ⬇️
djmoney/contrib/django_rest_framework/fields.py 100% <ø> (ø) ⬆️
djmoney/contrib/django_rest_framework/__init__.py 100% <ø> (ø) ⬆️
... and 12 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 89ac0e2...4be92af. Read the comment docs.

@lundberg
Copy link

Lovely PR!

FYI, tests on travis are passing (except linting), but when trying this PR locally in a project, I get an ImportError referring to djmoney.serializers importing django.utils.six here.

Not covered?

benjaoming added a commit to benjaoming/django-money that referenced this pull request Oct 14, 2019
@benjaoming
Copy link
Contributor Author

Thanks @lundberg :) This should be working now.

Moreover, the flake8 command wasn't working in Travis CI.. so important stuff such as undeclared variables was missing in the linting.

@Stranger6667 would you be able to take a look at this and merge at will?

Copy link
Collaborator

@Stranger6667 Stranger6667 left a comment

Choose a reason for hiding this comment

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

I like this PR :) It is finally happening. Just one question regarding _compat
Thank you, Ben :)

djmoney/serializers.py Show resolved Hide resolved
djmoney/_compat.py Outdated Show resolved Hide resolved
@benjaoming
Copy link
Contributor Author

@Stranger6667 - the last change was necessary, since we had specified universal=True for building wheels, which says that the .whl will work on both Python 2 and 3.

Now, we just create .whl for Python 3, anyone running pip install django-money on Python 2 will get version 0.15, and Python 3 environments will get version 1.0 (when it's released).

@benjaoming benjaoming merged commit 3087251 into django-money:master Oct 15, 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.

None yet

4 participants