Skip to content

Commit

Permalink
Commitin
Browse files Browse the repository at this point in the history
  • Loading branch information
dafeda committed Sep 20, 2023
1 parent d15fb11 commit 0e911b5
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/annotate_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ jobs:
- name: Install flake8
run: pip install flake8 flake8-bugbear flake8-simplify flake8-debugger flake8-pep3101
- name: install project
run: pip install .
- name: install dev requirements
run: pip install -r dev-requirements.txt
run: pip install ".[dev]"
- name: install typing requirements
run: pip install -r types-requirements.txt
- name: find changed files
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ jobs:

- name: Install with dependencies
run: |
pip install .
pip install -r dev-requirements.txt
pip install ".[dev]"
- name: Test GUI
if: matrix.test-type == 'gui-tests'
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/doctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ jobs:
setup.py
pyproject.toml
dev-requirements.txt
- run: pip install -e .

- name: Install with dependencies
run: |
pip install -r dev-requirements.txt
- run: pip install -e ".[dev]"

- name: Test doctest
run: |
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test_ert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ jobs:

- name: Install wheel
run: |
find . -name "*.whl" -exec pip install {} \;
- name: Install dependencies
run: pip install -r dev-requirements.txt
find . -name "*.whl" -exec pip install "{}[dev]" \;
- name: Test GUI
if: inputs.test-type == 'gui-test'
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/typing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install ERT and dependencies
run: |
pip install .
pip install ".[dev]"
- name: Install dependencies
# type checking requires protobuf stubs
run: |
python -m pip install --upgrade pip
python -m pip install -r types-requirements.txt
python -m pip install -r dev-requirements.txt
python -m pip install grpcio-tools
python -m grpc_tools.protoc -I src/_ert_com_protocol --mypy_out=src/_ert_com_protocol src/_ert_com_protocol/_schema.proto
- run: echo ::add-matcher::.github/mypy-matcher.json
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ noise in the review process.

You can build the documentation after installation by running
```bash
pip install -r dev-requirements.txt
pip install ".[dev]"
sphinx-build -n -v -E -W ./docs ./tmp/ert_docs
```
and then open the generated `./tmp/ert_docs/index.html` in a browser.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pip install --editable .
Additional development packages must be installed to run the test suite:

```sh
pip install -r dev-requirements.txt
pip install ".[dev]"
pytest tests/
```

Expand Down
3 changes: 1 addition & 2 deletions ci/jenkins/Jenkinsfile-performance
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ pipeline {
source env/bin/activate
source /opt/rh/devtoolset-9/enable
pip install --upgrade pip
pip install .
pip install -r dev-requirements.txt
pip install ".[dev]"
"""
}
}
Expand Down
38 changes: 38 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,44 @@ ert = "ert.__main__:main"
[project.urls]
Repository = "https://github.com/equinor/ert"

[project.optional-dependencies]
dev = [
"click",
"decorator",
"ecl_data_io",
"furo",
"flaky",
"grpcio-tools",
"hypothesis<=6.83.0; python_version=='3.8'", # ipython pinned to 8.12.2 for python 3.8 support
"hypothesis; python_version>='3.9'",
"jsonpath_ng",
"jupytext",
"oil_reservoir_synthesizer",
"pytest-asyncio",
"pytest-benchmark",
"pytest-cov",
"pytest-memray",
"pytest-mock",
"pytest-mpl",
"pytest-qt",
"pytest-raises",
"pytest-snapshot",
"pytest-timeout",
"pytest-xdist",
"pytest>6",
"requests",
"scikit-build",
"setuptools_scm",
"sortedcontainers",
"sphinx<7.2",
"sphinx-argparse",
"sphinx-autoapi",
"sphinx-copybutton",
"sphinxcontrib-plantuml",
"sphinxcontrib.datatemplates",
"testpath",
]

[tool.setuptools]
platforms = ["all"]

Expand Down

0 comments on commit 0e911b5

Please sign in to comment.