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

Try out single code block #203

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, "3.10"] # Check the oldest and newest currently supported Python versions
python-version: [3.8, "3.11"] # Check the oldest and newest currently supported Python versions

steps:

Expand All @@ -41,9 +41,13 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Use latest version of pip
run: |
python -m pip install --upgrade pip

- name: Install Python dependencies including sphinx
run: |
pip3 install --user -e .[dev]
python -m pip install --user -e .[dev]

- name: Build documentation and check for warnings
run: |
Expand Down
19 changes: 5 additions & 14 deletions .github/workflows/installation-from-remote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,12 @@ jobs:
activate-environment: true
python-version: '3.10'

- name: Install ConFlowGen
- name: Install ConFlowGen and run tests
run: |
conda info
conda search conflowgen -c conda-forge --info
conda create -n test-install-conflowgen -c conda-forge conflowgen pytest

- name: Run tests
run: |
conda activate test-install-conflowgen
conda install pillow=9.0.0
python -m pytest --pyargs conflowgen

build-conda-on-linux:
Expand All @@ -55,17 +52,14 @@ jobs:
auto-activate-base: true
activate-environment: ""

- name: Install ConFlowGen
- name: Install ConFlowGen and run tests
run: |
conda init bash
eval "$(conda shell.bash hook)"
conda info
conda search conflowgen -c conda-forge --info
conda activate base
conda create -n test-install-conflowgen -c conda-forge conflowgen pytest

- name: Run tests
run: |
eval "$(conda shell.bash hook)"
conda activate test-install-conflowgen
python -m pytest --pyargs conflowgen

Expand All @@ -89,11 +83,8 @@ jobs:
with:
python-version: '3.10'

- name: Install ConFlowGen
- name: Install ConFlowGen and run tests
run: |
python -m pip install conflowgen pytest
python -m pip show --verbose conflowgen

- name: Run tests
run: |
python -m pytest --pyargs conflowgen
6 changes: 5 additions & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Use latest version of pip
run: |
python -m pip install --upgrade pip

- name: Install Python dependencies including pylint
run: |
pip3 install --user -e .[dev]
python -m pip install --user -e .[dev]

- name: Check code quality with pylint
run: |
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/unittests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@ jobs:
with:
python-version: "3.10"

- name: Use latest version of pip
run: |
python -m pip install --upgrade pip

- name: Install Python dependencies
run: |
pip3 install --user -e .[dev]
python -m pip install --user -e .[dev]

- name: Test with pytest
run: |
Expand Down
11 changes: 7 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
'peewee >=3', # ORM mapper

# documentation - decorators used for sphinx but are part of the source code delivered to customers
'enum_tools >=0.7', # used for documenting enums via decorators
'enum_tools >=0.7', # used for documenting enums via decorators - previous versions are not compatible

# for creating the visuals
'matplotlib', # default plots such as bar charts, pie charts, etc.
Expand All @@ -55,11 +55,11 @@
'nbconvert',

# build documentation
'sphinx', # build the documentation
'sphinx >=6.2', # build the documentation - restrict version to improve pip version resolution
'sphinx-rtd-theme', # adding the nice sphinx theme
'sphinx-toolbox', # dependency of enum_tools, we got this as a present
'sphinx-toolbox >=3', # additional dependency of enum_tools - restrict version to improve pip resolution
'myst-parser', # for Contributing.md
'sphinxcontrib-bibtex', # a good help for citing
'sphinxcontrib-bibtex >=2.4', # a good help for citing - restrict version to improve pip resolution
'nbsphinx', # use Jupyter Notebooks in the documentation
'ipython', # for setting up the pygments_lexer
'ipykernel', # for allowing nbsphinx to execute the Jupyter Notebooks
Expand All @@ -73,6 +73,9 @@
# publish at PyPI
'wheel', # use command 'bdist_wheel'
'twine', # check and upload package to PyPI

# pip resolution issue - https://github.com/pypa/pip/issues/12430#issuecomment-1849059000
'sphinx-tabs'
],
# a collection of nice-to-haves for working on Jupyter Notebooks - just a favorites list of the authors
'jupyterlab': [
Expand Down