All package updates #4792

humitos · 2018-10-22T16:30:21Z

$ for reqs in `ls requirements`; do pur --skip django,docker,celery,commonmark,gitpython,elasticsearch,pyelasticsearch,mercurial --requirement requirements/$reqs; done

Closes #4897

requirements/pip.txt

codecov · 2018-10-23T18:03:15Z

Codecov Report

Merging #4792 into master will increase coverage by <.01%.
The diff coverage is 90%.

@@            Coverage Diff             @@
##           master    #4792      +/-   ##
==========================================
+ Coverage   76.75%   76.75%   +<.01%     
==========================================
  Files         158      158              
  Lines       10048    10051       +3     
  Branches     1265     1265              
==========================================
+ Hits         7712     7715       +3     
  Misses       1995     1995              
  Partials      341      341

Impacted Files	Coverage Δ
readthedocs/search/utils.py	`0% <0%> (ø)`	⬆️
readthedocs/restapi/views/integrations.py	`88.65% <100%> (ø)`	⬆️
readthedocs/restapi/views/model_views.py	`94.18% <100%> (+0.1%)`	⬆️
readthedocs/projects/constants.py	`100% <100%> (ø)`	⬆️

stsewd · 2018-10-26T02:41:59Z

@humitos now that we are on a recent version of django, we can revert the last commit p: or maybe upgrade the rest of packages too!

humitos · 2018-10-27T13:37:51Z

@stsewd thanks for noting this.

I've updated all the packages and followed the migration guides that we had noted in the requirements files. I think that all tests should pass.

humitos · 2018-10-27T16:41:17Z

requirements/pip.txt

-# Besides the guide, check this comment for the migration
-# https://github.com/rtfd/readthedocs.org/pull/4318#discussion_r214163531
-django-filter==1.1.0
+django-filter==2.0.0


If we want to upgrade to django-filter>=2.0.0 we need to drop support for Python2 since it requires Python3. Tests fail with:

> from .filterset import FilterSet E File "/home/travis/build/rtfd/readthedocs.org/.tox/py27/lib/python2.7/site-packages/django_filters/filterset.py", line 184 E def __init__(self, data=None, queryset=None, *, request=None, prefix=None): E ^ E SyntaxError: invalid syntax

stsewd · 2018-11-09T00:06:36Z

requirements/deploy.txt

@@ -2,8 +2,8 @@
 # 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
-django-redis-cache==1.7.1
+pysolr==3.8.1


This looks like something used for hystack only https://github.com/django-haystack/pysolr, it was removed a time ago #4039

stsewd · 2018-11-09T00:10:52Z

requirements/pip.txt

 # Required to avoid Transifex error with reserved slug
 # https://github.com/sphinx-doc/sphinx-intl/pull/27
 git+https://github.com/agjohnson/sphinx-intl.git@7b5c66bdb30f872b3b1286e371f569c8dcb66de5#egg=sphinx-intl

 Pygments==2.2.0

-mkdocs==0.17.3
+mkdocs==1.0.4
 # mkdocs requires markdown
 # Markdown 3.0 breaks with older Django Rest Framework
 Markdown<3.0


Maybe we are safe to update this?

stsewd · 2018-11-09T00:24:55Z

requirements/pip.txt

+# E       def __init__(self, data=None, queryset=None, *, request=None, prefix=None):
+# E                                                     ^
+# E   SyntaxError: invalid syntax
+django-filter<2.0.0


I guess the above comments

filter_fields = ('slug',) # django-filter<2.0.0 filterset_fields = ('slug',)

are because of this? I think is better to just create an issue, rather than hiding it on the code

We can't upgrade to 2.0.0 yet because we are still running tests with Py2. Once we remove that, we can upgrade without touching the code.

The comments added into the code already prepared it for 2.0.0.

I prefer to prepare the code to work with both versions now and when we upgrade, we can remove the lines that are not needed.

$ for reqs in `ls requirements`; do pur --skip django,docker,elasticsearch,pyelasticsearch,commonmark,stripe,mkdocs,gitpython,mercurial --requirement requirements/$reqs; done

$ for reqs in `ls requirements`; do pur --skip django,docker,celery,gitpython,elasticsearch,pyelasticsearch,mercurial --requirement requirements/$reqs; done

$ for reqs in `ls requirements`; do pur --skip stripe,commonmark,django,docker,celery,gitpython,elasticsearch,pyelasticsearch,mercurial --requirement requirements/$reqs; done

