Skip to content

Commit

Permalink
p 12
Browse files Browse the repository at this point in the history
  • Loading branch information
@ameli
ameli committed Dec 4, 2023
1 parent 5a16fea commit 020d440
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 55 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-linux.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-linux

on:
# push:
# branches:
# - main
push:
branches:
- main
release:
types:
- published
Expand All @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-macos.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-macos

on:
# push:
# branches:
# - main
push:
branches:
- main
release:
types:
- published
Expand All @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-windows.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-windows

on:
# push:
# branches:
# - main
push:
branches:
- main
release:
types:
- published
Expand All @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check-manifest.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "Check Manifest"

on:
# push:
# branches:
# - main
push:
branches:
- main
release:
types: [published]

Expand All @@ -17,7 +17,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- name: Install prerequisites
run: sudo apt install libgeos3.10.2 libgeos-dev -y
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-conda.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: deploy-conda

on:
# push:
# branches:
# - main
push:
branches:
- main
release:
types:
- published
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- name: Setup Miniconda
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
python -m pip install -r requirements.txt
# python -m pip install --force-reinstall -r requirements_plot.txt
export CYTHON_BUILD_FOR_DOC=1
python setup.py install
python setup.py install # do not use "pip install ." as it fails
# Build sphinx in /docs/build
- name: Build Sphinx
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-pypi.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: deploy-pypi

on:
# push:
# branches:
# - main
push:
branches:
- main
release:
types:
- published
Expand All @@ -19,7 +19,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- name: Install twine and wheel
run: |
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- name: Setup Python ${{ matrix.python-version }}
Expand Down
28 changes: 17 additions & 11 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,23 @@ Successful installation and tests performed on the following operating systems a
.. |y| unicode:: U+2714
.. |n| unicode:: U+2716

+----------+--------+-------+-------+-------+-----------------+
| Platform | Arch | Python Version | Continuous |
+ | +-------+-------+-------+ Integration +
| | | 3.9 | 3.10 | 3.11 | |
+==========+========+=======+=======+=======+=================+
| Linux | X86-64 | |y| | |y| | |y| | |build-linux| |
+----------+--------+-------+-------+-------+-----------------+
| macOS | X86-64 | |y| | |y| | |y| | |build-macos| |
+----------+--------+-------+-------+-------+-----------------+
| Windows | X86-64 | |y| | |y| | |y| | |build-windows| |
+----------+--------+-------+-------+-------+-----------------+
+----------+----------+-------+-------+-------+-------+-----------------+
| Platform | Arch | Python Version | Continuous |
+ | +-------+-------+-------+-------+ Integration +
| | | 3.9 | 3.10 | 3.11 | 3.12 | |
+==========+==========+=======+=======+=======+=======+=================+
| Linux | X86-64 | |y| | |y| | |y| | |y| | |build-linux| |
+ +----------+-------+-------+-------+-------+ +
| | AARCH-64 | |y| | |y| | |y| | |y| | |
+----------+----------+-------+-------+-------+-------+-----------------+
| macOS | X86-64 | |y| | |y| | |y| | |y| | |build-macos| |
+ +----------+-------+-------+-------+-------+ +
| | ARM-64 | |y| | |y| | |y| | |y| | |
+----------+----------+-------+-------+-------+-------+-----------------+
| Windows | X86-64 | |y| | |y| | |y| | |y| | |build-windows| |
+ +----------+-------+-------+-------+-------+ +
| | ARM-64 | |y| | |y| | |y| | |y| | |
+----------+----------+-------+-------+-------+-------+-----------------+

.. |build-linux| image:: https://img.shields.io/github/actions/workflow/status/ameli/restoreio/build-linux.yml
:target: https://github.com/ameli/restoreio/actions?query=workflow%3Abuild-linux
Expand Down
1 change: 1 addition & 0 deletions conda-recipe/conda_build_config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ python:
- 3.9
- 3.10
- 3.11
- 3.12
28 changes: 17 additions & 11 deletions docs/source/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,23 @@ Successful installation and tests performed on the following operating systems,
.. |y| unicode:: U+2714
.. |n| unicode:: U+2716

