Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/actions/conda_build_publish_package/Dockerfile

This file was deleted.

63 changes: 0 additions & 63 deletions .github/actions/conda_build_publish_package/README.md

This file was deleted.

21 changes: 0 additions & 21 deletions .github/actions/conda_build_publish_package/action.yml

This file was deleted.

50 changes: 0 additions & 50 deletions .github/actions/conda_build_publish_package/entrypoint.sh

This file was deleted.

27 changes: 1 addition & 26 deletions .github/workflows/package_upload.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build & Upload Python Package
name: Build & Upload DeerLab to PyPI

on:
release:
Expand Down Expand Up @@ -26,28 +26,3 @@ jobs:
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}

conda-build-n-publish:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
python-version: 3.8
- name: Get DeerLab version
run: echo "DEERLAB_VERSION=$(cat VERSION)" >> $GITHUB_ENV
- name: Update version in Conda metadata
uses: jacobtomlinson/gha-find-replace@master
with:
find: "VERSION"
replace: ${{env.DEERLAB_VERSION}}
include: "conda.recipe/meta.yaml"
- name: Build & Publish to Anaconda
uses: ./.github/actions/conda_build_publish_package
with:
subdir: 'conda.recipe'
anacondatoken: ${{ secrets.ANACONDA_TOKEN }}
platforms: 'osx-64 linux-32 linux-64 win-32 win-64'
python: '3.8 3.9 3.10'
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# DeerLab

[![https://jeschkelab.github.io/DeerLab/](https://img.shields.io/pypi/v/deerlab)](https://pypi.org/project/DeerLab/)
[![https://img.shields.io/conda/v/JeschkeLab/deerlab](https://img.shields.io/conda/v/JeschkeLab/deerlab)](https://anaconda.org/jeschkelab/deerlab)
[![Website](https://img.shields.io/website?down_message=offline&label=Documentation&up_message=online&url=https%3A%2F%2Fjeschkelab.github.io%2FDeerLab%2Findex.html)](https://jeschkelab.github.io/DeerLab/)
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/deerlab)](https://www.python.org/downloads/)
![PyPI - Downloads](https://img.shields.io/pypi/dm/deerlab?color=brightgreen)
Expand All @@ -23,16 +22,12 @@ All additional dependencies are automatically downloaded and installed during th

## Setup

A pre-built distribution can be installed from the PyPI repository using `pip` or from the Anaconda repository using `conda`.
A pre-built distribution can be installed from the PyPI repository using `pip`.

From a terminal (preferably with admin privileges) use the following command to install from PyPI:

python -m pip install deerlab

or the following command to install from Anaconda:

conda install deerlab -c JeschkeLab

More details on the installation and updating of DeerLab can be found [here](https://jeschkelab.github.io/DeerLab/installation.html).

## Citing DeerLab
Expand Down
2 changes: 0 additions & 2 deletions conda.recipe/build.bat

This file was deleted.

1 change: 0 additions & 1 deletion conda.recipe/build.sh

This file was deleted.

36 changes: 0 additions & 36 deletions conda.recipe/meta.yaml

This file was deleted.

44 changes: 0 additions & 44 deletions conda.recipe/package_conda.bat

This file was deleted.

21 changes: 1 addition & 20 deletions docsrc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,6 @@ DeerLab installs the following packages:
* `tqdm <https://github.com/tqdm/tqdm>`_ - A lightweight package for smart progress meters.
* `dill <https://github.com/uqfoundation/dill>`_ - An extension of Python's pickle module for serializing and de-serializing python objects.
* `quadprog <https://pypi.org/project/quadprog/>`_ - A quadratic programming solver
Installing from Anaconda
*************************

DeerLab is also distributed via the Anaconda repository and the ``conda`` package manager.

Open the Anaconda prompt (preferably with administrative privileges) or activate the Anaconda environment. Next install DeerLab via the ``conda`` package manager as follows::

conda install deerlab -c JeschkeLab

The package manager will automatically take care of installing all DeerLab dependencies.


Importing DeerLab
------------------
Expand All @@ -75,10 +64,6 @@ To upgrade an existing DeerLab installation to the latest released version, use

python -m pip install --upgrade deerlab

or if you are using Anaconda use the following command from the Anaconda prompt::

conda update deerlab

Other installations
-------------------

Expand All @@ -88,11 +73,7 @@ Installing specific versions
Any DeerLab version released after v0.10.0 can be installed via ``pip`` using the following command matching the x.y.z to the desired version::

python -m pip install deerlab==x.y.z

or via ``conda`` if you use Anaconda as follows::

conda install deerlab=x.y.z


DeerLab version prior to 0.10 are written in MATLAB and are still available from an `archived repository <https://github.com/JeschkeLab/DeerLab-Matlab>`_.
Download and installation instruction for the MATLAB environment are provided in the released documentation. MATLAB releases have been deprecated and no further support is provided.

Expand Down