Skip to content

Commit bcbd6eb

Browse files
sezeltsezelt
committed
Merge remote-tracking branch 'upstream/dev' into black-gh-action
Former-commit-id: 8824352
2 parents 3ea00bd + 02eeab1 commit bcbd6eb

File tree

137 files changed

+14629
-12743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+14629
-12743
lines changed

‎.github/workflows/check_install_dev.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Install Checker Dev
2+
on:
3+
push:
4+
branches: [ "dev" ]
5+
pull_request:
6+
branches: [ "dev" ]
7+
jobs:
8+
9+
test-python-os-versions:
10+
name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} on ${{ matrix.architecture }}
11+
continue-on-error: ${{ matrix.allow_failure }}
12+
runs-on: ${{ matrix.runs-on }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
allow_failure: [false]
17+
runs-on: [ubuntu-latest]
18+
architecture: [x86_64]
19+
python-version: ["3.10", "3.11",]
20+
# Currently no public runners available for this but this or arm64 should work next time
21+
# include:
22+
# - python-version: "3.10"
23+
# architecture: [aarch64]
24+
# runs-on: macos-latest
25+
# allow_failure: true
26+
steps:
27+
- uses: actions/checkout@v3
28+
29+
- name: Setup Python ${{ matrix.python-version }}
30+
uses: actions/setup-python@v4
31+
with:
32+
python-version: ${{ matrix.python-version }}
33+
- name: Install repo
34+
run: |
35+
python -m pip install .
36+
- name: Check installation
37+
run: |
38+
python -c "import py4DSTEM; print(py4DSTEM.__version__)"
39+
# - name: Check machine arch
40+
# run: |
41+
# python -c "import platform; print(platform.machine())"

‎.github/workflows/check_install_main.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Install Checker Main
2+
on:
3+
push:
4+
branches: [ "main" ]
5+
pull_request:
6+
branches: [ "main" ]
7+
jobs:
8+
9+
test-python-os-versions:
10+
name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} on ${{ matrix.architecture }}
11+
continue-on-error: ${{ matrix.allow_failure }}
12+
runs-on: ${{ matrix.runs-on }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
allow_failure: [false]
17+
runs-on: [ubuntu-latest, windows-latest, macos-latest]
18+
architecture: [x86_64]
19+
python-version: ["3.10", "3.11",]
20+
include:
21+
- python-version: "3.12.0-beta.4"
22+
runs-on: ubuntu-latest
23+
allow_failure: true
24+
# Currently no public runners available for this but this or arm64 should work next time
25+
# include:
26+
# - python-version: "3.10"
27+
# architecture: [aarch64]
28+
# runs-on: macos-latest
29+
# allow_failure: true
30+
steps:
31+
- uses: actions/checkout@v3
32+
33+
- name: Setup Python ${{ matrix.python-version }}
34+
uses: actions/setup-python@v4
35+
with:
36+
python-version: ${{ matrix.python-version }}
37+
- name: Install repo
38+
run: |
39+
python -m pip install .
40+
- name: Check installation
41+
run: |
42+
python -c "import py4DSTEM; print(py4DSTEM.__version__)"
43+
- name: Check machine arch
44+
run: |
45+
python -c "import platform; print(platform.machine())"

‎.github/workflows/check_install_quick.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Install Checker Quick
2+
on:
3+
push:
4+
branches-ignore:
5+
- main
6+
- dev
7+
pull_request:
8+
branches-ignore:
9+
- main
10+
- dev
11+
jobs:
12+
13+
test-python-os-versions:
14+
name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} on ${{ matrix.architecture }}
15+
continue-on-error: ${{ matrix.allow_failure }}
16+
runs-on: ${{ matrix.runs-on }}
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
allow_failure: [false]
21+
runs-on: [ubuntu-latest]
22+
architecture: [x86_64]
23+
python-version: ["3.10"]
24+
# Currently no public runners available for this but this or arm64 should work next time
25+
# include:
26+
# - python-version: "3.10"
27+
# architecture: [aarch64]
28+
# runs-on: macos-latest
29+
# allow_failure: true
30+
steps:
31+
- uses: actions/checkout@v3
32+
33+
- name: Setup Python ${{ matrix.python-version }}
34+
uses: actions/setup-python@v4
35+
with:
36+
python-version: ${{ matrix.python-version }}
37+
- name: Install repo
38+
run: |
39+
python -m pip install .
40+
- name: Check installation
41+
run: |
42+
python -c "import py4DSTEM; print(py4DSTEM.__version__)"
43+
# - name: Check machine arch
44+
# run: |
45+
# python -c "import platform; print(platform.machine())"

‎py4DSTEM/__init__.py‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
Custom,
1616
print_h5_tree,
1717
)
18+
1819
_emd_hook = True
1920

2021
# structure
2122
from py4DSTEM import io
22-
from py4DSTEM.io import import_file,read,save
23-
23+
from py4DSTEM.io import import_file, read, save
2424

2525

2626
### basic data classes
@@ -35,12 +35,7 @@
3535
)
3636

3737
# datacube
38-
from py4DSTEM.datacube import (
39-
DataCube,
40-
VirtualImage,
41-
VirtualDiffraction
42-
)
43-
38+
from py4DSTEM.datacube import DataCube, VirtualImage, VirtualDiffraction
4439

4540

4641
### visualization
@@ -70,25 +65,21 @@
7065
)
7166

7267

73-
74-
7568
### more submodules
7669
# TODO
7770

7871
from py4DSTEM import preprocess
7972
from py4DSTEM import process
8073

8174

82-
8375
### utilities
8476

8577
# config
8678
from py4DSTEM.utils.configuration_checker import check_config
79+
8780
# TODO - config .toml
8881

8982
# testing
90-
from os.path import dirname,join
91-
_TESTPATH = join(dirname(__file__), "../test/unit_test_data")
92-
93-
83+
from os.path import dirname, join
9484

85+
_TESTPATH = join(dirname(__file__), "../test/unit_test_data")

‎py4DSTEM/braggvectors/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
from py4DSTEM.braggvectors.braggvector_methods import BraggVectorMap
44
from py4DSTEM.braggvectors.diskdetection import *
55
from py4DSTEM.braggvectors.probe import *
6-
#from .diskdetection_aiml import *
7-
#from .diskdetection_parallel_new import *
86

7+
# from .diskdetection_aiml import *
8+
# from .diskdetection_parallel_new import *

0 commit comments

Comments
 (0)