Skip to content

Commit

Permalink
Merge pull request #80 from josejimenezluna/jjimenezluna/deprecatepy37
Browse files Browse the repository at this point in the history
deprecate py37
  • Loading branch information
josejimenezluna authored Oct 11, 2022
2 parents de49c53 + 56fba5c commit 5b4f69e
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 77 deletions.
32 changes: 5 additions & 27 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,20 @@ on:
jobs:
linux:
runs-on: "ubuntu-latest"
strategy:
matrix:
python-version: ['3.8', '3.9']
defaults:
run:
shell: bash -l {0}
name: Linux py ${{ matrix.python-version }} tests
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: delfta
environment-file: environment.yml
python-version: 3.7
python-version: ${{ matrix.python-version }}
auto-activate-base: false
- run: |
conda info
Expand All @@ -37,29 +41,3 @@ jobs:
- run: |
pytest --cov=delfta --cov-config=.coveragerc --cov-report=xml tests/
./codecov -t ${{ secrets.CODECOV_TOKEN }}
macos:
runs-on: "macos-latest"
defaults:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: delfta
environment-file: environment_osx.yml
python-version: 3.7
auto-activate-base: false
- run: |
conda info
pip install pytest
name: set pythonpath
- run: |
echo "PYTHONPATH=/Users/runner/work/delfta/delfta" >> $GITHUB_ENV
name: download files
- run: |
python delfta/download.py --tests
name: test
- run: |
pytest
25 changes: 4 additions & 21 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
jobs:
linux:
runs-on: "ubuntu-latest"
strategy:
matrix:
python-version: ['3.8', '3.9']
defaults:
run:
shell: bash -l {0}
Expand All @@ -18,29 +21,9 @@ jobs:
activate-environment: delfta
environment-file: environment.yml
condarc-file: conda-recipe/.condarc
python-version: 3.7
python-version: ${{ matrix.python-version }}
auto-activate-base: false
- run: |
conda info
conda install conda-build anaconda-client --yes
cd conda-recipe && pkgs=$(conda build . | grep 'TEST START' | awk '{print $3}') && for pkg in $pkgs;do anaconda -t ${{ secrets.CONDA_TOKEN }} upload -u delfta $pkg; done
macos:
runs-on: "macos-latest"
defaults:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: delfta
environment-file: environment_osx.yml
condarc-file: conda-recipe/.condarc
python-version: 3.7
auto-activate-base: false
- run: |
conda info
conda install conda-build anaconda-client --yes
cd conda-recipe && pkgs=$(conda build . | grep 'TEST START' | awk '{print $3}') && for pkg in $pkgs;do anaconda -t ${{ secrets.CONDA_TOKEN }} upload -u delfta $pkg; done
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The DelFTa application is an easy-to-use, open-source toolbox for predicting qua

## Installation

While the Linux (and Windows, through WSL) installations fully support GPU-acceleration via cudatoolkit, only CPU inference is currently available under Mac OS. We currently support Python 3.7 and 3.8 builds.
We currently only support Python 3.8 and 3.9 Linux builds.

### Installation via conda

Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
python:
- 3.7
- 3.8
- 3.9
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: "delfta"
version: "1.0.0"
version: "1.0.1"

source:
path: ../
Expand Down
9 changes: 9 additions & 0 deletions docs/.readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2

build:
os: "ubuntu-20.04"
tools:
python: "mambaforge-4.10"

conda:
environment: environment.yml
1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- numpy=1.19.2
- pandas=1.1.3
- pip=20.2.4
- python=3.7.4
- scikit-learn=0.23.2
- scipy=1.5.2
- tqdm=4.51.0
Expand Down
25 changes: 0 additions & 25 deletions environment_osx.yml

This file was deleted.

0 comments on commit 5b4f69e

Please sign in to comment.