Skip to content

Upgrade all packages using pur #4318

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

Merged
merged 10 commits into from
Sep 5, 2018
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ matrix:
env: TOXENV=docs
- python: 3.6
env: TOXENV=docs-lint
- python: 2.7
- python: 3.6
env: TOXENV=lint
script: tox
- python: 2.7
Expand Down
2 changes: 1 addition & 1 deletion common
6 changes: 3 additions & 3 deletions readthedocs/projects/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ class ProjectRelationshipBaseForm(forms.ModelForm):

class Meta(object):
model = ProjectRelationship
exclude = []
fields = '__all__'

def __init__(self, *args, **kwargs):
self.project = kwargs.pop('project')
Expand Down Expand Up @@ -634,7 +634,7 @@ class DomainForm(forms.ModelForm):

class Meta(object):
model = Domain
exclude = ['machine', 'cname', 'count']
exclude = ['machine', 'cname', 'count'] # pylint: disable=modelform-uses-exclude

def __init__(self, *args, **kwargs):
self.project = kwargs.pop('project', None)
Expand Down Expand Up @@ -674,7 +674,7 @@ class IntegrationForm(forms.ModelForm):

class Meta(object):
model = Integration
exclude = ['provider_data', 'exchanges']
exclude = ['provider_data', 'exchanges'] # pylint: disable=modelform-uses-exclude

def __init__(self, *args, **kwargs):
self.project = kwargs.pop('project', None)
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/projects/version_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def prune_point(self, num_latest):
try:
self._state[major][minor] = sorted(
set(self._state[major][minor]))[-num_latest:]
except TypeError:
except TypeError: # pylint: disable=try-except-raise
# Raise these for now.
raise

Expand Down
2 changes: 1 addition & 1 deletion readthedocs/vcs_support/backends/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def parse_branches(self, data):
delimiter = str(' ').encode('utf-8') if PY2 else str(' ')
raw_branches = csv.reader(StringIO(data), delimiter=delimiter)
for branch in raw_branches:
branch = [f for f in branch if f != '' and f != '*']
branch = [f for f in branch if f not in ('', '*')]
# Handle empty branches
if branch:
branch = branch[0]
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# This application object is used by any WSGI server configured to use this
# file. This includes Django's development server, if the WSGI_APPLICATION
# setting points here.
from django.core.wsgi import get_wsgi_application # pylint: disable=wrong-import-position
from django.core.wsgi import get_wsgi_application # pylint: disable=wrong-import-position # noqa
Copy link
Member

Choose a reason for hiding this comment

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

I think we can leave only the # noqa comment, right?

application = get_wsgi_application()

# Apply WSGI middleware here.
Expand Down
9 changes: 5 additions & 4 deletions requirements/deploy.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
-r pip.txt
psycopg2==2.7.3.2
gunicorn==19.1.0
pysolr==2.0.13
django-redis-cache==1.6.3
# http://initd.org/psycopg/docs/install.html#binary-install-from-pypi
psycopg2==2.7.5 --no-binary psycopg2
gunicorn==19.9.0
pysolr==3.7.0
Copy link
Member Author

Choose a reason for hiding this comment

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

I think we never upgraded the deploy.txt file. So, we should be careful with them.

django-redis-cache==1.7.1

#For resizing images
pillow
8 changes: 4 additions & 4 deletions requirements/lint.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-r pip.txt
astroid==1.6.4
pylint==1.9.1
pylint-django==0.11.1
astroid==2.0.4
pylint==2.1.1
pylint-django==2.0.2
pylint-celery==0.3
prospector==0.12.10
prospector==1.1.2
pyflakes==2.0.0
25 changes: 14 additions & 11 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Base packages
pip==10.0.1
pip==18.0
appdirs==1.4.3
virtualenv==16.0.0
docutils==0.14
Sphinx==1.7.4
sphinx_rtd_theme==0.3.1
Sphinx==1.7.8
sphinx_rtd_theme==0.4.1

Pygments==2.2.0

