Skip to content

Commit

Permalink
Merge pull request #686 from hakonanes/src-layout
Browse files Browse the repository at this point in the history
Switch to src layout
  • Loading branch information
hakonanes authored Sep 30, 2024
2 parents 361f546 + a9d4862 commit 6070a20
Show file tree
Hide file tree
Showing 219 changed files with 2,464 additions and 2,438 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/perhaps_make_tagged_release_draft.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from outdated import check_outdated

with open("../../kikuchipy/__init__.py") as fid:
with open("../../src/kikuchipy/__init__.py") as fid:
for line in fid:
if line.startswith("__version__"):
branch_version = line.strip().split(" = ")[-1][1:-1]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/perhaps_make_tagged_release_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
branches:
- main
paths:
- "kikuchipy/__init__.py"
- "src/kikuchipy/__init__.py"

jobs:
make-tagged-release:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
timeout-minutes: 15
env:
MPLBACKEND: agg
PYTEST_ARGS: --pyargs kikuchipy --reruns 2 -n 2 --cov=kikuchipy
PYTEST_ARGS: --reruns 2 -n 2 --cov=kikuchipy
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
if: ${{ matrix.os == 'ubuntu-latest' }}
continue-on-error: true
run: |
xvfb-run pytest --doctest-modules --doctest-continue-on-failure --ignore-glob=kikuchipy/*/tests kikuchipy/*.py
xvfb-run pytest src --doctest-modules --doctest-continue-on-failure
- name: Run tests in a virtual X server environment on Ubuntu
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ instance/
.scrapy

# Sphinx documentation
doc/build/
doc/_build/
doc/reference/generated/
doc/examples/
sg_execution_times.rst
Expand Down Expand Up @@ -105,7 +105,6 @@ ENV/

# Auto changing files
build/
src/

# Backport
.backportrc.json
Expand Down
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ repos:
rev: 24.8.0
hooks:
- id: black
language_version: python3.11
- id: black-jupyter
files: \.ipynb
args: [--line-length=77]
Expand Down
7 changes: 4 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
======

.. |logo| image:: https://raw.githubusercontent.com/pyxem/kikuchipy/develop/doc/_static/logo/plasma_banner.png
:width: 40%
:width: 50%
:target: https://kikuchipy.org

kikuchipy [ki-ko-chi-pai] is a library for processing, simulating, and indexing of
electron backscatter diffraction (EBSD) patterns in Python.
Expand Down Expand Up @@ -71,7 +72,7 @@ Documentation

Refer to the `documentation <https://kikuchipy.org>`__ for detailed installation
instructions, a user guide, and the
`changelog <https://kikuchipy.org/en/latest/changelog.html>`__.
`changelog <https://kikuchipy.org/en/stable/changelog.html>`__.

Installation
------------
Expand All @@ -89,7 +90,7 @@ You can also visit `PyPI <https://pypi.org/project/kikuchipy>`__,
`GitHub <https://github.com/pyxem/kikuchipy>`__ to download the source.

Further details are available in the
`installation guide <https://kikuchipy.org/en/latest/user/installation.html>`__.
`installation guide <https://kikuchipy.org/en/stable/user/installation.html>`__.

Citing kikuchipy
----------------
Expand Down
Loading

0 comments on commit 6070a20

Please sign in to comment.