Skip to content

Commit

Permalink
Update install procedure (#61)
Browse files Browse the repository at this point in the history
* replaced old-school setup.py with new-school pyproject.toml file, removed ununsed environment.yaml file which may be replaced later when Conda install is attempted

* direct pip install will not work due to some dependency errors with cartopy and GEOS but .toml file still valid. added conda-required environment.yaml file which will be used to do the entire install procedure
  • Loading branch information
bch0w authored Dec 8, 2022
1 parent 2c9eeaf commit e1818cb
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 35 deletions.
14 changes: 10 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
name: pysep
channels:
- conda-forge
- defaults
- conda-forge
- defaults
dependencies:
- obspy
- cartopy
- pip
- obspy
- cartopy
- pyyaml
- pip:
- git+https://github.com/krischer/llnl_db_client.git
- -e .

34 changes: 34 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[build-system]
requires = ["setuptools>=61.0.0", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "pysep"
version = "0.2.0"
description = "Python Seismogram Extraction and Processing"
readme = "README.md"
requires-python = ">=3.7"
license = {file = "LICENSE.txt"}
authors = [
{name = "adjTomo Dev Team"},
{email = "adjtomo@gmail.com"}
]
dependencies = [
"obspy",
"cartopy",
"pyyaml",
"llnl_db_client @ git+https://github.com/krischer/llnl_db_client.git"
]

[project.optional-dependencies]
test = ["pytest"]
dev = ["pytest", "ipython", "ipdb"]

[project.urls]
homepage = "https://github.com/adjtomo/"
documentation = "https://github.com/adjtomo/pysep/wiki"
repository = "https://github.com/adjtomo/pysep"

[project.scripts]
pysep = "pysep.pysep:main"
recsec = "pysep.recsec:main"
2 changes: 1 addition & 1 deletion pysep/recsec.py
Original file line number Diff line number Diff line change
Expand Up @@ -1887,7 +1887,7 @@ def parse_args():
"""
parser = argparse.ArgumentParser(
description="Input basic record section params",
formatter_class=argparse.RawTextHelpFormatter,
# formatter_class=argparse.RawTextHelpFormatter,
)

parser.add_argument("-p", "--pysep_path", default="./", type=str, nargs="?",
Expand Down
5 changes: 0 additions & 5 deletions requirements.txt

This file was deleted.

25 changes: 0 additions & 25 deletions setup.py

This file was deleted.

0 comments on commit e1818cb

Please sign in to comment.