Expand All @@ -18,7 +18,7 @@ future==0.16.0
django-tastypie==0.13.0

django-guardian==1.4.9
django-extensions==2.0.7
django-extensions==2.1.2

# djangorestframework 3.7.x drops support for django 1.9.x
djangorestframework==3.6.4
Expand All @@ -29,15 +29,15 @@ django-filter==1.1.0
django-vanilla-views==1.0.5
jsonfield==2.0.2

requests==2.18.4
requests==2.19.1
requests-toolbelt==0.8.0
slumber==0.7.1
lxml==4.2.1
lxml==4.2.4
defusedxml==0.5.0

# Basic tools
redis==2.10.6
celery==4.1.1
celery==4.2.1

# django-allauth 0.33.0 dropped support for Django 1.9
# https://django-allauth.readthedocs.io/en/latest/release-notes.html#backwards-incompatible-changes
Expand All @@ -47,6 +47,9 @@ dnspython==1.15.0

# VCS
httplib2==0.11.3

# GitPython 2.1.11 makes TestGitBackend.test_git_tags to fail because
# of an UnicodeError
Copy link
Member

Choose a reason for hiding this comment

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

Maybe mention that we can update when we drop py2 support

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm starting to feel that this package is too unstable to rely all our building process on it. We just updated a bugfix version and it breaks our flow.

In the requirements, it says that it supports 2.7 or newer: https://gitpython.readthedocs.io/en/stable/intro.html#requirements

This is the commit that we think that introduced the issue: gitpython-developers/GitPython@7f08b77

Copy link
Member Author

Choose a reason for hiding this comment

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

More examples:

I suppose that we should start thinking about another solution, unfortunately.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Tests in master and 2.1.11 fail. Also in 2.1.10... 😥

Copy link
Contributor

Choose a reason for hiding this comment

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

Regarding dropping py27 support, this will be our v3.0 -- it might make sense to time 3.0 for all of our deprecations in jan 2019. i opened #4594 to discuss more

GitPython==2.1.10

# Search
Expand All @@ -56,8 +59,8 @@ pyquery==1.4.0

# Utils
django-gravatar2==1.4.2
pytz==2018.4
beautifulsoup4==4.6.0
pytz==2018.5
beautifulsoup4==4.6.3
Unipath==1.1
django-kombu==0.9.4
mock==2.0.0
Expand All @@ -78,11 +81,11 @@ django-textclassifier==1.0
django-annoying==0.10.4
django-messages-extends==0.6.0
djangorestframework-jsonp==1.0.2
django-taggit==0.22.2
django-taggit==0.23.0
dj-pagination==2.3.2

# Docs
sphinxcontrib-httpdomain==1.6.1
sphinxcontrib-httpdomain==1.7.0

# commonmark 0.5.5 is the latest version compatible with our docs, the
# newer ones make `tox -e docs` to fail
Expand Down
21 changes: 13 additions & 8 deletions requirements/testing.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
-r pip.txt

django-dynamic-fixture==2.0.0

# 3.6.1 and >3.2.5 is incompatible
# with pytest-describe 0.11.0
pytest==3.2.5
Copy link
Member Author

Choose a reason for hiding this comment

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

If test passes, remove this docstring. Otherwise, do not upgrade pytest.

pytest-django==3.1.2
pytest-describe==0.11.0
pytest-xdist==1.22.0
apipkg==1.4
pytest==3.7.4
pytest-django==3.4.2
pytest-describe==0.11.1
pytest-xdist==1.23.0
apipkg==1.5
execnet==1.5.0

# Mercurial 4.3 and newer require Python 2.7
# Mercurial is actively being ported to Python 3. As of Mercurial 4.3,
# some commands work on Python 3. However, Python 3 is not yet a
# supported platform.
# mercurial-scm.org/wiki/SupportedPythonVersions
# (Pinned to 4.4.2 since what we need for testing is still useful)
Mercurial==4.4.2

yamale==1.7.0
pytest-mock==1.10.0

Expand Down