Skip to content

Commit 27f317c

Browse files
thompson318thompson318
authored
Merge pull request #48 from SciKit-Surgery/47-move-to-sk
47 move to sk
2 parents 04a95be + d76647a commit 27f317c

10 files changed

Lines changed: 124 additions & 23 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
strategy:
66
matrix:
77
os: [ubuntu-18.04, macos-latest, windows-latest]
8-
python-ver: [3.6, 3.7, 3.8]
8+
python-ver: [3.7, 3.8, 3.9]
99

1010
runs-on: ${{ matrix.os }}
1111

‎CITATION.cff‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
cff-version: 1.2.0
2+
message: "If you use any SciKit-Surgery packages in your research, please cite it as below."
3+
authors:
4+
- family-names: "Thompson"
5+
given-names: "Stephen"
6+
orcid: "https://orcid.org/0000-0001-7286-1326"
7+
- family-names: "Dowrick"
8+
given-names: "Thomas"
9+
orcid: "https://orcid.org/0000-0002-2712-4447"
10+
- family-names: "Ahmad"
11+
given-names: "Mian"
12+
orcid: "https://orcid.org/0000-0002-4706-4146"
13+
- family-names: "Clarkson"
14+
given-names: "Matthew"
15+
orcid: "https://orcid.org/0000-0002-5565-1252"
16+
title: "SciKit-Surgery"
17+
url: "https://github.com/SciKit-Surgery/scikit-surgery"
18+
preferred-citation:
19+
type: article
20+
authors:
21+
- family-names: "Thompson"
22+
given-names: "Stephen"
23+
orcid: "https://orcid.org/0000-0001-7286-1326"
24+
- family-names: "Dowrick"
25+
given-names: "Thomas"
26+
orcid: "https://orcid.org/0000-0002-2712-4447"
27+
- family-names: "Ahmad"
28+
given-names: "Mian"
29+
orcid: "https://orcid.org/0000-0002-4706-4146"
30+
- family-names: "Xiao"
31+
given-names: "Guofang"
32+
- family-names: "Koo"
33+
given-names: "Bongjin"
34+
orcid: "https://orcid.org/0000-0002-3611-4988"
35+
- family-names: "Bonmati"
36+
given-names: "Ester"
37+
orcid: "https://orcid.org/0000-0001-9217-5438"
38+
- family-names: "Kahl"
39+
given-names: "Kim"
40+
- family-names: "Clarkson"
41+
given-names: "Matthew"
42+
orcid: "https://orcid.org/0000-0002-5565-1252"
43+
doi: 10.1007/s11548-020-02180-5
44+
journal: "International journal of computer assisted radiology and surgery"
45+
start: 1075
46+
end: 1084
47+
title: "SciKit-Surgery: Compact Libraries for Surgical Navigation"
48+
volume: 15
49+
issue: 7
50+
year: 2020

‎CONTRIBUTING.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ We welcome contributions to this Python Template.
1010
Reporting bugs and feature requests
1111
-----------------------------------
1212

13-
Please create a new issue on https://github.com/UCL/PythonTemplate/issues/new
13+
Please create a new issue on https://github.com/SciKit-Surgery/PythonTemplate/issues/new
1414

1515
When reporting a bug, please include:
1616
* The version of PythonTemplate you are using
@@ -25,12 +25,12 @@ Fixing bugs or implement features
2525

2626
The easiest way to contribute is to follow these guidelines:
2727

28-
1. Look through the issues on https://github.com/UCL/PythonTemplate/issues and assign the relevant issue to yourself. If there is not an existing issue that covers your work, please create one: https://github.com/UCL/PythonTemplate/issues/new
29-
2. Fork the repository: https://github.com/UCL/PythonTemplate/forks/new
28+
1. Look through the issues on https://github.com/SciKit-Surgery/PythonTemplate/issues and assign the relevant issue to yourself. If there is not an existing issue that covers your work, please create one: https://github.com/SciKit-Surgery/PythonTemplate/issues/new
29+
2. Fork the repository: https://github.com/SciKit-Surgery/PythonTemplate/forks/new
3030
3. Create a branch for your changes
3131
4. Make your changes following the coding guidelines below.
3232
5. Commit and push your changes to your fork.
33-
6. Submit a merge request: https://github.com/UCL/PythonTemplate/merge_requests/new
33+
6. Submit a merge request: https://github.com/SciKit-Surgery/PythonTemplate/merge_requests/new
3434

3535

3636

‎README.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Python Template
22
===============================
33

4-
.. image:: https://github.com/UCL/PythonTemplate/workflows/.github/workflows/ci.yml/badge.svg
5-
:target: https://github.com/UCL/PythonTemplate/actions
4+
.. image:: https://github.com/SciKit-Surgery/PythonTemplate/workflows/.github/workflows/ci.yml/badge.svg
5+
:target: https://github.com/SciKit-Surgery/PythonTemplate/actions
66
:alt: GitHub Actions CI statuss
77

