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

Dependencies: Bump jinja2 to version 3.0 #5046

Merged
merged 5 commits into from
Aug 11, 2021
Merged

Conversation

csadorf
Copy link
Contributor

@csadorf csadorf commented Aug 4, 2021

No description provided.

@csadorf csadorf added topic/dependencies dependencies Pull requests that update a dependency file topic/dependencies/constraint Issues related to dependency constraints that should be resolved. labels Aug 4, 2021
@csadorf csadorf linked an issue Aug 4, 2021 that may be closed by this pull request
@github-actions
Copy link
Contributor

github-actions bot commented Aug 4, 2021

Please update the requirements/ files to ensure that they
are consistent with the dependencies specified in the 'setup.json' file.

@csadorf csadorf force-pushed the dm/bump-jinja2-3.0 branch from 8f25bf9 to 6447370 Compare August 4, 2021 12:21
@csadorf
Copy link
Contributor Author

csadorf commented Aug 4, 2021

The docs failure appears to be related to: mkdocs/mkdocs#864

@csadorf
Copy link
Contributor Author

csadorf commented Aug 9, 2021

Fixed in pydata/pydata-sphinx-theme@3455c23 (v0.6.3).

@csadorf csadorf force-pushed the dm/bump-jinja2-3.0 branch from 9f319f9 to fc9e5e7 Compare August 9, 2021 10:40
@csadorf csadorf force-pushed the dm/bump-jinja2-3.0 branch from fc9e5e7 to 00dcbf7 Compare August 9, 2021 10:42
@codecov
Copy link

codecov bot commented Aug 9, 2021

Codecov Report

Merging #5046 (56d6a49) into develop (c78e0e2) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #5046      +/-   ##
===========================================
+ Coverage    80.24%   80.25%   +0.01%     
===========================================
  Files          515      515              
  Lines        36753    36753              
===========================================
+ Hits         29489    29492       +3     
+ Misses        7264     7261       -3     
Flag Coverage Δ
django 74.74% <ø> (+0.01%) ⬆️
sqlalchemy 73.65% <ø> (+0.01%) ⬆️

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

Impacted Files Coverage Δ
aiida/orm/nodes/data/structure.py 83.41% <0.00%> (+0.21%) ⬆️
aiida/transports/plugins/local.py 81.66% <0.00%> (+0.26%) ⬆️

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 c78e0e2...56d6a49. Read the comment docs.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 9, 2021

Please update the requirements/ files to ensure that they
are consistent with the dependencies specified in the 'setup.json' file.

Co-authored-by: csadorf <csadorf@users.noreply.github.com>
@csadorf csadorf marked this pull request as ready for review August 9, 2021 12:21
@csadorf csadorf enabled auto-merge (squash) August 9, 2021 12:36
@csadorf csadorf requested a review from chrisjsewell August 9, 2021 12:36
@csadorf csadorf requested review from ltalirz and removed request for chrisjsewell August 11, 2021 10:39
@csadorf
Copy link
Contributor Author

csadorf commented Aug 11, 2021

@ltalirz The link check is failing, because http://www.quantum-espresso.org/ is down.

Copy link
Member

@ltalirz ltalirz left a comment

Choose a reason for hiding this comment

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

thanks @csadorf !

@csadorf csadorf merged commit 8e99581 into develop Aug 11, 2021
@csadorf csadorf deleted the dm/bump-jinja2-3.0 branch August 11, 2021 11:09
@ltalirz
Copy link
Member

ltalirz commented Aug 11, 2021

@csadorf , the man who merges faster than his shadow...

@csadorf
Copy link
Contributor Author

csadorf commented Aug 11, 2021

@csadorf , the man who merges faster than his shadow...

Haha, auto- merge was on. ;)

@adegomme
Copy link
Contributor

adegomme commented Aug 13, 2021

I just bumped into it, there is an issue with the pyzmq version in the 3.9 requirements file, it lists 22.1.1 (which does not exist) instead of 22.2.1 as in the other ones.

@ltalirz
Copy link
Member

ltalirz commented Aug 13, 2021

Thanks for the report @adegomme

@csadorf do you know how that got in there?
Also, I would have thought that the requirements files are being tested whenever they are touched?

@csadorf
Copy link
Contributor Author

csadorf commented Aug 13, 2021

Thanks for the report @adegomme

@csadorf do you know how that got in there?
Also, I would have thought that the requirements files are being tested whenever they are touched?

That was probably caused by a typo while resolving a merge conflict. However, we would probably have noticed if we would actually be testing on Python 3.9. Right now we are only testing Python 3.7 and 3.8. I assume to save computational resources?

Should we start testing on Python 3.9?

@ltalirz
Copy link
Member

ltalirz commented Aug 13, 2021

Hm... I guess what I'm saying is: why was that not caught by the test-install workflow, which should run for every python version?

name: test-install
on:
pull_request:
paths:
- 'setup.*'
- 'environment.yml'
- '**/requirements*.txt'
- 'pyproject.toml'
- 'util/dependency_management.py'
- '.github/workflows/test-install.yml'
branches-ignore: [gh-pages]
schedule:
- cron: '30 02 * * *' # nightly build

@csadorf
Copy link
Contributor Author

csadorf commented Aug 13, 2021

Hm... I guess what I'm saying is: why was that not caught by the test-install workflow, which should run for every python version?

That workflow tests the installation of AiiDA and checks whether the requirements file are compliant with our dependency specification. It does not try to create an environment from the requirements files. The non-existent pyzmq version 22.1.1 is compliant with our specification.

@ltalirz
Copy link
Member

ltalirz commented Aug 13, 2021

I see, so it installs AiiDA on all python versions but not from the requirements files.

Does this mean that the requirements-py-3.9.txt file was completely unused so far (except for being checked to follow the spec)?
It seems to me that this issue indicates that this check is not enough.
Perhaps test-install should also test installing from the requirements files?

I would not want to further expand the default CI that runs on every commit, but I think that would make sense to check whenever the requirements files are updated.

P.S. I would also swap python 3.8 with python 3.9 in ci-code, so that we test on the latest supported version

@csadorf
Copy link
Contributor Author

csadorf commented Aug 13, 2021

Agreed, it makes sense to try to pip-install the environments defined in the requirements files as part of the test-install workflow. Since that workflow is not run on every commit, I'd actually prefer to test all supported Python versions instead of swapping py38 with p39.

  • Add tests to create a Python environment from all requirements files.
  • Add Python 3.9 to tests job.

If you agree, I can propose that change.

@ltalirz
Copy link
Member

ltalirz commented Aug 13, 2021

sounds good!

@csadorf
Copy link
Contributor Author

csadorf commented Aug 16, 2021

sounds good!

Implemented in #5082 .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file topic/dependencies/constraint Issues related to dependency constraints that should be resolved. topic/dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support jinja2 3.x
3 participants