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

Update package versions #321

Merged
merged 3 commits into from
Oct 12, 2022
Merged

Update package versions #321

merged 3 commits into from
Oct 12, 2022

Conversation

forsyth2
Copy link
Collaborator

@forsyth2 forsyth2 commented Oct 5, 2022

Change jinja2 version. Resolves #318. Note that this does not break #252, since the version is still above 3.0.0. Also updates various other package versions.

@forsyth2 forsyth2 added DevOps CI/CD, configuration, etc. semver: bug Bug fix (will increment patch version) Documentation Files in `docs` modified labels Oct 5, 2022
@forsyth2 forsyth2 added this to the December 2022 Requirements milestone Oct 5, 2022
@forsyth2 forsyth2 self-assigned this Oct 5, 2022
@forsyth2 forsyth2 removed this from the December 2022 Requirements milestone Oct 6, 2022
@forsyth2
Copy link
Collaborator Author

forsyth2 commented Oct 7, 2022

@tomvothecoder When you have time, can you review this please? I was finally able to get all the checks to pass on CI/CD. I ended up using the latest available version of everything -- except I ended up using Python 3.8 rather than 3.10 to avoid dependency conflicts.

I'm not sure I updated everything correctly outside conda/dev.yml though -- i.e., .pre-commit-config.yaml, .github/workflows/build_workflow.yml, .github/workflows/release_workflow.yml.

@forsyth2 forsyth2 marked this pull request as ready for review October 7, 2022 01:55
@forsyth2 forsyth2 requested a review from tomvothecoder October 7, 2022 01:55
@tomvothecoder
Copy link
Collaborator

tomvothecoder commented Oct 10, 2022

Sounds good, will review when I can fit this in (probably Thurs/Friday).

@forsyth2
Copy link
Collaborator Author

Note: we want to look at supporting Python 3.9 rather than 3.8 as this PR currently does.

- Add line break between GH Actions job steps
- Update Python versions to 3.9
Copy link
Collaborator

@tomvothecoder tomvothecoder left a comment

Choose a reason for hiding this comment

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

Hey @forsyth2, please review my updates. The docs build locally and the GH Actions build is passing.

If you agree, please merge.

Comment on lines +33 to +36
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.9
Copy link
Collaborator

Choose a reason for hiding this comment

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

Updated to Python 3.9 (it will pick up the latest patch version, which is 3.9.13).

Comment on lines 101 to +104
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.9
Copy link
Collaborator

Choose a reason for hiding this comment

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

Updated to Python 3.9 (it will pick up the latest patch version, which is 3.9.13).

# Using pip for Sphinx dependencies because it takes too long to reproduce a conda environment (~10 secs vs. 3-4 mins)
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install sphinx==4.0.2 sphinx_rtd_theme==0.5.2 sphinx-multiversion==0.2.4 docutils==0.16
pip install sphinx==5.2.3 sphinx_rtd_theme==1.0.0 sphinx-multiversion==0.2.4 docutils==0.16
Copy link
Collaborator

Choose a reason for hiding this comment

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

Updated these doc dependencies in the GH Actions to align with dev.yml

- name: Build Sphinx Docs
run: |
cd docs
sphinx-multiversion source _build/html

Copy link
Collaborator

Choose a reason for hiding this comment

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

Added line breaks between steps to make them easier to read.

Comment on lines 27 to +30
with:
activate-environment: "zppy_publish"
channel-priority: strict
python-version: 3.7
python-version: 3.9
Copy link
Collaborator

Choose a reason for hiding this comment

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

Updated to Python 3.9 (it will pick up the latest patch version, which is 3.9.13).

Comment on lines 70 to +73
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.9
Copy link
Collaborator

Choose a reason for hiding this comment

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

Updated to Python 3.9 (it will pick up the latest patch version, which is 3.9.13).

Comment on lines 86 to +90
# Using pip for Sphinx dependencies because it takes too long to reproduce a conda environment (~10 secs vs. 3-4 mins)
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install sphinx==4.0.2 sphinx_rtd_theme==0.5.2 sphinx-multiversion==0.2.4 docutils==0.16
pip install sphinx==5.2.3 sphinx_rtd_theme==1.0.0 sphinx-multiversion==0.2.4 docutils==0.16
Copy link
Collaborator

Choose a reason for hiding this comment

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

Updated these doc dependencies in the GH Actions to align with dev.yml

@@ -82,29 +82,36 @@ jobs:
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-

Copy link
Collaborator

Choose a reason for hiding this comment

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

Added line breaks between steps to make them easier to read.

Comment on lines +8 to +9
- python=3.9.13
- pip=22.2.2
Copy link
Collaborator

@tomvothecoder tomvothecoder Oct 12, 2022

Choose a reason for hiding this comment

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

I moved python and pip to the top because that's where they are usually listed since they are "system" level dependencies required to install the other packages.

- flake8-isort=4.2.0 # version from https://anaconda.org/conda-forge/flake8-isort
- mypy=0.982 # version from https://anaconda.org/conda-forge/mypy
- pre-commit=2.20.0 # version from https://anaconda.org/conda-forge/pre-commit
- tbump=6.9.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

tbump is now available on conda-forge so it doesn't need to be installed through - pip :

@forsyth2 forsyth2 changed the title Change jinja2 version Update package versions Oct 12, 2022
@forsyth2 forsyth2 merged commit 8e6b049 into main Oct 12, 2022
@forsyth2 forsyth2 deleted the fix-jinja-error branch October 12, 2022 23:30
@forsyth2
Copy link
Collaborator Author

Thanks @tomvothecoder!

@forsyth2 forsyth2 removed the Documentation Files in `docs` modified label Nov 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DevOps CI/CD, configuration, etc. semver: bug Bug fix (will increment patch version)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix ImportError: cannot import name 'environmentfilter' from 'jinja2'
2 participants