88

@@ -86,7 +86,7 @@ How to use
8686

8787
::
8888

89-
cookiecutter https://github.com/UCL/PythonTemplate.git
89+
cookiecutter https://github.com/SciKit-Surgery/PythonTemplate.git
9090

9191
3. Answer the questions to configure your template (press enter to choose defaults), for further details on available answers see "List of Parameters" below.
9292

@@ -229,16 +229,16 @@ Supported by `Wellcome`_ and `EPSRC`_.
229229
.. _`spinx`: http://www.sphinx-doc.org/
230230
.. _`git`: https://git-scm.com/
231231
.. _`tox`: https://tox.readthedocs.io/
232-
.. _`scikit-surgery`: https://github.com/UCL/scikit-surgery/wiki
232+
.. _`scikit-surgery`: https://github.com/SciKit-Surgery/scikit-surgery
233233
.. _`Unix Philosophy': https://en.wikipedia.org/wiki/Unix_philosophy
234234
.. _`The WEISS Software Manifesto`: https://weisslab.cs.ucl.ac.uk/WEISS/_manifesto
235235
.. _`Software Process`: https://doi.org/10.1109/ISBI.2004.1398621
236236
.. _`Wellcome EPSRC Centre for Interventional and Surgical Sciences`: http://www.ucl.ac.uk/weiss
237237
.. _`University College London (UCL)`: http://www.ucl.ac.uk/
238238
.. _`Wellcome`: https://wellcome.ac.uk/
239239
.. _`EPSRC`: https://www.epsrc.ac.uk/
240-
.. _`contributing guidelines`: https://github.com/UCL/PythonTemplate/blob/master/CONTRIBUTING.rst
241-
.. _`license file`: https://github.com/UCL/PythonTemplate/blob/master/LICENSE
240+
.. _`contributing guidelines`: https://github.com/SciKit-Surgery/PythonTemplate/blob/master/CONTRIBUTING.rst
241+
.. _`license file`: https://github.com/SciKit-Surgery/PythonTemplate/blob/master/LICENSE
242242
.. _`Cookiecutter`: https://cookiecutter.readthedocs.io
243243
.. _`WEISSLab`: https://weisslab.cs.ucl.ac.uk/
244244
.. _`ReadTheDocs`: https://readthedocs.org/

‎cookiecutter.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
"full_name": "Your Name",
88
"repository_profile_name": "e.g. Your GitHub Username",
99
"repository_path": ["{{ cookiecutter.repository_profile_name }}/{{ cookiecutter.project_slug }}",
10+
"{% if cookiecutter.repository_server == 'https://github.com' %}SciKit-Surgery{%endif %}/{{ cookiecutter.project_slug }}",
1011
"{% if cookiecutter.repository_server == 'https://github.com' %}UCL{%endif %}/{{ cookiecutter.project_slug }}",
1112
"{% if cookiecutter.repository_server == 'https://weisslab.cs.ucl.ac.uk' %}WEISS/SoftwareRepositories{% elif cookiecutter.repository_server == 'https://cmiclab.cs.ucl.ac.uk' %}CMIC{% else %}niftk{% endif %}/{{ cookiecutter.project_slug }}",
1213
"{% if cookiecutter.repository_server == 'https://weisslab.cs.ucl.ac.uk' %}WEISS/SoftwareRepositories/SNAPPY{% endif %}/{{ cookiecutter.project_slug }}"
1314
],
1415
"project_url": "{{ cookiecutter.repository_server }}/{{ cookiecutter.repository_path }}",
1516
"open_source_license": ["BSD-3 license", "Apache Software License 2.0", "MIT License"],
1617
"copyright_holder": "University College London"
17-
}
18+
}

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
name='Python Template',
55
version='0.1',
66
description='Python Template',
7-
url='https://weisslab.cs.ucl.ac.uk/WEISS/SoftwareArchitecture/PythonTemplate',
7+
url='https://https://github.com/SciKit-Surgery/PythonTemplate',
88
author='Tom Doel',
9-
author_email='t.doel@ucl.ac.uk',
9+
author_email='s.thompson@ucl.ac.uk',
1010
license='BSD-3 license',
1111

1212
packages=find_packages(

‎{{cookiecutter.project_slug}}/.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
os: [ubuntu-18.04, macos-latest, windows-latest]
10-
python-ver: [3.6, 3.7, 3.8]
10+
python-ver: [3.7, 3.8, 3.9]
1111

1212
runs-on: ${{ matrix.os }}
1313

@@ -41,7 +41,7 @@ jobs:
4141
- name: Set up Python
4242
uses: actions/setup-python@v1
4343
with:
44-
python-version: 3.6
44+
python-version: 3.7
4545

4646
- name: Install dependencies
4747
run: python -m pip install wheel twine setuptools

‎{{cookiecutter.project_slug}}/CITATION.cff‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
cff-version: 1.2.0
2+
message: "If you use any SciKit-Surgery packages in your research, please cite it as below."
3+
authors:
4+
- family-names: "Thompson"
5+
given-names: "Stephen"
6+
orcid: "https://orcid.org/0000-0001-7286-1326"
7+
- family-names: "Dowrick"
8+
given-names: "Thomas"
9+
orcid: "https://orcid.org/0000-0002-2712-4447"
10+
- family-names: "Ahmad"
11+
given-names: "Mian"
12+
orcid: "https://orcid.org/0000-0002-4706-4146"
13+
- family-names: "Clarkson"
14+
given-names: "Matthew"
15+
orcid: "https://orcid.org/0000-0002-5565-1252"
16+
title: "SciKit-Surgery"
17+
url: "https://github.com/SciKit-Surgery/scikit-surgery"
18+
preferred-citation:
19+
type: article
20+
authors:
21+
- family-names: "Thompson"
22+
given-names: "Stephen"
23+
orcid: "https://orcid.org/0000-0001-7286-1326"
24+
- family-names: "Dowrick"
25+
given-names: "Thomas"
26+
orcid: "https://orcid.org/0000-0002-2712-4447"
27+
- family-names: "Ahmad"
28+
given-names: "Mian"
29+
orcid: "https://orcid.org/0000-0002-4706-4146"
30+
- family-names: "Xiao"
31+
given-names: "Guofang"
32+
- family-names: "Koo"
33+
given-names: "Bongjin"
34+
orcid: "https://orcid.org/0000-0002-3611-4988"
35+
- family-names: "Bonmati"
36+
given-names: "Ester"
37+
orcid: "https://orcid.org/0000-0001-9217-5438"
38+
- family-names: "Kahl"
39+
given-names: "Kim"
40+
- family-names: "Clarkson"
41+
given-names: "Matthew"
42+
orcid: "https://orcid.org/0000-0002-5565-1252"
43+
doi: 10.1007/s11548-020-02180-5
44+
journal: "International journal of computer assisted radiology and surgery"
45+
start: 1075
46+
end: 1084
47+
title: "SciKit-Surgery: Compact Libraries for Surgical Navigation"
48+
volume: 15
49+
issue: 7
50+
year: 2020

‎{{cookiecutter.project_slug}}/README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Supported by `Wellcome`_ and `EPSRC`_.
109109
.. _`Wellcome EPSRC Centre for Interventional and Surgical Sciences`: http://www.ucl.ac.uk/weiss
110110
.. _`source code repository`: {{ cookiecutter.project_url }}
111111
.. _`Documentation`: https://{{ cookiecutter.project_slug }}.readthedocs.io
112-
.. _`scikit-surgery`: https://github.com/UCL/scikit-surgery/wiki
112+
.. _`scikit-surgery`: https://github.com/SciKit-Surgery/scikit-surgery
113113
.. _`University College London (UCL)`: http://www.ucl.ac.uk/
114114
.. _`Wellcome`: https://wellcome.ac.uk/
115115
.. _`EPSRC`: https://www.epsrc.ac.uk/

‎{{cookiecutter.project_slug}}/tox.ini‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# content of: tox.ini , put in same dir as setup.py
22
[tox]
3-
envlist = py36,lint
3+
envlist = py37,lint
44
skipsdist = True
55

66
[travis]
77
python =
8-
3.6: py36, docs, lint
8+
3.7: py37, docs, lint
99

1010
[testenv]
1111
deps=-rrequirements-dev.txt
@@ -17,22 +17,22 @@ commands = coverage erase
1717
coverage report -m
1818

1919
[testenv:lint]
20-
basepython=python3.6
20+
basepython=python3.7
2121
deps=pylint
2222
{[testenv]deps}
2323
commands=pylint --rcfile=tests/pylintrc {{ cookiecutter.pkg_name }}
2424

2525
[testenv:docs]
26-
basepython=python3.6
26+
basepython=python3.7
2727
changedir = doc
2828
commands = sphinx-build -M html . build
2929

3030
[testenv:installer]
31-
basepython=python3.6
31+
basepython=python3.7
3232
commands=pyinstaller --onefile {{ cookiecutter.pkg_name }}.py --noconfirm --windowed
3333

3434
[testenv:pip3]
35-
basepython=python3.6
35+
basepython=python3.7
3636
changedir=pip_test
3737
skip_install=True
3838
commands = pip install {posargs}

0 commit comments

Comments
 (0)