$ for reqs in `ls requirements`; do pur --skip django,docker,celery,commonmark,gitpython,elasticsearch,pyelasticsearch,mercurial --requirement requirements/$reqs; done

ericholscher

Looks good to me. I think we should merge this and update locally to test it before it gets deployed.

humitos requested a review from a team October 22, 2018 16:30

stsewd reviewed Oct 22, 2018

View reviewed changes

requirements/pip.txt Show resolved Hide resolved

humitos force-pushed the humitos/pur/update branch from 2f25436 to 5b9195a Compare October 27, 2018 13:36

humitos added the PR: work in progress Pull request is not ready for full review label Oct 27, 2018

humitos force-pushed the humitos/pur/update branch from 5b9195a to 1c6a093 Compare October 27, 2018 13:44

humitos commented Oct 27, 2018

View reviewed changes

humitos force-pushed the humitos/pur/update branch from e3ad2a2 to 1c2034e Compare November 8, 2018 08:54

humitos requested a review from a team November 8, 2018 09:49

humitos removed the PR: work in progress Pull request is not ready for full review label Nov 8, 2018

stsewd reviewed Nov 9, 2018

View reviewed changes

humitos mentioned this pull request Nov 12, 2018

Lint docs with latest sphinx #4884

Closed

humitos force-pushed the humitos/pur/update branch from d810291 to f34d746 Compare November 12, 2018 09:04

stsewd mentioned this pull request Nov 13, 2018

Unpin dependencies to support old version of Django #4897

Closed

humitos added 9 commits November 28, 2018 10:48

All package updates

73074d1

$ for reqs in `ls requirements`; do pur --skip django,docker,elasticsearch,pyelasticsearch,commonmark,stripe,mkdocs,gitpython,mercurial --requirement requirements/$reqs; done

Changes required to upgrade to django-filter 2.0

51a1e38

Use proper HttpRequest object to call a Django view

f95cae3

More upgrades

3111e36

$ for reqs in `ls requirements`; do pur --skip django,docker,celery,gitpython,elasticsearch,pyelasticsearch,mercurial --requirement requirements/$reqs; done

django-filter upgrade with message

05fde12

Compatibility with django-filter<2.0.0

9c8f500

Py2 and Py3 supported on tests

d107dd3

More updates

fe47fb7

$ for reqs in `ls requirements`; do pur --skip stripe,commonmark,django,docker,celery,gitpython,elasticsearch,pyelasticsearch,mercurial --requirement requirements/$reqs; done

Latest updates

f0edd22

$ for reqs in `ls requirements`; do pur --skip django,docker,celery,commonmark,gitpython,elasticsearch,pyelasticsearch,mercurial --requirement requirements/$reqs; done

humitos force-pushed the humitos/pur/update branch from f34d746 to f0edd22 Compare November 28, 2018 09:52

Regex string escape properly

b774e08

humitos requested a review from a team November 29, 2018 20:22

ericholscher approved these changes Nov 29, 2018

View reviewed changes

ericholscher merged commit b15e5d3 into master Nov 29, 2018

humitos deleted the humitos/pur/update branch November 29, 2018 20:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

All package updates #4792

All package updates #4792

humitos commented Oct 22, 2018 •

edited

Loading

codecov bot commented Oct 23, 2018 •

edited

Loading

stsewd commented Oct 26, 2018

humitos commented Oct 27, 2018

humitos Oct 27, 2018

stsewd Nov 9, 2018

stsewd Nov 9, 2018

stsewd Nov 9, 2018

humitos Nov 9, 2018

humitos Nov 9, 2018 •

edited

Loading

ericholscher left a comment

All package updates #4792

All package updates #4792

Conversation

humitos commented Oct 22, 2018 • edited Loading

codecov bot commented Oct 23, 2018 • edited Loading

Codecov Report

stsewd commented Oct 26, 2018

humitos commented Oct 27, 2018

humitos Oct 27, 2018

Choose a reason for hiding this comment

stsewd Nov 9, 2018

Choose a reason for hiding this comment

stsewd Nov 9, 2018

Choose a reason for hiding this comment

stsewd Nov 9, 2018

Choose a reason for hiding this comment

humitos Nov 9, 2018

Choose a reason for hiding this comment

humitos Nov 9, 2018 • edited Loading

Choose a reason for hiding this comment

ericholscher left a comment

Choose a reason for hiding this comment

humitos commented Oct 22, 2018 •

edited

Loading

codecov bot commented Oct 23, 2018 •

edited

Loading

humitos Nov 9, 2018 •

edited

Loading