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.

Sign up for GitHub

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

Pin version of tox used in environment #142

Merged
merged 4 commits into from
Jul 5, 2023
Merged

Pin version of tox used in environment #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1b1670
Pin on tox 3 as tox conda doesn't support it
jfrost-mo Jul 5, 2023
1807880
Add minimal dev environment to avoid tox issues
jfrost-mo Jul 5, 2023
e1a0363
Rename environment so it is clear that it is for running CSET
jfrost-mo Jul 5, 2023
e82a8d4
Update documentation to suggest using the development environment
jfrost-mo Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions development.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: cset-dev
channels:
- conda-forge
dependencies:
# Just the dependencies needed during development. Others are pulled in by
# tox.
- pre-commit
- black
- tox-conda
2 changes: 1 addition & 1 deletion docs/source/working-practices/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ environment for you to use.
.. code-block:: bash

# Creates a conda environment. This command can be slow.
conda env create --file requirements/environment.yml
conda env create --file requirements/development.yaml
# Activates the conda environment.
conda activate cset-dev
# Adds extra checks when you commit something with git.
Expand Down
4 changes: 2 additions & 2 deletions requirements/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: cset-dev
name: cset-run
channels:
- conda-forge
dependencies:
Expand All @@ -22,7 +22,7 @@ dependencies:
- black

# Testing dependencies
- tox >= 4.0
- tox < 4.0
- tox-conda
- pytest >= 7.0
- pytest-cov
Expand Down