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

pin all python versions to 3.11.0 #567

Merged
merged 7 commits into from
Jun 3, 2024
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/testmaster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
activate-environment: pyleo
environment-file: environment.yml
python-version: "3.10"
python-version: "3.11.0"
auto-activate-base: false

- name: Conda list
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python
python:
- '3.9'
- '3.11'


before_install:
Expand All @@ -15,7 +15,7 @@ before_install:
- conda info -a

install:
- conda create -n pyleoenv python=3.9
- conda create -n pyleoenv python=3.11
- source activate pyleoenv
- conda install numpy
- conda install -c conda-forge cartopy
Expand Down
10 changes: 7 additions & 3 deletions doc_build/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,19 @@
# The full version, including alpha/beta/rc tags.
release = pyleo.__version__


intersphinx_mapping = {'python': ('https://docs.python.org/3', None),
'numpy': ('https://numpy.org/doc/stable', None),
'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
'pandas': ('https://pandas.pydata.org/pandas-docs/stable', None),
'matplotlib': ('https://matplotlib.org/stable', None)
}
intersphinx_disabled_reftypes = ["*"]

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down Expand Up @@ -185,7 +190,6 @@
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']

# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
Expand Down
7 changes: 2 additions & 5 deletions doc_build/rtd_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.11
- python=3.11.0
- ipykernel
- pip:
- pip
- cartopy
- seaborn
- matplotlib
- numpy
- pandas
- Sphinx<6.0
- pylint
- chardet
Expand Down
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
name: pyleo
channels:
- default
- conda-forge
dependencies:
- python>=3.10
- python=3.11.0
- cartopy
- numba
- pyyaml
Expand Down
49 changes: 20 additions & 29 deletions pyleoclim/utils/causality.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,24 +115,22 @@ def liang_causality(y1, y2, npt=1, signif_test='isospec', nsim=1000,
Returns
-------
res : dict

A dictionary of results including:

- T21 : float
information flow from y2 to y1 (Note: not y1 -> y2!)
- tau21 : float
the standardized information flow from y2 to y1
- Z : float
the total information flow from y2 to y1
- dH1_star : float
dH*/dt (Liang, 2016)
- dH1_noise : float
- signif_qs :
the quantiles for significance test
- T21_noise : list
the quantiles of the information flow from noise2 to noise1 for significance testing
- tau21_noise : list
the quantiles of the standardized information flow from noise2 to noise1 for significance testing
- T21 : float
information flow from y2 to y1 (Note: not y1 -> y2!)
- tau21 : float
the standardized information flow from y2 to y1
- Z : float
the total information flow from y2 to y1
- dH1_star : float
dH*/dt (Liang, 2016)
- dH1_noise : float
- signif_qs :
the quantiles for significance test
- T21_noise : list
the quantiles of the information flow from noise2 to noise1 for significance testing
- tau21_noise : list
the quantiles of the standardized information flow from noise2 to noise1 for significance testing

See also
--------
Expand Down Expand Up @@ -262,18 +260,13 @@ def liang(y1, y2, npt=1):
Returns
-------
res : dict

A dictionary of results including:

- T21 : float
information flow from y2 to y1 (Note: not y1 -> y2!)
- tau21 : float
the standardized information flow from y2 to y1
- Z : float
the total information flow from y2 to y1
- dH1_star : float
dH*/dt (Liang, 2016)
- dH1_noise : float
- T21 (float): information flow from y2 to y1 (Note: not y1 -> y2!)
- tau21 (float): the standardized information flow from y2 to y1
- Z (float): the total information flow from y2 to y1
- dH1_star (float): dH*/dt (Liang, 2016)
- dH1_noise (float)

See also
--------
Expand Down Expand Up @@ -464,9 +457,7 @@ def signif_isospec(y1, y2, method,
Returns
-------
res_dict : dict

A dictionary with the following information:

- T21_noise_qs : list
the quantiles of the information flow from noise2 to noise1 for significance testing
- tau21_noise_qs : list
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ def read(fname):
"beautifulsoup4",
"scipy",
],
python_requires=">=3.9.0"
python_requires=">=3.9",
)
Loading