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

Avoid importing tf_routes #118

Merged
merged 10 commits into from
Dec 20, 2023
10 changes: 5 additions & 5 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# miniforge-variant: Mambaforge-pypy3

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1

- name: Additional info about the build
shell: bash
Expand All @@ -63,7 +63,7 @@ jobs:

- name: Make Cache (no worflow_dispatch)
if: ${{ github.event_name != 'workflow_dispatch' }}
uses: actions/cache@v3
uses: actions/cache@v3.3.2
with:
path: ~/conda_pkgs_dir # ${{ matrix.prefix }}
# Increase the last number (0) to reset cache manually
Expand All @@ -72,15 +72,15 @@ jobs:

- name: Make Cache (worflow_dispatch)
if: ${{ github.event_name == 'workflow_dispatch' }}
uses: actions/cache@v2
uses: actions/cache@v3.3.2
with:
path: ~/conda_pkgs_dir # ${{ matrix.prefix }}
key: ${{ matrix.label }}-conda-${{ hashFiles('devtools/conda-envs/fep_env.yaml') }}-${{ env.DATE }}-${{ inputs.CACHE_NUMBER }}
id: cache2


# More info on options: https://github.com/conda-incubator/setup-miniconda
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3.0.1
with:
python-version: ${{ matrix.python-version }}
condarc-file: ${{ matrix.condarc-file }}
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
pytest -v --cov=transformato --cov-report=xml --color=yes transformato/tests/

- name: CodeCov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3.1.4
with:
file: ./coverage.xml
flags: unittests
Expand Down
1 change: 0 additions & 1 deletion devtools/conda-envs/fep_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ dependencies:
- pytest-cov
- codecov
- pip:
- git+https://github.com/wiederm/tf_routes.git
- git+https://github.com/wiederm/transformato_testsystems.git
1 change: 0 additions & 1 deletion devtools/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ test:
- transformato
- transformato.mutate
- transformato.analysis
- transformato.constants
- transformato.restraints
- transformato.state
- transformato.system
Expand Down
2 changes: 1 addition & 1 deletion transformato/analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from openmm.app import CharmmPsfFile, Simulation
from tqdm import tqdm

from transformato.constants import temperature
from transformato.helper_functions import temperature
from transformato.utils import get_structure_name, isnotebook

logger = logging.getLogger(__name__)
Expand Down
52 changes: 0 additions & 52 deletions transformato/annihilation.py

This file was deleted.

2 changes: 1 addition & 1 deletion transformato/charmm_factory.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import datetime
from transformato.constants import temperature, charmm_gpu
from transformato.helper_functions import temperature, charmm_gpu
from transformato.utils import check_switching_function
from openmm import unit
import os
Expand Down
60 changes: 0 additions & 60 deletions transformato/constants.py

This file was deleted.

Loading
Loading