Skip to content

Commit

Permalink
Merge pull request #56 from ChalkLab/48-add-jcamp-reader
Browse files Browse the repository at this point in the history
Adds jcamp reader to scidatalib.io.jcamp
  • Loading branch information
marshallmcdonnell committed Apr 28, 2021
2 parents 79801a7 + 17dc025 commit 61f60d0
Show file tree
Hide file tree
Showing 17 changed files with 8,520 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: GitHub Actions

env:
PYTHON_MAIN_VERSION: 3.6
PYTHON_MAIN_VERSION: 3.7
POETRY_VERSION: 1.1.4

on:
Expand Down Expand Up @@ -56,4 +56,4 @@ jobs:
run: |
pip install wheel twine
python setup.py sdist bdist_wheel
twine upload --username "__token__" --password $PYPI_TOKEN_PASSWORD dist/*
twine upload --username "__token__" --password $PYPI_TOKEN_PASSWORD dist/*
58 changes: 46 additions & 12 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ authors = [
scidatalib = "scidatalib.cli:cli"

[tool.poetry.dependencies]
python = "^3.6"
python = "^3.7"
pytest-cov = "^2.11.1"
numpy = "^1.20.2"

[tool.poetry.dev-dependencies]
pytest = "^5.2"
Expand Down
1 change: 1 addition & 0 deletions scidatalib/io/formats.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class UnknownFileTypeError(Exception):


ioformats = {
'jcamp': 'jcamp',
}


Expand Down

0 comments on commit 61f60d0

Please sign in to comment.