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

Merge updated fork #113

Merged
merged 26 commits into from
Jan 18, 2018
Merged

Merge updated fork #113

merged 26 commits into from
Jan 18, 2018

Conversation

atodorov
Copy link
Contributor

Changes:

  • make tests running again
  • remove testing for Python 2 and older versions of Django (testing only with 1.11 and 2.0+ on Py3). No modifications to the code though, should still work on older versions.
  • merged all other pending PRs, keeping authorship credentials so we can merge directly instead of going over each PR individually.

TODO: will remove custom naming and versioning coming from the fork and let you know when this is ready to merge and review.

@atodorov atodorov requested review from carlio and removed request for carlio January 18, 2018 09:35
@coveralls
Copy link

coveralls commented Jan 18, 2018

Coverage Status

Coverage decreased (-2.9%) to 84.774% when pulling 2e058dc on MrSenko:merge_fork into f0655cc on landscapeio:master.

@coveralls
Copy link

coveralls commented Jan 18, 2018

Coverage Status

Coverage decreased (-2.9%) to 84.774% when pulling f958844 on MrSenko:merge_fork into f0655cc on landscapeio:master.

atodorov and others added 24 commits January 18, 2018 11:53
this mimics more closely what pylint does for their own tests
and doesn't rely on deprecated functionality. Fixes
pylint-dev#107 and
pylint-dev#97

Obsoletes
pylint-dev#98
since we're testing with latest Django versions this is now
required for all ForeignKey fields
the plugin should be able to suppress these kinds of errors for
model classes and also for Meta classes so no need to disable them
explicitly.
also remove couple of suppressions b/c these class checks are
already handled by the check for meta class and they don't seem
to have any effect
this was previously skipped but since we don't test on older
versions we can explicitly add it again.
the latest version of pylint expects the error messages in
slightly different format.
Checks that Pylint does not complain about django lazy proxy
when using ugettext_lazy
Fix E1101:Instance of '__proxy__' has no 'format' member' when using .format() on a ugettext_lazy translation

NOTE: merged with modifications. Instead of returning str,
      returns ''

Fixes pylint-dev#80
Origina PR: pylint-dev#100
Villiers Strauss and others added 2 commits January 18, 2018 11:54
NOTE: merged with modifications:
	- resolved conflicts
	- updated where test files are on disk

Original PR: pylint-dev#84
@coveralls
Copy link

coveralls commented Jan 18, 2018

Coverage Status

Coverage decreased (-2.9%) to 84.774% when pulling ae6351d on MrSenko:merge_fork into f0655cc on landscapeio:master.

@coveralls
Copy link

coveralls commented Jan 18, 2018

Coverage Status

Coverage decreased (-2.9%) to 84.774% when pulling f6a5ac2 on MrSenko:merge_fork into f0655cc on landscapeio:master.

@atodorov atodorov changed the title [WIP] Merge updated fork Merge updated fork Jan 18, 2018
@carlio
Copy link
Collaborator

carlio commented Jan 18, 2018

This all looks good to me!

Two comments - first, makes sense to wait for @colinhowe to have a look and also see what his changes are, may as well merge at the same time.

Second - it'd probably be good to have some kind of deprecation or warning maybe in setup.py that Py2 is not supported, as lots of people don't install a specific version so will get the latest and suddenly builds break (trust me on that one!). Does that make sense? Maybe just a sysexit with a printed line saying "if you want to use py2 with pylint-django please install a version <0.8". With better wording.

@atodorov
Copy link
Contributor Author

@carlio I can add the deprecation warning in a separate commit before we release 0.8. I have only removed testing for Python 2, mostly because I didn't have the time to deal with fixing the Python 2 tests. I have not modified the code to remove anything related to Py2 so everything will still work.

And we can make version 0.8.0 the last that will support Py2, then declare this project Py3 only and move on.

@carlio
Copy link
Collaborator

carlio commented Jan 18, 2018

because I didn't have the time to deal with fixing the Python 2

Oh I understand that completely!

Sounds all good to me.

@colinhowe
Copy link

I'm happy with all of this. My changes have made it in already via the work that @atodorov has done

@atodorov atodorov merged commit 2193e8b into pylint-dev:master Jan 18, 2018
@atodorov atodorov deleted the merge_fork branch January 18, 2018 14:16
@carlio
Copy link
Collaborator

carlio commented Jan 18, 2018

Let's do it! I'll let you push the button to make sure permissions are set up right, let me know if there are any problems

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.

9 participants