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

Fix ecl to res in docs #259

Merged
merged 5 commits into from
Sep 10, 2024
Merged

Fix ecl to res in docs #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a91a70
Update test requirements
larsevj Sep 10, 2024
aeae651
Change black -> ruff in contributing.rst
larsevj Sep 10, 2024
68b17f6
Fix docs building issue
larsevj Sep 10, 2024
b9f7476
Use build instead of python setup.py
larsevj Sep 10, 2024
a275d94
Update badges in readme
larsevj Sep 10, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/fmu-ensemble.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ jobs:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.pypi_fmuensemble_token }}
run: |
python -m pip install --upgrade setuptools wheel twine
python setup.py sdist bdist_wheel
python -m pip install --upgrade build twine
python -m build
twine upload dist/*

- name: 📚 Update GitHub pages
if: github.event_name == 'release' && github.repository == 'equinor' && matrix.python-version == '3.8'
if: github.event_name == 'release' && github.repository == 'equinor/fmu-ensemble' && matrix.python-version == '3.8'
run: |
cp -R ./build/sphinx/html ../html

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ PEP8 and PEP20

* Use PEP8 standard (https://www.python.org/dev/peps/pep-0008/) and PEP20 philosophy, with line length set 88.

* Use the source code formatter black (https://github.com/python/black)
* Use the source code formatter ruff (https://github.com/astral-sh/ruff)

* Naming: `files_as_this`, `ClassesAsThis`, `ExceptionsAsThis`, `CONSTANTS`,
`function_as_this`, `method_as_this`
Expand Down
24 changes: 6 additions & 18 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
.. image:: https://badge.fury.io/py/fmu-ensemble.svg
:target: https://badge.fury.io/py/fmu-ensemble

.. image:: https://img.shields.io/github/workflow/status/equinor/fmu-ensemble/fmu-ensemble
:target: https://github.com/equinor/fmu-ensemble/actions?query=workflow%3Afmu-ensemble

.. image:: https://img.shields.io/lgtm/alerts/g/equinor/fmu-ensemble.svg?logo=lgtm&logoWidth=18
:target: https://lgtm.com/projects/g/equinor/fmu-ensemble/alerts/

.. image:: https://codecov.io/gh/equinor/fmu-ensemble/branch/master/graph/badge.svg
:target: https://codecov.io/gh/equinor/fmu-ensemble

.. image:: https://img.shields.io/lgtm/grade/python/g/equinor/fmu-ensemble.svg?logo=lgtm&logoWidth=18
:target: https://lgtm.com/projects/g/equinor/fmu-ensemble/context:python

.. image:: https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10-blue.svg
:target: https://www.python.org
[![Pypi package](https://badge.fury.io/py/fmu-ensemble.svg)](https://badge.fury.io/py/fmu-ensemble)
[![Build Status](https://img.shields.io/github/actions/workflow/status/equinor/fmu-ensemble/fmu-ensemble.yml?branch=master)](https://github.com/equinor/fmu-ensemble/actions?query=workflow%3Afmu-ensemble)
[![codecov](https://codecov.io/gh/equinor/fmu-ensemble/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/fmu-ensemble)
[![Python 3.8-3.12](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)](https://www.python.org)
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

==============================
Introduction to *fmu.ensemble*
Introduction to *FMU Ensemble*
==============================

FMU Ensemble is a Python module for handling simulation ensembles
Expand Down
3 changes: 0 additions & 3 deletions test_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
black>=21.4b0
flake8>=2.6.0
pre-commit
pylint
pytest>=2.9.2
pytest-cov
pyyaml>=5.1
Loading