Skip to content

Commit

Permalink
Merge pull request #63 from atong01/update-ubuntu
Browse files Browse the repository at this point in the history
Update Actions
  • Loading branch information
atong01 committed Jul 20, 2023
2 parents d7376cb + 4efa00b commit 615f782
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
steps:
- uses: actions/checkout@master

- name: Set up Python 3.7
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.10

- name: Install pypa/build
run: >-
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
jobs:
build-n-publish:
name: Build and publish Python 🐍 distributions 📦 to TestPyPI
runs-on: ubuntu-18.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master

- name: Set up Python 3.7
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.10

- name: Install pypa/build
run: >-
Expand Down
22 changes: 12 additions & 10 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ jobs:
fail-fast: false
matrix:
config:
- {name: 'current', os: ubuntu-latest, python: '3.8' }
- {name: 'current', os: ubuntu-latest, python: '3.10' }

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.config.python }}

- name: Install tools
run: |
python -m pip install --upgrade "pip<=21.0"
python -m pip install --upgrade pip
pip install --use-deprecated=legacy-resolver -U wheel setuptools
pip install --use-deprecated=legacy-resolver -U black flake8
- name: Lint with Black
Expand All @@ -48,17 +48,19 @@ jobs:
fail-fast: false
matrix:
config:
- {name: 'current', os: ubuntu-latest, python: '3.8', r: 'release' }
- {name: 'prev', os: ubuntu-latest, python: '3.7', r: 'release' }
- {name: 'old', os: ubuntu-latest, python: '3.6', r: 'release' }
- {name: 'currentest', os: ubuntu-latest, python: '3.11', r: 'release' }
- {name: 'current', os: ubuntu-latest, python: '3.10', r: 'release' }
- {name: 'prev', os: ubuntu-latest, python: '3.9', r: 'release' }
- {name: 'old', os: ubuntu-latest, python: '3.8', r: 'release' }
- {name: 'older', os: ubuntu-latest, python: '3.7', r: 'release' }

steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.6.0
with:
access_token: ${{ github.token }}

- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -68,7 +70,7 @@ jobs:
sudo apt-get update -qq
sudo apt-get install -y libhdf5-dev pandoc gfortran libblas-dev liblapack-dev libedit-dev llvm-dev libcurl4-openssl-dev
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.config.python }}

Expand All @@ -81,7 +83,7 @@ jobs:

- name: Install package & dependencies
run: |
python -m pip install --upgrade "pip<=21.0"
python -m pip install --upgrade pip
pip install --use-deprecated=legacy-resolver -U wheel setuptools
pip install --use-deprecated=legacy-resolver -U .[test,r]
python -c "import meld"
Expand Down
3 changes: 2 additions & 1 deletion meld/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ def __init__(
self.isfit = False
self.likelihood = None
self.sample_indicator = None
self._sklearn_params = kwargs
self._sklearn_params = {"n_init": 10}
self._sklearn_params.update(kwargs)

def _activate(self, x, alpha=1):
"""Activate spectrograms for clustering
Expand Down

0 comments on commit 615f782

Please sign in to comment.