Skip to content

Commit

Permalink
Merge branch 'observingClouds:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Ishaanj18 authored Mar 28, 2024
2 parents 9eb49cb + 10a08dd commit 0f7304a
Show file tree
Hide file tree
Showing 16 changed files with 833 additions and 250 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
steps:
# We need the full repo to avoid this issue
# https://github.com/actions/checkout/issues/23
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
fetch-depth: 0

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3.0.2
with:
# installer-url: https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh
installer-url: https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
cp benchmarks.log .asv/results/
working-directory: ${{ env.ASV_DIR }}

- uses: actions/upload-artifact@v3.1.3
- uses: actions/upload-artifact@v4.3.1
if: always()
with:
name: asv-benchmark-results-${{ runner.os }}
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
outputs:
triggered: '${{ steps.detect-trigger.outputs.trigger-found }}'
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
fetch-depth: 2
- uses: xarray-contrib/[email protected]
Expand All @@ -29,11 +29,11 @@ jobs:
run:
shell: 'bash -l {0}'
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
fetch-depth: 0
- name: Set up conda
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3.0.2
with:
auto-update-conda: false
channels: conda-forge
Expand All @@ -59,8 +59,8 @@ jobs:
run:
shell: 'bash -l {0}'
steps:
- uses: actions/[email protected].0
- uses: conda-incubator/setup-miniconda@v2.2.0
- uses: actions/[email protected].1
- uses: conda-incubator/setup-miniconda@v3.0.2
with:
channels: conda-forge
miniforge-variant: Mambaforge
Expand Down Expand Up @@ -89,9 +89,9 @@ jobs:
run:
shell: 'bash -l {0}'
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: Set up conda
uses: conda-incubator/setup-miniconda@v2.2.0
uses: conda-incubator/setup-miniconda@v3.0.2
with:
auto-update-conda: false
channels: conda-forge
Expand Down Expand Up @@ -130,15 +130,15 @@ jobs:
- macos-latest
- windows-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
fetch-depth: 0
- name: Setup python
uses: actions/setup-python@v4.7.1
uses: actions/setup-python@v5.0.0
with:
python-version: '3.11'
- name: Set up Julia
uses: julia-actions/[email protected].2
uses: julia-actions/[email protected].6
with:
version: 1.7.1
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
packages:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- name: Set up Python
uses: actions/setup-python@v4.7.1
uses: actions/setup-python@v5.0.0
with:
python-version: "3.10"

Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:

- name: Publish a Python distribution to PyPI
if: success() && github.event_name == 'release'
uses: pypa/[email protected].10
uses: pypa/[email protected].11
with:
user: __token__
password: ${{ secrets.PYPI_PASSWORD }}
3 changes: 2 additions & 1 deletion .github/workflows/updater.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
# [Required] Access token with `workflow` scope.
token: ${{ secrets.WORKFLOW_SECRET }}
Expand All @@ -21,3 +21,4 @@ jobs:
with:
# [Required] Access token with `workflow` scope.
token: ${{ secrets.WORKFLOW_SECRET }}
pull_request_branch: gh-actions-update
18 changes: 9 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ci:
# https://pre-commit.com/
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -14,38 +14,38 @@ repos:
- id: mixed-line-ending
# This wants to go before isort & flake8
- repo: https://github.com/PyCQA/autoflake
rev: "v2.0.2"
rev: "v2.2.1"
hooks:
- id: autoflake # isort should run before black as black sometimes tweaks the isort output
args: ["--in-place", "--ignore-init-module-imports"]
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
rev: v3.15.0
hooks:
- id: pyupgrade
args:
- "--py38-plus"
# https://github.com/python/black#version-control-integration
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.12.1
hooks:
- id: black
- id: black-jupyter
- repo: https://github.com/keewis/blackdoc
rev: v0.3.8
rev: v0.3.9
hooks:
- id: blackdoc
exclude: docs/index.rst
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.1.1
rev: v1.8.0
hooks:
- id: mypy
exclude: "properties|asv_bench"
Expand All @@ -58,6 +58,6 @@ repos:
types-pkg_resources,
types-PyYAML,
types-pytz,
typing-extensions==3.10.0.0,
typing-extensions,
numpy,
]
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ CHANGELOG
X.X.X (unreleased)
------------------

* Add support for additional datatypes in :py:func:`xbitinfo.xbitinfo.plot_bitinformation` (:pr:`218`, :issue:`168`) `Hauke Schulz`_.
* Drop python 3.8 support and add python 3.11 (:pr:`175`) `Hauke Schulz`_.
* Implement basic retrieval of bitinformation in python as alternative to julia implementation (:pr:`156`, :issue:`155`, :pr:`126`, :issue:`125`) `Hauke Schulz`_ with helpful comments from `Milan Klöwer`_.
* Make julia binding to BitInformation.jl optional (:pr:`153`, :issue:`151`) `Aaron Spring`_.
Expand Down
Loading

0 comments on commit 0f7304a

Please sign in to comment.