Skip to content

Commit

Permalink
name change to osl-ephys (osl_ephys) (#357)
Browse files Browse the repository at this point in the history
* name change to osl-ephys (osl_ephys)
* change name in docs and envs
* Updated installation instructions and removed conda env.

---------

Co-authored-by: cgohil8 <[email protected]>
  • Loading branch information
matsvanes and cgohil8 authored Oct 28, 2024
1 parent b7feaab commit d098794
Show file tree
Hide file tree
Showing 166 changed files with 395 additions and 395 deletions.
8 changes: 4 additions & 4 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cff-version: 0.2.0
message: "If you use this software, please cite the software itself, as well as the paper listed in the preferred-citation field. OSL is based on MNE-Python and the Source Recon module on FSL. Please cite these packages appropriately."
title: "OHBA Software Library in Python (OSL)"
version: 0.2.0
cff-version: 2.0.0
message: "If you use this software, please cite the software itself, as well as the paper listed in the preferred-citation field. osl-ephys is based on MNE-Python and the Source Recon module on FSL. Please cite these packages appropriately."
title: "OHBA Software Library for the Analysis of electrophysiology data (osl-ephys)"
version: 2.0.0
date-released: "2023-01-24"
commit: 46aff022171862d1ea582c4c1dcb77ead6459a53
doi: 10.5281/zenodo.6875060
Expand Down
38 changes: 19 additions & 19 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Contributing to OSL-Python
Contributing to osl-ephys
==========================

OSL accepts bug reports (as issues), bug fixes (as pull requests) and new features (as pull requests).
osl-ephys accepts bug reports (as issues), bug fixes (as pull requests) and new features (as pull requests).


## Issues (Bug Reports)
If you have found a bug or problem with the code, please [open an issue](https://github.com/OHBA-analysis/oslpy/issues/new) on github. An EXCELLENT bug report contains the following ingredients:
If you have found a bug or problem with the code, please [open an issue](https://github.com/OHBA-analysis/osl-ephys/issues/new) on github. An EXCELLENT bug report contains the following ingredients:

* **Summary** A concise description of the the bug.
* **Versions and context** Which OSL/Python versions (eg OSL v0.0.1 on Python 3.9) and which operating system (eg Debian 11.2, Mac OSX 10.15 or Windows 10) are you using?
* **Versions and context** Which osl-ephys/Python versions (eg osl-ephys v0.0.1 on Python 3.9) and which operating system (eg Debian 11.2, Mac OSX 10.15 or Windows 10) are you using?
* **Steps to reproduce** How can we reproduce the issue? - this is very important. Please use (`) to format inline code and (```) to format code blocks
* **What is the expected correct behavior?** What should happen instead of this current behaviour?
* **Relevant logs and/or screenshots** Paste any relevant logs - please use code blocks (```) to format console output, logs, and code.
Expand All @@ -18,43 +18,43 @@ Small and simple bugs might not need all this info but generally a more thorough

## Pull Requests (Bug Fixes and New Features)

If you want to contribute new code or documentation to OSL - you'll need to open a 'pull request'. There are two ways to do this.
If you want to contribute new code or documentation to osl-ephys - you'll need to open a 'pull request'. There are two ways to do this.

### Pull request from fork

If you have developed a new features or bug fix on your own copy (fork) of OSL and would like to contribute it back to OSL. Then you can [create a pull request from your forked version of osl](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork).
If you have developed a new features or bug fix on your own copy (fork) of OSL and would like to contribute it back to osl-ephys. Then you can [create a pull request from your forked version of osl-ephys](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork).

Please create the pull request with the **base** branch set to **main** on oslpy and the **compare** branch set to your contribution. Please include an informative title and a clear description of what changes you have made and what the expected behaviour should be. An OSL-Python developer will review the code and potentially ask for some changes before the code can be merged into OSL. In some cases a pull-request may be rejected.
Please create the pull request with the **base** branch set to **main** on osl-ephys and the **compare** branch set to your contribution. Please include an informative title and a clear description of what changes you have made and what the expected behaviour should be. An osl-ephys developer will review the code and potentially ask for some changes before the code can be merged into osl-ephys. In some cases a pull-request may be rejected.

### Pull request from OSL branch
### Pull request from osl-ephys branch

If you are an OSL developer, or working with the OSL team, you can make contributions by creating a new branch directly on the OSL repository. Please create the branch relative to **main** and ensure that it stays up to date with subsequent changes to the **main** branch. Once you're ready to start sharing the branch. You can make a [pull request directly from the branch on OSL](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request). If you would like to discuss and share changes but not merge them yet - please create a 'draft pull request'.
If you are an osl-ephys developer, or working with the osl-ephys team, you can make contributions by creating a new branch directly on the osl-ephys repository. Please create the branch relative to **main** and ensure that it stays up to date with subsequent changes to the **main** branch. Once you're ready to start sharing the branch. You can make a [pull request directly from the branch on osl-ephys](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request). If you would like to discuss and share changes but not merge them yet - please create a 'draft pull request'.

## Developer Notes

The core developer team is @woolrich, @ajquinn, @cgohil8 and @matsvanes. A few example workflows are listed below.
The core developer team is @matsvanes, @woolrich, @cgohil8 and @ajquinn. A few example workflows are listed below.

### Installation

To install an editable version with pip:
```
conda create --name osl python=3
conda activate osl
git clone [email protected]:OHBA-analysis/oslpy.git
cd oslpy
conda create --name osl-ephys python=3
conda activate osle
git clone [email protected]:OHBA-analysis/osl-ephys.git
cd osl-ephys
pip install -e .
```

### Tests

To run all tests:
```
cd osl
cd osl_ephys
pytest tests
```
or to run a specific test, e.g. file handling:
```
cd osl/tests
cd osl_ephys/tests
pytest test_file_handling.py
```

Expand Down Expand Up @@ -92,8 +92,8 @@ Practical overview of workflows in git - I'm assuming you're roughly familiar wi
First clone the repo into your chosen directory

```
git clone https://github.com/OHBA-analysis/oslpy.git
cd oslpy
git clone https://github.com/OHBA-analysis/osl-ephys.git
cd osl-ephys
```

Now you're ready to start making changes.
Expand Down Expand Up @@ -168,6 +168,6 @@ git push origin mynewbranch
Once you're ready to share you're changes, or would like a place to track changes and tests, you can create a pull request. You can do this on the website by nagvigating to the branch page at

```
https://github.com/OHBA-analysis/oslpy/tree/mynewbranch
https://github.com/OHBA-analysis/osl-ephys/tree/mynewbranch
```
There should be a grey bar below the branch name saying 'This branch is 5 commits ahead of main' or similar. If you click the "Contribute" button in the right of this box - you can create a pull request.
40 changes: 20 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
# OHBA Software Library (OSL)
# The OHBA Software Library for the analysis of electrophysiological data (osl-ephys)

Tools for MEG/EEG analysis.

Documentation: https://osl.readthedocs.io/en/latest/.
Documentation: https://osl-ephys.readthedocs.io/en/latest/.

## Installation

See the [official documentation](https://osl.readthedocs.io/en/latest/install.html) for recommended installation instructions.
See the [official documentation](https://osl-ephys.readthedocs.io/en/latest/install.html) for recommended installation instructions.

Alternatively, OSL can be installed from source code within a [Miniconda](https://docs.conda.io/projects/miniconda/en/latest/miniconda-install.html) (or [Anaconda](https://docs.anaconda.com/free/anaconda/install/index.html)) environment using the following.
Alternatively, osl-ephys can be installed from source code within a [Miniconda](https://docs.conda.io/projects/miniconda/en/latest/miniconda-install.html) (or [Anaconda](https://docs.anaconda.com/free/anaconda/install/index.html)) environment using the following.

### Linux

```
git clone https://github.com/OHBA-analysis/osl.git
cd osl
git clone https://github.com/OHBA-analysis/osl-ephys.git
cd osl-ephys
conda env create -f envs/linux.yml
conda activate osl
conda activate osle
pip install -e .
```

### Mac

```
git clone https://github.com/OHBA-analysis/osl.git
cd osl
git clone https://github.com/OHBA-analysis/osl-ephys.git
cd osl-ephys
conda env create -f envs/mac.yml
conda activate osl
conda activate osle
pip install -e .
```

### Oxford-specific computers

If you are installing on an OHBA workstation computer (HBAWS) use:
```
git clone https://github.com/OHBA-analysis/osl.git
cd osl
git clone https://github.com/OHBA-analysis/osl-ephys.git
cd osl-ephys
conda env create -f envs/hbaws.yml
conda activate osl
conda activate osle
pip install -e .
pip install spyder==5.1.5
```

Or on the BMRC cluster:
```
git clone https://github.com/OHBA-analysis/osl.git
cd osl
git clone https://github.com/OHBA-analysis/osl-ephys.git
cd osl-ephys
conda env create -f envs/bmrc.yml
conda activate osl
conda activate osle
pip install -e .
```

## Removing OSL

Simply removing the conda environment and delete the repository:
```
conda env remove -n osl
rm -rf osl
conda env remove -n osle
rm -rf osl-ephys
```

## For Developers

Run tests:
```
cd osl
cd osl_ephys
pytest tests
```
or to run a specific test:
```
cd osl/tests
cd osl_ephys/tests
pytest test_file_handling.py
```

Expand Down
Loading

0 comments on commit d098794

Please sign in to comment.