Skip to content

Commit

Permalink
Merge pull request #199 from SciCatProject/update-deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
jl-wynen authored Apr 12, 2024
2 parents 768a180 + 9250683 commit b5c3257
Show file tree
Hide file tree
Showing 23 changed files with 204 additions and 209 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
name: Formatting and static analysis
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- run: python -m pip install --upgrade pip
- run: python -m pip install -r requirements/ci.txt
- run: tox -e static
Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.11
- run: python -m pip install --upgrade pip
Expand All @@ -50,8 +50,8 @@ jobs:
steps:
- run: sudo apt install --yes docker-compose
if: ${{ contains(matrix.variant.os, 'ubuntu') }}
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- run: python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
runs-on: ubuntu-22.04
steps:
- run: sudo apt install --yes pandoc
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.11
- run: python -m pip install --upgrade pip
- run: python -m pip install -r requirements/ci.txt
- run: tox -e docs
- run: touch html/.nojekyll
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: documentation
path: html/
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
name: Check if package can be released
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- run: python -m pip install --upgrade pip
- run: python -m pip install -r requirements/ci.txt
- run: tox -e check-release
Expand All @@ -22,19 +22,19 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # history required so setuptools_scm can determine version

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
- run: python -m pip install --upgrade pip
- run: python -m pip install -r requirements/wheels.txt

- name: Build wheels
run: python -m build

- name: Upload wheels
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: dist
path: dist
Expand All @@ -49,7 +49,7 @@ jobs:
if: github.event_name == 'release' && github.event.action == 'published'

steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
- uses: pypa/[email protected]

docs:
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ repos:
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]
- repo: https://github.com/kynan/nbstripout
rev: 0.6.0
rev: 0.7.1
hooks:
- id: nbstripout
types: ["jupyter"]
args: ["--drop-empty-cells",
"--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'"]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.0
rev: v0.3.7
hooks:
- id: ruff-format
types_or: [ python, pyi ]
Expand Down
48 changes: 24 additions & 24 deletions docs/user-guide/downloading.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "markdown",
"id": "594ba90e-8388-434c-8d33-c9001f64b6c8",
"id": "0",
"metadata": {},
"source": [
"# Downloading datasets\n",
Expand Down Expand Up @@ -54,7 +54,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "22f329e2-624f-4406-93d4-55913e83624d",
"id": "1",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -64,7 +64,7 @@
},
{
"cell_type": "markdown",
"id": "4e8aea34-fb1f-469c-b2d6-c7d64880b7da",
"id": "2",
"metadata": {},
"source": [
"## Metadata\n",
Expand All @@ -77,7 +77,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "9388ae93-2b8a-4388-8451-26dd263345d8",
"id": "3",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -86,7 +86,7 @@
},
{
"cell_type": "markdown",
"id": "29dbb19b-a46e-4140-ae59-9f41ddf86340",
"id": "4",
"metadata": {},
"source": [
"Datasets can easily be inspected in Jupyter notebooks:"
Expand All @@ -95,7 +95,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "c4ca91c2-2c51-4dee-906e-4c97c0b7a1e7",
"id": "5",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -104,7 +104,7 @@
},
{
"cell_type": "markdown",
"id": "08363dcc-4a11-40b6-af47-8c6096754868",
"id": "6",
"metadata": {},
"source": [
"All attributes listed above can be accessed directly:"
Expand All @@ -113,7 +113,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "26d06a21-8cc7-4364-b289-37041f455d9c",
"id": "7",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -123,7 +123,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "d78b40ef-4494-49a8-ae2f-233188ba52eb",
"id": "8",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -133,7 +133,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "bd441bbd-58f7-47bf-ac14-edd730c05ab4",
"id": "9",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -142,7 +142,7 @@
},
{
"cell_type": "markdown",
"id": "b8ddc42b-b43d-4f95-b40a-235af77d9d27",
"id": "10",
"metadata": {},
"source": [
"See [Dataset](../generated/classes/scitacean.Dataset.rst) for a list of available fields.\n",
Expand All @@ -153,7 +153,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "c7788a40-0d56-442c-ad19-6fe5205bc476",
"id": "11",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -162,7 +162,7 @@
},
{
"cell_type": "markdown",
"id": "020840e2-9291-4d1c-b8e1-b25709fcf790",
"id": "12",
"metadata": {},
"source": [
"## Files\n",
Expand All @@ -173,7 +173,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "2fcb8261-ff87-4788-adbd-6e6fd7a9d2f1",
"id": "13",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -186,7 +186,7 @@
},
{
"cell_type": "markdown",
"id": "c5fb8c86-ccf7-4245-99da-b5b49dce4c5d",
"id": "14",
"metadata": {},
"source": [
"Note that the `local_path` for both files is `None`.\n",
Expand All @@ -199,7 +199,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "39f3e892-919c-495b-ad9a-37c6ca46aafb",
"id": "15",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -209,7 +209,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "dfe6545b-4c3b-4998-9831-aece5c3bb116",
"id": "16",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -222,7 +222,7 @@
},
{
"cell_type": "markdown",
"id": "0097c9f9-ff98-4bd2-971f-70fd1001d186",
"id": "17",
"metadata": {},
"source": [
"Which populates the `local_path`:"
Expand All @@ -231,7 +231,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "cc9fec2d-51e8-462f-9c1d-e510ec2eefbf",
"id": "18",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -241,7 +241,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "84f086f8-e930-4ccb-ad22-5b5e0bb0cc6e",
"id": "19",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -250,7 +250,7 @@
},
{
"cell_type": "markdown",
"id": "28a14e32-f2fa-45d4-9b62-2c6f04abeffb",
"id": "20",
"metadata": {},
"source": [
"We can use it to read the file:"
Expand All @@ -259,7 +259,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "7b1ffde0-e2b9-47ff-ac68-3d327a18c124",
"id": "21",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -269,7 +269,7 @@
},
{
"cell_type": "markdown",
"id": "1492ed89-a0e0-46c2-b24a-7e621f230b20",
"id": "22",
"metadata": {},
"source": [
"If we wanted to download all files, we could pass `select=True` (or nothing, `True` is the default) to `client.download_files`.\n",
Expand All @@ -279,7 +279,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "eee2b6c2-8f6f-447e-a392-e5dc84eab6cc",
"id": "23",
"metadata": {
"nbsphinx": "hidden",
"tags": []
Expand Down
Loading

0 comments on commit b5c3257

Please sign in to comment.