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

Drop 3.5 #4046

Merged
merged 6 commits into from
Oct 2, 2019
Merged

Drop 3.5 #4046

merged 6 commits into from
Oct 2, 2019

Conversation

asvetlov
Copy link
Member

@asvetlov asvetlov commented Sep 7, 2019

Fixes #3947

@asvetlov asvetlov requested a review from webknjaz as a code owner September 7, 2019 21:14
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 7, 2019
@codecov-io

This comment has been minimized.

2 similar comments
@codecov-io

This comment has been minimized.

@codecov-io

This comment has been minimized.

@codecov-io

This comment has been minimized.

@webknjaz
Copy link
Member

webknjaz commented Sep 9, 2019

@asvetlov FYI I've rebased this

@@ -10,8 +10,8 @@
from setuptools import Extension, setup


if sys.version_info < (3, 5, 3):
raise RuntimeError("aiohttp 3.x requires Python 3.5.3+")
if sys.version_info < (3, 6):
Copy link
Member

Choose a reason for hiding this comment

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

It's okay to just remove this check since setuptools that supports python_requires is shipped with Python 3.6.

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 want to fail loudly even on Python 3.5

setup.py Outdated Show resolved Hide resolved
@webknjaz
Copy link
Member

webknjaz commented Sep 9, 2019

I've triggered a full matrix build for this branch now: https://travis-ci.com/aio-libs/aiohttp/builds/126532209

@asvetlov
Copy link
Member Author

Thanks.
pypy fails on the branch on yarl encoding, I need to investigate

.travis.yml Show resolved Hide resolved
@asvetlov
Copy link
Member Author

The failure source is different behavior of yarl quoting/unquoting for cythonized and pure python versions

@asvetlov
Copy link
Member Author

asvetlov commented Oct 1, 2019

The failure reason is a different behavior of pure python and cythonized yarl versions.
The bug is fixed on yarl master, I'll move failed tests into yarl repository.

@asvetlov asvetlov merged commit cfb40b7 into master Oct 2, 2019
@asvetlov asvetlov deleted the drop-3.5 branch October 2, 2019 14:22
@patchback
Copy link
Contributor

patchback bot commented Sep 10, 2022

Backport to 3.9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply cfb40b7 on top of patchback/backports/3.9/cfb40b7282ce41d10fcfc2021992808760f9bf6e/pr-4046

Backporting merged PR #4046 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.9/cfb40b7282ce41d10fcfc2021992808760f9bf6e/pr-4046 upstream/3.9
  4. Now, cherry-pick PR Drop 3.5 #4046 contents into that branch:
    $ git cherry-pick -x cfb40b7282ce41d10fcfc2021992808760f9bf6e
    If it'll yell at you with something like fatal: Commit cfb40b7282ce41d10fcfc2021992808760f9bf6e is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x cfb40b7282ce41d10fcfc2021992808760f9bf6e
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Drop 3.5 #4046 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/cfb40b7282ce41d10fcfc2021992808760f9bf6e/pr-4046
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback
Copy link
Contributor

patchback bot commented Sep 10, 2022

Backport to 3.8: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply cfb40b7 on top of patchback/backports/3.8/cfb40b7282ce41d10fcfc2021992808760f9bf6e/pr-4046

Backporting merged PR #4046 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.8/cfb40b7282ce41d10fcfc2021992808760f9bf6e/pr-4046 upstream/3.8
  4. Now, cherry-pick PR Drop 3.5 #4046 contents into that branch:
    $ git cherry-pick -x cfb40b7282ce41d10fcfc2021992808760f9bf6e
    If it'll yell at you with something like fatal: Commit cfb40b7282ce41d10fcfc2021992808760f9bf6e is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x cfb40b7282ce41d10fcfc2021992808760f9bf6e
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Drop 3.5 #4046 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/cfb40b7282ce41d10fcfc2021992808760f9bf6e/pr-4046
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

webknjaz pushed a commit that referenced this pull request Sep 10, 2022
(cherry picked from commit cfb40b7)
webknjaz pushed a commit that referenced this pull request Sep 10, 2022
(cherry picked from commit cfb40b7)
@webknjaz
Copy link
Member

Backported as 72d3550 and 461c98c to address the compatibility issues with Python 3.11 in tests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Discussion: drop Python 3.5 support
3 participants