Skip to content

Commit 9759aac

Browse files
Merge pull request #143 from EasyScience/hotfix_0.1.3
Hotfix 0.1.3
2 parents 6db31bb + a19879c commit 9759aac

File tree

8 files changed

+50
-11
lines changed

8 files changed

+50
-11
lines changed

.github/workflows/test-code.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,21 @@
1212

1313
name: Test code
1414

15-
# Trigger the workflow on push, pull request and manual trigger
16-
on: [push, pull_request, workflow_call]
15+
on:
16+
# Trigger the workflow on push
17+
push:
18+
# Every branch
19+
branches:
20+
- "**"
21+
# But do not run this workflow on creating a new tag starting with 'v', e.g. 'v1.0.3' (see pypi-publish.yml)
22+
tags-ignore:
23+
- 'v*'
24+
# Trigger the workflow on pull request
25+
pull_request:
26+
branches:
27+
- "**"
28+
# Allows you to run this workflow manually from the Actions tab
29+
workflow_dispatch:
1730

1831
# Allow only one concurrent workflow, skipping runs queued between the run in-progress and latest queued.
1932
# And cancel in-progress runs.

.github/workflows/test-ipynb.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,21 @@
22

33
name: Test Jupyter notebooks
44

5-
# Trigger the workflow on push, pull request and manual trigger
6-
on: [push, pull_request, workflow_call]
5+
on:
6+
# Trigger the workflow on push
7+
push:
8+
# Every branch
9+
branches:
10+
- "**"
11+
# But do not run this workflow on creating a new tag starting with 'v', e.g. 'v1.0.3' (see pypi-publish.yml)
12+
tags-ignore:
13+
- 'v*'
14+
# Trigger the workflow on pull request
15+
pull_request:
16+
branches:
17+
- "**"
18+
# Allows you to run this workflow manually from the Actions tab
19+
workflow_dispatch:
720

821
# Allow only one concurrent workflow, skipping runs queued between the run in-progress and latest queued.
922
# And cancel in-progress runs.

.github/workflows/test-package.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,21 @@
1212

1313
name: Build and test package
1414

15-
# Trigger the workflow on push, pull request and manual trigger
16-
on: [push, pull_request, workflow_call]
15+
on:
16+
# Trigger the workflow on push
17+
push:
18+
# Every branch
19+
branches:
20+
- "**"
21+
# But do not run this workflow on creating a new tag starting with 'v', e.g. 'v1.0.3' (see pypi-publish.yml)
22+
tags-ignore:
23+
- 'v*'
24+
# Trigger the workflow on pull request
25+
pull_request:
26+
branches:
27+
- "**"
28+
# Allows you to run this workflow manually from the Actions tab
29+
workflow_dispatch:
1730

1831
# Allow only one concurrent workflow, skipping runs queued between the run in-progress and latest queued.
1932
# And cancel in-progress runs.

examples/Change_minimizer.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
" print(\"Running in Google Colab\")\n",
6060
" # Install the easydiffraction library if it is not installed (including charts extras)\n",
6161
" if importlib.util.find_spec(\"easydiffraction\") is None:\n",
62-
" !pip install 'easydiffraction[charts]' --extra-index-url https://easyscience.github.io/pypi\n",
62+
" !pip install 'easydiffraction[charts]'\n",
6363
" # Download the data files to be read in notebook\n",
6464
" for fname in ['lbco.cif', 'hrpt.xye']:\n",
6565
" pooch.retrieve(\n",

examples/Fitting_PD-NEUT-CW_LBCO-HRPT.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
" print(\"Running in Google Colab\")\n",
6060
" # Install the easydiffraction library if it is not installed (including charts extras)\n",
6161
" if importlib.util.find_spec(\"easydiffraction\") is None:\n",
62-
" !pip install 'easydiffraction[charts]' --extra-index-url https://easyscience.github.io/pypi\n",
62+
" !pip install 'easydiffraction[charts]'\n",
6363
" # Download the data files to be read in notebook\n",
6464
" for fname in ['lbco.cif', 'hrpt.xye']:\n",
6565
" pooch.retrieve(\n",

examples/Fitting_PD-NEUT-TOF_NCAF-WISH.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
" print(\"Running in Google Colab\")\n",
6060
" # Install the easydiffraction library if it is not installed (including charts extras)\n",
6161
" if importlib.util.find_spec(\"easydiffraction\") is None:\n",
62-
" !pip install 'easydiffraction[charts]' --extra-index-url https://easyscience.github.io/pypi\n",
62+
" !pip install 'easydiffraction[charts]'\n",
6363
" # Download the data files to be read in notebook\n",
6464
" for fname in ['ncaf.cif', 'wish.xye']:\n",
6565
" pooch.retrieve(\n",

examples/Fitting_PD-NEUT-TOF_Si-SEPD.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
" print(\"Running in Google Colab\")\n",
5656
" # Install the easydiffraction library if it is not installed (including charts extras)\n",
5757
" if importlib.util.find_spec(\"easydiffraction\") is None:\n",
58-
" !pip install 'easydiffraction[charts]' --extra-index-url https://easyscience.github.io/pypi\n",
58+
" !pip install 'easydiffraction[charts]'\n",
5959
" # Download the data files to be read in notebook\n",
6060
" for fname in ['sepd.xye']:\n",
6161
" pooch.retrieve(\n",

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[project]
44
name = 'easydiffraction'
5-
version = '0.1.2'
5+
version = '0.1.3'
66
description = 'Making diffraction data analysis and modelling easy'
77
authors = [{name = 'EasyDiffractionLib contributors'}]
88
readme = 'README.md'

0 commit comments

Comments
 (0)