Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

71 fix devenv locally and in GitHub workflow #77

Merged
merged 4 commits into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.5.103
current_version = 2.5.104
commit = True
tag = True

Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/pytest-devenv.yml

This file was deleted.

36 changes: 36 additions & 0 deletions .github/workflows/pytest-hmcenv.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: pytest-hmcenv

on:
push:
branches:
- main
pull_request:
branches:
- main
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
defaults: #Conda activation does not correctly work on sh. Please use bash.
run:
shell: bash -el {0}
steps:
- name: checkout repos
uses: actions/checkout@v2
- name: Install dependencies
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: hatyan_hmcenv
environment-file: environment_hmc.yml
channels: conda-forge
#python-version: 3.8
auto-activate-base: false
- name: test conda env
run: |
conda info
conda list
- name: Test with pytest
run: |
pytest -m "not acceptance" --cov=hatyan
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:
orcid: https://orcid.org/0000-0002-6349-818X
title: "hatyan: tidal analysis and prediction"
type: software
version: 2.5.103
version: 2.5.104
doi: https://doi.org/10.5281/zenodo.6885343
36 changes: 18 additions & 18 deletions environment_hmc.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
#relevant/minimal hmc python libs on 17-08-2022 (full list raises many errors, below list raises numpy errors)
#python>=3.8 or pip>=22.0 or releasing == for numpy does not solve errors, releasing all == for other packages does make installation possible
#issue: https://github.com/Deltares/hatyan/issues/71
#statsmodels is not yet available at HMC (for KWK), so temporarily using non-fixed version
#jupyter, notebook, bumpversion are not available in HMC env, so non-fixed versions are used
#relevant/minimal hmc python libs on 10-02-2023 (full list raises many errors)
#temporarily using scipy non-fixed version, since scipy==1.3.1 raises numpy library errors (https://github.com/Deltares/hatyan/issues/71)
#statsmodels is not yet available at HMC (needed for KWK), so temporarily using non-fixed version
#pytest, pytest-cov, jupyter, notebook, bumpversion are added for local maintenance, so using non-fixed versions
name: hatyan_hmcenv
dependencies:
- python==3.8.11
- pip>=19.2.3
- python==3.8.13
- pip==22.3.1
- pip:
- matplotlib==3.5.2
- netCDF4==1.6.0
- numpy==1.23.0
- pandas==1.4.3
- matplotlib==3.6.2
- netCDF4==1.6.2
- numpy==1.23.5
- pandas==1.5.2
- pyproj==3.3.1
- pytest==7.1.2
- pytest-cov==3.0.0
- requests==2.28.1
- scipy==1.3.1
- seaborn==0.11.2
- sip==6.6.2
#- scipy==1.3.1
- scipy
- seaborn==0.12.1
- sip==6.7.5
- six==1.16.0
- spyder==5.1.5
- xarray==2022.10.0
- spyder==5.4.0
- xarray==2022.12.0
- statsmodels
- pytest
- pytest-cov
- jupyter
- notebook
- bumpversion
2 changes: 1 addition & 1 deletion hatyan/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

__author__ = """Jelmer Veenstra"""
__email__ = '[email protected]'
__version__ = '2.5.103'
__version__ = '2.5.104'

from hatyan.analysis_prediction import *
from hatyan.astrog import *
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = hatyan
version = 2.5.103
version = 2.5.104
author = Jelmer Veenstra
author_email = [email protected]
description = hatyan is a tidal analysis and prediction tool of Rijkswaterstaat
Expand Down