Skip to content

Commit

Permalink
Merge branch 'main' into pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
cyschneck authored Oct 9, 2024
2 parents 481130c + a70ad9f commit bde6fcb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pytests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12', '3.13']

name: Python (${{ matrix.python-version }} on ${{ matrix.os }})
steps:
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ authors:
given-names: Una G.
orchid: 'https://orcid.org/0000-0003-0048-5143'
title: "Pydar: Cassini RADAR data extraction software"
version: 1.3.3
version: 1.4.0
url: "https://github.com/unaschneck/pydar"
8 changes: 4 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pydar
channels:
- conda-forge
dependencies:
- python>=3.10,<3.13 # minimum support 3.10, maximum support 3.12
- python>=3.10,<3.14 # minimum support 3.10, maximum support 3.13
- beautifulsoup4
- pandas
- pdr
Expand All @@ -11,6 +11,6 @@ dependencies:
- pytest
- rasterio
- urllib3
#- pip
#- pip:
# - matplotlib # avoid warning "QApplication: invalid style override passed, ignoring it."
- pip
- pip:
- matplotlib # avoid warning "QApplication: invalid style override passed, ignoring it."
23 changes: 12 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "pydar"
version = "v1.3.3"
version = "v1.4.0"
authors = [
{ name="Cora Schneck", email="[email protected]" },
{ name="Una Schneck", email="[email protected]" }
Expand All @@ -11,6 +11,16 @@ readme = "README.md"
license = {file = "LICENSE"}
requires-python = ">=3.10"

dependencies = [
"beautifulsoup4",
"matplotlib",
"pandas",
"pdr",
"pyproj",
"rasterio",
"urllib3"
]

classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
Expand All @@ -22,6 +32,7 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Intended Audience :: Education",
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering :: Physics",
Expand All @@ -32,16 +43,6 @@ classifiers = [

keywords = ["geophysics", "python", "astronomy", "nasa", "radar", "planetary-science", "cassini", "jpl"]

dependencies = [
"beautifulsoup4",
"matplotlib",
"pandas",
"pdr",
"pyproj",
"rasterio",
"urllib3"
]

[project.optional-dependencies]
dev = [
"pytest",
Expand Down

0 comments on commit bde6fcb

Please sign in to comment.