Skip to content

Commit

Permalink
Limit to Python >=3.10 and pin dependencies (#181)
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosgjs authored Aug 17, 2023
1 parent d7a34ce commit a4c7b11
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/precommit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Python
uses: actions/[email protected]
with:
python-version: 3.8
python-version: '3.10'
- name: Install pre-commit
run: pip install pre-commit==3.3.3
- name: Run pre-commit checks
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:

env:
python_version: '3.8'
python_version: '3.10'
RDMAV_FORK_SAFE: 1
jobs:
unit_tests:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python_version: ['3.8', '3.10']
python_version: ['3.9', '3.10']
method: [linear,robust, nroot, selective, auto_covariance, pws]
freq_norm: [rma]
format: [asdf]
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python_version: ['3.8', '3.10']
python_version: ['3.9', '3.10']
runs-on: ubuntu-22.04
steps:
- name: Checkout Repo
Expand All @@ -138,7 +138,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python_version: ['3.8', '3.10']
python_version: ['3.9', '3.10']
runs-on: ubuntu-22.04
steps:
- name: Checkout Repo
Expand Down
10 changes: 4 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@
"module": "noisepy.seis.main",
"args": [
"stack",
"--raw_data_path",
"${userHome}/test_temp/RAW_DATA",
"--ccf_path",
"${userHome}/test_temp/CCF",
"--stack_path",
"/Users/carlosg/test_temp/STACK",
"${userHome}/test_temp/STACK",
"--stack_method",
"linear"
],
Expand Down Expand Up @@ -85,9 +83,9 @@
"--raw_data_path",
"${userHome}/s3tmp/scedc/2022/002",
"--ccf_path",
"${userHome}/ccfs3tmp/",
"${userHome}/test_temp/CCF",
"--stations",
"SBC,RIO,DEV,HEC,RLR,SVD,RPV,BAK",
"CBC,BAK",
"--xml_path",
"/Users/carlosg/s3tmp/FDSNstationXML"
],
Expand All @@ -114,7 +112,7 @@
"--start",
"2022-02-02",
"--end",
"2022-02-05"
"2022-02-03"
],
"console": "integratedTerminal",
"justMyCode": true
Expand Down
5 changes: 4 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ NoisePy is going under major re-development. Part of the core development involv

Fork the repository, and create your local version, then follow the installation steps:
```bash
conda create -n noisepy python=3.8 pip
conda create -n noisepy python=3.10 pip
conda activate noisepy
conda install -c conda-forge openmpi
python -m ipykernel install --user --name noisepy
Expand Down Expand Up @@ -45,6 +45,9 @@ tests/test_cli.sh asdf
NOTE: The CLI tests download a small amount of data from SCEDC to test the download funcionality. Occassionally, the service
is unavailable and the test will fail. This is usually resolved in a few minutes.

## Pull Requests

Please follow the [Conventional Commits](https://github.com/uw-ssec/rse-guidelines/blob/main/conventional-commits.md) naming for pull request titles.

## Overview

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ The nature of NoisePy being composed of python scripts allows flexible package i

## With Conda and pip:
```bash
conda create -n noisepy python=3.8 pip
conda create -n noisepy python=3.10 pip
conda activate noisepy
pip install noisepy-seis
```

## With Conda and pip and MPI support:
```bash
conda create -n noisepy python=3.8 pip
conda create -n noisepy python=3.10 pip
conda activate noisepy
conda install -c conda-forge openmpi
pip install noisepy-seis[mpi]
Expand Down
28 changes: 14 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dynamic = ["version"]
description = "A High-performance Computing Python Package for Ambient Noise Analysis"
readme = "README.md"
license = {file= "LICENSE"}
requires-python = ">=3.8,<3.11"
requires-python = ">=3.9,<3.11"
authors = [
{ email = "[email protected]", name = "Marine Denolle" },
{ email = "[email protected]", name = "Chengxin Jiang" },
Expand All @@ -30,24 +30,24 @@ classifiers = [
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.10",
]
dependencies = [
"DateTimeRange==2.0.0,<3.0.0",
"numpy>=1.22.0,<2.0.0",
"DateTimeRange>=2.0.0,<3.0.0",
"numpy>=1.22.0, <2.0.0",
"h5py>=3.8.0,<4.0.0",
"numba>=0.57.0,<1.0.0",
"pandas>=1.5.3,<2.0.0",
"numba>=0.57.0,<1.0.0",
"pyasdf>=0.7.5,<1.0.0",
"pycwt>=0.3.0a22,<1.0.0",
"diskcache>=5.6.1,<6.0",
"diskcache>=5.6.1,<6.0.0",
"fsspec>=2023.4.0,<2024.0.0",
"s3fs>=2023.4.0,<2024.0.0",
"aiobotocore==2.5.2", # "2.5.3 is broken"
"pydantic>=2.0.0,<3.0.0",
"PyYAML>=6.0,<7.0",
"pydantic-yaml>=1.0,<2.0",
"s3fs==2023.4.0,<2024.0.0",
"zarr>=2.14.2,<3.0.0",
"aiobotocore==2.5.2", # "2.5.3 is broken"
"pydantic==2.0.0",
"PyYAML==6.0",
"pydantic-yaml==1.0",
]


Expand Down Expand Up @@ -76,9 +76,9 @@ packages = ["src/noisepy"]

[project.optional-dependencies]
dev = [
"pytest>=7.2.2,<8.0.0",
"memory-profiler>=0.61,<1.0.0",
"pre-commit>=3.3.3,<4.0.0",
"pytest==7.2.2",
"memory-profiler==0.61",
"pre-commit==3.3.3",
]
sql = [
"SQLite3-0611",
Expand Down

0 comments on commit a4c7b11

Please sign in to comment.