Fix ci workflow timeout #5408

greshilov · 2021-01-14T22:58:54Z

What do these changes do?

Increasing ci workflow timeout.

UPDATE Timeout is not changed, but pip-tools is used to pin dependencies and solve timeout issue.

Are there changes in behavior for the user?

No.

Related issue number

Fixes #5389

Checklist

I think the code is well written
Unit tests for the changes exist
Documentation reflects the changes
If you provide code modification, please add yourself to CONTRIBUTORS.txt
- The format is <Name> <Surname>.
- Please keep alphabetical order, the file is sorted by names.
Add a new news fragment into the CHANGES folder
- name it <issue_id>.<type> for example (588.bugfix)
- if you don't have an issue_id change it to the pr id after creating the pr
- ensure type is one of the following:
  - .feature: Signifying a new feature.
  - .bugfix: Signifying a bug fix.
  - .doc: Signifying a documentation improvement.
  - .removal: Signifying a deprecation or removal of public API.
  - .misc: A ticket has been closed, but it is not of interest to users.
- Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

This change is

codecov · 2021-01-14T23:03:28Z

Codecov Report

Merging #5408 (6ee2a40) into master (3250c5d) will increase coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #5408      +/-   ##
==========================================
+ Coverage   97.15%   97.17%   +0.02%     
==========================================
  Files          41       41              
  Lines        8742     8742              
  Branches     1402     1402              
==========================================
+ Hits         8493     8495       +2     
+ Misses        130      129       -1     
+ Partials      119      118       -1

