Skip to content

Commit

Permalink
Merge pull request #77 from SpiNNakerManchester/https
Browse files Browse the repository at this point in the history
Https
  • Loading branch information
Christian-B committed Mar 10, 2023
2 parents 8976968 + a120577 commit d11aee4
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 27 deletions.
21 changes: 10 additions & 11 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# Copyright (c) 2016-2019 The University of Manchester
# Copyright (c) 2016 The University of Manchester
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# https://www.apache.org/licenses/LICENSE-2.0
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

[run]
branch = True
5 changes: 2 additions & 3 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ preferred-citation:
family-names: Stokes
affiliation: University Of Manchester
orcid: https://orcid.org/0000-0002-6110-1484
website: http://www.cs.man.ac.uk/~stokesa6/
- given-names: Steve B.
family-names: Furber
affiliation: University Of Manchester
Expand All @@ -81,14 +80,14 @@ preferred-citation:
title: The client side of the SpiNNaker machine allocation software
authors:
- name: SpiNNaker Software Team
alias: For a list of contributors see https://github.com/SpiNNakerManchester/spalloc/graphs/contributors or for a combined list see http://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors
alias: For a list of contributors see https://github.com/SpiNNakerManchester/spalloc/graphs/contributors or for a combined list see https://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors
address: University of Manchester, Oxford Road
city: Manchester
country: GB
email: spinnakerusers@googlegroups.com
post-code: M13 9PL
website: https://apt.cs.manchester.ac.uk/projects/SpiNNaker/
url: http://spinnakermanchester.github.io/
url: https://spinnakermanchester.github.io/
contact:
- address: University of Manchester, Oxford Road
city: Manchester
Expand Down
8 changes: 4 additions & 4 deletions LICENSE_POLICY.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# License Agreement

Up to date information for the whole [SpiNNakerManchester Projects](https://github.com/SpiNNakerManchester) can be found [here](http://spinnakermanchester.github.io/latest/LicenseAgreement.html)
Up to date information for the whole [SpiNNakerManchester Projects](https://github.com/SpiNNakerManchester) can be found [here](https://spinnakermanchester.github.io/latest/LicenseAgreement.html)

As shown there the software is currently being released under the Apache License 2.0 listed [here](https://www.apache.org/licenses/LICENSE-2.0)


# Paper Authorship

See: [here](http://spinnakermanchester.github.io/latest/LicenseAgreement.html#paper-authorship)
See: [here](https://spinnakermanchester.github.io/latest/LicenseAgreement.html#paper-authorship)

# Modifications

See: [here](http://spinnakermanchester.github.io/latest/LicenseAgreement.html#modifications)
See: [here](https://spinnakermanchester.github.io/latest/LicenseAgreement.html#modifications)

# Contributors

For up to date information on Contributors see the graphs/contributors pages on each project.

For example [https://github.com/SpiNNakerManchester/spalloc/graphs/contributors](https://github.com/SpiNNakerManchester/spalloc/graphs/contributors)

[Combined list](http://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors)
[Combined list](https://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors)

6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Spalloc: SpiNNaker machine allocation client
:target: https://pypi.python.org/pypi/spalloc/
.. image:: https://readthedocs.org/projects/spalloc/badge/?version=stable
:alt: Documentation
:target: http://spalloc.readthedocs.org/
:target: https://spalloc.readthedocs.org/
.. image:: https://github.com/SpiNNakerManchester/spalloc/workflows/Python%20Build/badge.svg?branch=master
:alt: Build Status
:target: https://github.com/SpiNNakerManchester/spalloc/actions?query=workflow%3A%22Python+Build%22+branch%3Amaster
Expand All @@ -17,12 +17,12 @@ Spalloc: SpiNNaker machine allocation client
Spalloc is a Python library and set of command-line programs for requesting
SpiNNaker_ machines from a spalloc `server`_.

.. _SpiNNaker: http://apt.cs.manchester.ac.uk/projects/SpiNNaker/
.. _SpiNNaker: https://apt.cs.manchester.ac.uk/projects/SpiNNaker/
.. _server: https://github.com/SpiNNakerManchester/spalloc_server

To get started, see the quick-start below or refer to the documentation_.

.. _documentation: http://spalloc.readthedocs.org/
.. _documentation: https://spalloc.readthedocs.org/


Quick-start
Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ BUILDDIR = build

# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://sphinx-doc.org/)
endif

# Internal variables.
Expand Down
2 changes: 1 addition & 1 deletion docs/make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if errorlevel 9009 (
echo.may add the Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/
echo.https://sphinx-doc.org/
exit /b 1
)

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ def __getattr__(cls, name):
# keep_warnings = False

# Search Python docs for extra definitions.
intersphinx_mapping = {'python': ('http://docs.python.org/3', None),
'rig': ('http://rig.readthedocs.org/en/stable/', None)
intersphinx_mapping = {'python': ('https://docs.python.org/3', None),
'rig': ('https://rig.readthedocs.org/en/stable/', None)
}

# -- linkcode GitHub link generator ---------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Spalloc: SpiNNaker machine allocation client
Spalloc is a Python library and set of command-line programs for requesting
SpiNNaker_ machines from a spalloc `server`_.

.. _SpiNNaker: http://apt.cs.manchester.ac.uk/projects/SpiNNaker/
.. _SpiNNaker: https://apt.cs.manchester.ac.uk/projects/SpiNNaker/
.. _server: https://github.com/SpiNNakerManchester/spalloc_server


Expand Down Expand Up @@ -104,7 +104,7 @@ the spalloc server enabling any spalloc server command to be sent.
the spalloc server protocol_ in a manner better suited to their specific
use-case.

.. _protocol: http://spalloc-server.readthedocs.org/en/stable/protocol.html
.. _protocol: https://spalloc-server.readthedocs.org/en/stable/protocol.html

High level interface (:py:class:`spalloc.Job`)
``````````````````````````````````````````````
Expand Down

0 comments on commit d11aee4

Please sign in to comment.