Skip to content

Commit

Permalink
Merge pull request #94 from jklymak/rtd
Browse files Browse the repository at this point in the history
clean up requirements
  • Loading branch information
jklymak authored Jun 16, 2022
2 parents ffd7e47 + e549c95 commit 439a995
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: pyglider
environment-file: environment.yml
environment-file: tests/environment.yml
python-version: ${{ matrix.python-version }}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
Expand Down
5 changes: 0 additions & 5 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
matplotlib
numpy
xarray
dask
netcdf4
pyyaml
gsw
scipy
pooch
jinja2
geojson
simplekml
bitstring
pydata-sphinx-theme
sphinx
Expand Down
7 changes: 0 additions & 7 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@ channels:
- defaults
dependencies:
- python
- matplotlib
- numpy
- pip
- xarray
- dask
- netcdf4
- pyyaml
- gsw
- scipy
- jinja2
- geojson
- simplekml
- webcolors
- bitstring
- pytest
- pooch
6 changes: 0 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
matplotlib
numpy
xarray
dask
netcdf4
pyyaml
gsw
scipy
jinja2
geojson
simplekml
bitstring
pytest
pooch
28 changes: 15 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
# Get the version from versioneer
__version__ = "0.0.2"

with open("./docs/requirements.txt", "r") as handle:
requirements_doc = [ld.strip() for ld in handle.read().splitlines() if ld.strip()]

with open("./tests/requirements.txt", "r") as handle:
requirements_dev = [ld.strip() for ld in handle.read().splitlines() if ld.strip()]

with open("./requirements.txt", "r") as handle:
requirements = [ld.strip() for ld in handle.read().splitlines() if ld.strip()]

setup(name="pyglider",
version=__version__,
description="Glider data to netCDF translation in python",
Expand All @@ -11,18 +20,11 @@
url="https://github.com/c-proof/pyglider.git",
packages=find_packages(exclude=['tests']),
python_requires='>=3.6',
install_requires=[
"matplotlib",
"numpy",
"xarray",
"dask",
"bitstring",
"netcdf4",
"geojson",
"gsw",
"scipy",
"pooch",
"pyyaml"
],
install_requires=requirements,
extras_require={
"code_style": ["flake8<3.8.0,>=3.7.0", "black", "pre-commit==1.17.0"],
"testing": requirements_dev,
"docs": requirements_doc,
},
zip_safe=True
)
18 changes: 18 additions & 0 deletions tests/environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: pyglider
channels:
- conda-forge
- defaults
dependencies:
- python
- numpy
- pip
- xarray
- dask
- netcdf4
- gsw
- scipy
- jinja2
- bitstring
- pytest
- pooch
- matplotlib
12 changes: 12 additions & 0 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
matplotlib
numpy
xarray
dask
netcdf4
gsw
scipy
jinja2
simplekml
bitstring
pytest
pooch

0 comments on commit 439a995

Please sign in to comment.