+----------+--------+-------+-------+-------+-----------------+
| Platform | Arch | Python Version | Continuous |
+ | +-------+-------+-------+ Integration +
| | | 3.9 | 3.10 | 3.11 | |
+==========+========+=======+=======+=======+=================+
| Linux | X86-64 | |y| | |y| | |y| | |build-linux| |
+----------+--------+-------+-------+-------+-----------------+
| macOS | X86-64 | |y| | |y| | |y| | |build-macos| |
+----------+--------+-------+-------+-------+-----------------+
| Windows | X86-64 | |y| | |y| | |y| | |build-windows| |
+----------+--------+-------+-------+-------+-----------------+
+----------+----------+-------+-------+-------+-------+-----------------+
| Platform | Arch | Python Version | Continuous |
+ | +-------+-------+-------+-------+ Integration +
| | | 3.9 | 3.10 | 3.11 | 3.12 | |
+==========+==========+=======+=======+=======+=======+=================+
| Linux | X86-64 | |y| | |y| | |y| | |y| | |build-linux| |
+ +----------+-------+-------+-------+-------+ +
| | AARCH-64 | |y| | |y| | |y| | |y| | |
+----------+----------+-------+-------+-------+-------+-----------------+
| macOS | X86-64 | |y| | |y| | |y| | |y| | |build-macos| |
+ +----------+-------+-------+-------+-------+ +
| | ARM-64 | |y| | |y| | |y| | |y| | |
+----------+----------+-------+-------+-------+-------+-----------------+
| Windows | X86-64 | |y| | |y| | |y| | |y| | |build-windows| |
+ +----------+-------+-------+-------+-------+ +
| | ARM-64 | |y| | |y| | |y| | |y| | |
+----------+----------+-------+-------+-------+-------+-----------------+

.. |build-linux| image:: https://img.shields.io/github/actions/workflow/status/ameli/restoreio/build-linux.yml
:target: https://github.com/ameli/restoreio/actions?query=workflow%3Abuild-linux
Expand Down
4 changes: 2 additions & 2 deletions examples/uncertainty_quant/_utils/_plot_utils/_plot_utilities.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from matplotlib.ticker import FormatStrFormatter # noqa: F401
from mpl_toolkits.axes_grid1 import make_axes_locatable # noqa: F401

from distutils.spawn import find_executable
import shutil
from ._display_utilities import is_notebook
import logging
import warnings
Expand Down Expand Up @@ -75,7 +75,7 @@ def load_plot_settings():
# sns.set()

# LaTeX
if find_executable('latex'):
if shutil.which('latex'):
try:
# plt.rc('text',usetex=True)
matplotlib.rcParams['text.usetex'] = True
Expand Down
4 changes: 2 additions & 2 deletions restoreio/_plots/_plot_utilities.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from matplotlib.ticker import FormatStrFormatter # noqa: F401
from mpl_toolkits.axes_grid1 import make_axes_locatable # noqa: F401

from distutils.spawn import find_executable
import shutil
from ._display_utilities import is_notebook
import logging
import warnings
Expand Down Expand Up @@ -75,7 +75,7 @@ def load_plot_settings():
# sns.set()

# LaTeX
if find_executable('latex'):
if shutil.which('latex'):
try:
# plt.rc('text',usetex=True)
matplotlib.rcParams['text.usetex'] = True
Expand Down
5 changes: 2 additions & 3 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def main(argv):
'examples']
),
install_requires=requirements,
python_requires='>=3.7',
python_requires='>=3.9',
setup_requires=[
'setuptools',
'wheel',
Expand All @@ -215,11 +215,10 @@ def main(argv):
},
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: Implementation :: CPython',
'License :: OSI Approved :: BSD License',
'Operating System :: POSIX :: Linux',
Expand Down

0 comments on commit 020d440

Please sign in to comment.