Flag	Coverage Δ
unit	`97.06% <ø> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
aiohttp/web.py	`99.14% <0.00%> (+1.70%)`	⬆️

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 3250c5d...6ee2a40. Read the comment docs.

webknjaz · 2021-01-15T12:33:55Z

@greshilov Do you want to explore using pip-tools?

greshilov · 2021-01-16T00:30:26Z

@greshilov Do you want to explore using pip-tools?

Looks like i have no choice. I'll try a few more times with constraints.txt, but pip-tools will solve this problem for sure.

greshilov · 2021-01-16T02:09:55Z

@webknjaz pip-tools works like a charm, thank you for suggestioning this package. Please, take a look.

dev.txt renamed to dev.in. dev.txt added to .gitignore since it autogenerated.
I've updated cryptography version, because pip-compile tool failed to resolve dependencies with old one.
Makefile modified accordingly.

webknjaz · 2021-01-16T22:00:39Z

dev.txt renamed to dev.in. dev.txt added to .gitignore since it autogenerated.

This is a bad idea. Both files must be committed. Moreover, dependabot automatically recognizes the pairs of .in + .txt files and autoupdates the latter.

.gitignore

Makefile

requirements/test.txt

.pre-commit-config.yaml

CHANGES/5389.bugfix

webknjaz · 2021-01-18T12:23:29Z

.pre-commit-config.yaml

@@ -30,6 +30,8 @@ repos:
 exclude: >-
 ^docs/[^/]*\.svg$
 - id: requirements-txt-fixer
+ exclude: >-
+ ^requirements/dev.txt


Suggested change

^requirements/dev.txt

^requirements/dev.txt$

webknjaz · 2021-01-18T12:27:23Z

Makefile

+ @pip-compile --allow-unsafe -q requirements/dev.in
+
+.PHONY: install
+install: .update-pip
 @pip install -Ur requirements/dev.txt


The canonical use of the lockfiles is as follows:

Suggested change

@pip install -Ur requirements/dev.txt

@pip install -r requirements/dev.in -c requirements/dev.txt

webknjaz · 2021-01-18T12:29:03Z

Urgh... auto-merge got triggered when I posted comments :(

webknjaz · 2021-01-18T12:30:37Z

@greshilov mind backporting this?

webknjaz · 2021-01-18T12:34:05Z

Also, it's not clear how well dependabot works with files included via -r. It may be necessary to apply pip-tools there as well.

greshilov · 2021-01-18T12:58:05Z

Urgh... auto-merge got triggered when I posted comments :(

Strange behaviour.

Should I create another PR with hotfixes?

webknjaz · 2021-01-18T12:59:06Z

yes, please

* Increase ci workflow timeout * Fix ci cache key typo * fixup! Increase ci workflow timeout * fixup! fixup! Increase ci workflow timeout

greshilov requested review from asvetlov and webknjaz as code owners January 14, 2021 22:58

psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jan 14, 2021

greshilov force-pushed the pr-5389 branch 2 times, most recently from 6ae77f5 to aef3a17 Compare January 15, 2021 00:47

webknjaz approved these changes Jan 15, 2021

View reviewed changes

webknjaz enabled auto-merge (squash) January 15, 2021 01:07

greshilov force-pushed the pr-5389 branch 9 times, most recently from e56fa8d to 48d2837 Compare January 15, 2021 02:52

greshilov force-pushed the pr-5389 branch 4 times, most recently from 036a35c to 9ae468d Compare January 16, 2021 01:59

greshilov changed the title ~~Increase ci workflow timeout~~ Fix ci workflow timeout Jan 16, 2021

webknjaz requested changes Jan 16, 2021

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

Makefile Outdated Show resolved Hide resolved

requirements/test.txt Show resolved Hide resolved

greshilov force-pushed the pr-5389 branch 3 times, most recently from 7479f42 to 523df30 Compare January 17, 2021 14:10

greshilov force-pushed the pr-5389 branch from 523df30 to ccd59d2 Compare January 17, 2021 14:12

webknjaz reviewed Jan 17, 2021

View reviewed changes

.pre-commit-config.yaml Show resolved Hide resolved

webknjaz reviewed Jan 17, 2021

View reviewed changes

CHANGES/5389.bugfix Outdated Show resolved Hide resolved

greshilov force-pushed the pr-5389 branch from ccd59d2 to 344fa73 Compare January 17, 2021 14:22

Use pip-tools to pin dependencies

6ee2a40

greshilov force-pushed the pr-5389 branch from 344fa73 to 6ee2a40 Compare January 17, 2021 14:27

webknjaz reviewed Jan 18, 2021

View reviewed changes

webknjaz merged commit b49fdd5 into aio-libs:master Jan 18, 2021

webknjaz reviewed Jan 18, 2021

View reviewed changes

webknjaz added the backport-3.8 label Jan 18, 2021

greshilov added a commit to greshilov/aiohttp that referenced this pull request Jan 18, 2021

Hotfix aio-libs#5408

7b5de8a

greshilov mentioned this pull request Jan 18, 2021

Hotfix #5408 #5416

Merged

5 tasks

webknjaz pushed a commit that referenced this pull request Jan 18, 2021

Hotfix #5408 (#5416)

3014db4

webknjaz mentioned this pull request Jan 21, 2021

[3.8] Enforce strict mypy checks #5425

Merged

5 tasks

greshilov added a commit to greshilov/aiohttp that referenced this pull request Jan 21, 2021

[3.8] Use pip-tools to pin dependencies (aio-libs#5408)

eb9894c

greshilov mentioned this pull request Jan 21, 2021

[3.8] Use pip-tools to pin dependencies (#5389) #5427

Merged

5 tasks

alandtse pushed a commit to alandtse/aiohttp that referenced this pull request Feb 14, 2021

Increase ci workflow timeout (aio-libs#5408)

4cb7010

* Increase ci workflow timeout * Fix ci cache key typo * fixup! Increase ci workflow timeout * fixup! fixup! Increase ci workflow timeout

alandtse pushed a commit to alandtse/aiohttp that referenced this pull request Feb 14, 2021

Hotfix aio-libs#5408 (aio-libs#5416)

a90c4f5

commonism pushed a commit to commonism/aiohttp that referenced this pull request Apr 27, 2021

Increase ci workflow timeout (aio-libs#5408)

73edbaf

* Increase ci workflow timeout * Fix ci cache key typo * fixup! Increase ci workflow timeout * fixup! fixup! Increase ci workflow timeout

commonism pushed a commit to commonism/aiohttp that referenced this pull request Apr 27, 2021

Hotfix aio-libs#5408 (aio-libs#5416)

895ae70

commonism pushed a commit to commonism/aiohttp that referenced this pull request Apr 27, 2021

Increase ci workflow timeout (aio-libs#5408)

731872d

* Increase ci workflow timeout * Fix ci cache key typo * fixup! Increase ci workflow timeout * fixup! fixup! Increase ci workflow timeout

commonism pushed a commit to commonism/aiohttp that referenced this pull request Apr 27, 2021

Hotfix aio-libs#5408 (aio-libs#5416)

48e8739

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix ci workflow timeout #5408

Fix ci workflow timeout #5408

greshilov commented Jan 14, 2021 •

edited

Loading

codecov bot commented Jan 14, 2021 •

edited

Loading

webknjaz commented Jan 15, 2021

greshilov commented Jan 16, 2021

greshilov commented Jan 16, 2021 •

edited

Loading

webknjaz commented Jan 16, 2021

webknjaz Jan 18, 2021

webknjaz Jan 18, 2021

webknjaz commented Jan 18, 2021

webknjaz commented Jan 18, 2021

webknjaz commented Jan 18, 2021

greshilov commented Jan 18, 2021

webknjaz commented Jan 18, 2021

	@pip install -Ur requirements/dev.txt
	@pip install -r requirements/dev.in -c requirements/dev.txt

Fix ci workflow timeout #5408

Fix ci workflow timeout #5408

Conversation

greshilov commented Jan 14, 2021 • edited Loading

What do these changes do?

Are there changes in behavior for the user?

Related issue number

Checklist

codecov bot commented Jan 14, 2021 • edited Loading

Codecov Report

webknjaz commented Jan 15, 2021

greshilov commented Jan 16, 2021

greshilov commented Jan 16, 2021 • edited Loading

webknjaz commented Jan 16, 2021

webknjaz Jan 18, 2021

Choose a reason for hiding this comment

webknjaz Jan 18, 2021

Choose a reason for hiding this comment

webknjaz commented Jan 18, 2021

webknjaz commented Jan 18, 2021

webknjaz commented Jan 18, 2021

greshilov commented Jan 18, 2021

webknjaz commented Jan 18, 2021

greshilov commented Jan 14, 2021 •

edited

Loading

codecov bot commented Jan 14, 2021 •

edited

Loading

greshilov commented Jan 16, 2021 •

edited

Loading