Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into new_docs
Browse files Browse the repository at this point in the history
  • Loading branch information
cassidymwagner committed May 31, 2024
2 parents 58d58d9 + c50a9b7 commit 68886bd
Show file tree
Hide file tree
Showing 18 changed files with 13 additions and 13 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[project]
name = "oceans_sf"
name = "fluidsf"
dynamic = ["version"]
authors = [{ name = "Cassidy Wagner", email = "wagncass@oregonstate.edu" }]
description = "Calculate structure functions from oceanographic data"
description = "Calculate structure functions from fluid data"
readme = "README.md"
requires-python = ">=3.7"
classifiers = [
Expand All @@ -20,8 +20,8 @@ dependencies = ["numpy>=1,<2", "pandas>=1.5.3", "geopy>=2"]
test = ["pytest>=7,<8"]

[project.urls]
"Homepage" = "https://github.com/cassidymwagner/oceans_sf"
"Bug Tracker" = "https://github.com/cassidymwagner/oceans_sf/issues"
"Homepage" = "https://github.com/cassidymwagner/FluidSF"
"Bug Tracker" = "https://github.com/cassidymwagner/FluidSF/issues"

# tools
[tool.black]
Expand Down Expand Up @@ -61,4 +61,4 @@ extend-ignore = [
]

[tool.hatch]
version.path = "src/oceans_sf/_version.py"
version.path = "fluidsf/_version.py"
2 changes: 1 addition & 1 deletion tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"""Tests for oceans_sf."""
"""Tests for FluidSF."""
2 changes: 1 addition & 1 deletion tests/test_bin_data.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import pytest

from oceans_sf.bin_data import bin_data
from fluidsf.bin_data import bin_data


@pytest.mark.parametrize(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_calculate_advection.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import pytest

from oceans_sf.calculate_advection import calculate_advection
from fluidsf.calculate_advection import calculate_advection


@pytest.mark.parametrize(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_calculate_separation_distances.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import pytest
from geopy.distance import great_circle

from oceans_sf.calculate_separation_distances import calculate_separation_distances
from fluidsf.calculate_separation_distances import calculate_separation_distances


@pytest.mark.parametrize(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_calculate_structure_function.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import numpy as np
import pytest

from oceans_sf.calculate_structure_function import calculate_structure_function
from fluidsf.calculate_structure_function import calculate_structure_function


@pytest.mark.parametrize(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_generate_structure_functions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import pytest

from oceans_sf.generate_structure_functions import generate_structure_functions
from fluidsf.generate_structure_functions import generate_structure_functions


@pytest.mark.parametrize(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_shift_array1d.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import pytest

from oceans_sf.shift_array1d import shift_array1d
from fluidsf.shift_array1d import shift_array1d


@pytest.mark.parametrize(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_shift_array2d.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import pytest

from oceans_sf.shift_array2d import shift_array2d
from fluidsf.shift_array2d import shift_array2d


@pytest.mark.parametrize(
Expand Down

0 comments on commit 68886bd

Please sign in to comment.