Commit 2c6094f8 authored by Andrew Quinn's avatar Andrew Quinn
Browse files

Merge branch 'master' into '62-mode-thresholding-by-permutation'

# Conflicts:
#   sails/__init__.py
parents d947ec01 9b5cfcae
Loading
Loading
Loading
Loading
Loading
+54 −13
Original line number Diff line number Diff line
default:
  image: debian:buster
include:
  - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'

before_script:
  - apt update
  - apt upgrade -q -y
  - pip install -r requirements.txt

stages:
  - build_test
  - build

build_test:
  stage: build_test
build37:
  stage: build
  image: python:3.7
  script:
    - flake8
    - make clean
    - make all
    - pytest
  artifacts:
    paths:
      - dist/
    expire_in: 1 week

build38:
  stage: build
  image: python:3.8
  script:
    - flake8
    - make clean
    - make all
    - pytest
  artifacts:
    paths:
      - dist/
    expire_in: 1 week

build39:
  stage: build
  image: python:3.9
  script:
    - flake8
    - make clean
    - make all
    - pytest
  artifacts:
    paths:
      - dist/
    expire_in: 1 week


build310:
  stage: build
  image: python:3.10
  script:
    - apt update
    - apt upgrade -y
    - apt install -y python3-setuptools python3-numpy python3-scipy python3-matplotlib python3-h5py python3-sklearn python3-sphinx python3-sphinx-rtd-theme ipython3 flake8 python3-setuptools python3-pytest python3-pytest-cov python3-wheel codespell
    - flake8
    - make spell
    - python3 setup.py build
    - make doc-html
    - make testv3
    - python3 setup.py sdist bdist_wheel
    - make clean
    - make all
    - pytest
  artifacts:
    paths:
      - dist/
+4 −7
Original line number Diff line number Diff line
@@ -34,18 +34,15 @@ release onwards).
Repository
==========

The main git repository can be found at https://vcs.ynic.york.ac.uk/analysis/sails
The main git repository can be found at https://gitlab.com/sails-dev/analysis/sails

Contributing
============

If you wish to raise issues on, or contribute patches to SAILS, you will need
an account on the Gitlab server.  This can be obtained by going to
https://vcs.ynic.york.ac.uk, going to the "Sign In" link and then using
the self-service interface to create an account.  By default you will be able
to file issues on the codebase.  If you wish to be able to create MRs please
tag @aq501 or @mark in the relevant issue and we will give you permission to
do so.  Alternatively, please feel free to email one of us.
an account on gitlab.com.  If you wish to be able to create MRs please tag
@ajquinn or @mhy in the relevant issue and we will give you permission to do
so.  Alternatively, please feel free to email one of us.

Authors
=======
+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ make testv3
   virtualenv and install it that way.  If you need to test it, test against `https://test.pypi.org`
   rather than the real `https://pypi.org` (see the Packaging Python Documents tutorial at
   https://packaging.python.org/tutorials/packaging-projects/)
 * Ensure that you have a gitlab API token set up for `vcs.ynic.york.ac.uk`
 * Ensure that you have a gitlab API token set up for `gitlab.com`


Release
@@ -48,9 +48,9 @@ Uploading sails-0.1.0.tar.gz
   You will need to update the variables in the curl snippet below:
```
curl --header 'Content-Type: application/json' \
     --header "PRIVATE-TOKEN: GITLAB_ACCESS_TOKEN_HERE" \
     --data '{ "name": "x.y.z", "tag_name": "x.y.z", "description": "Release description here", "assets": { "links": [{ "name": "sails-x.y.z.tar.gz", "url": "https://files.pythonhosted.org/.../sails-x.y.z.tar.gz" }, { "name": "sails-x.y.z-py2-non-any.whl", "url": "https://files.pythonhosted.org/.../sails-x.y.z-py2-none-any.whl"}, { "name": "sails-x.y.z-py3-none-any.whl", "url": "https://files.pythonhosted.org/.../sails-x.y.z-py3-none-any.whl"}] } }' \
     --request POST "https://vcs.ynic.york.ac.uk/api/v4/projects/258/releases"
     --header "PRIVATE-TOKEN: ${GITLAB_ACCESS_TOKEN}" \
     --data '{ "name": "1.1.0", "tag_name": "1.1.0", "description": "v1.1.0 release", "assets": { "links": [{ "name": "sails-1.1.0.tar.gz", "url": "https://files.pythonhosted.org/packages/f9/ad/80d899318aa98f662c92287206ed62e860048a364084c76307c4f02c7047/sails-1.1.0.tar.gz" }, { "name": "sails-1.1.0-py3-none-any.whl", "url": ""https://files.pythonhosted.org/packages/05/35/12f7e8c21a6bf19e1edb806debb2385a2dc1b2613728d7badf6c0928d7c9/sails-1.1.0-py3-none-any.whl}] } }' \
     --request POST "https://gitlab.com/api/v4/projects/23671946/releases"
```


+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ Python 2, but the authors no longer actively test under this version.

Tutorials and documentation regarding the use of the module are available at
https://sails.readthedocs.org.  Development and bug tracking is
hosted at https://vcs.ynic.york.ac.uk/analysis/sails.
hosted at https://github.com/sails-dev/sails.

The majority of workflows can be summarised as:

+7 −0
Original line number Diff line number Diff line
:root {
  /*****************************************************************************
  * Theme config
  **/
  --pst-header-height: 90px;

}
Loading