Skip to content

Commit

Permalink
Update licenses and version numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
jackleland committed Jan 26, 2024
1 parent 0d128f2 commit f2904bb
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 10 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 2-Clause License

Copyright (c) 2019-2021, Centre of Environmental Data Analysis Developers,
Copyright (c) 2019-2024, Centre of Environmental Data Analysis Developers,
Scientific and Technical Facilities Council (STFC),
UK Research and Innovation (UKRI).
All rights reserved.
Expand Down
6 changes: 3 additions & 3 deletions docs/user_guide/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
project = 'Near-Line Data Store'
copyright = '2023, Centre for Environmental Data Analysis, Science and Technologies Facilities Council, UK Research and Innovation'
copyright = '2024, Centre for Environmental Data Analysis, Science and Technologies Facilities Council, UK Research and Innovation'
author = 'Neil Massey and Jack Leland'
version = '0.1.1'
release = '0.1.1-RC1'
version = '1.0.0'
release = '1.0.0-RC1'

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
2 changes: 1 addition & 1 deletion docs/user_guide/source/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ NLDS is Open Source software made available under a BSD 2-Clause License.
BSD 2-Clause License
====================

Copyright (c) 2019-2023, Centre of Environmental Data Analysis Developers,
Copyright (c) 2019-2024, Centre of Environmental Data Analysis Developers,
Scientific and Technical Facilities Council (STFC),
UK Research and Innovation (UKRI).
All rights reserved.
Expand Down
15 changes: 13 additions & 2 deletions nlds_client/clientlib/authentication.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
import requests
from requests_oauthlib import OAuth2Session
"""
"""
__author__ = 'Neil Massey and Jack Leland'
__date__ = '29 Jan 2024'
__copyright__ = 'Copyright 2021 United Kingdom Research and Innovation'
__license__ = 'BSD - see LICENSE file in top-level package directory'
__contact__ = '[email protected]'

import json
import os.path
import getpass

import requests
from requests_oauthlib import OAuth2Session

from nlds_client.clientlib.exceptions import *

def get_username_password(config):
Expand Down
10 changes: 10 additions & 0 deletions nlds_client/clientlib/config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
"""
"""
__author__ = 'Neil Massey and Jack Leland'
__date__ = '29 Jan 2024'
__copyright__ = 'Copyright 2021 United Kingdom Research and Innovation'
__license__ = 'BSD - see LICENSE file in top-level package directory'
__contact__ = '[email protected]'

import json
import os.path

from click import option

from nlds_client.clientlib.nlds_client_setup import get_config_file_location
from nlds_client.clientlib.exceptions import ConfigError

Expand Down
10 changes: 9 additions & 1 deletion nlds_client/clientlib/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
"""Custom exceptions"""
"""
Custom exceptions
"""
__author__ = 'Neil Massey and Jack Leland'
__date__ = '29 Jan 2024'
__copyright__ = 'Copyright 2021 United Kingdom Research and Innovation'
__license__ = 'BSD - see LICENSE file in top-level package directory'
__contact__ = '[email protected]'


class ConnectionError(Exception):
pass
Expand Down
9 changes: 9 additions & 0 deletions nlds_client/clientlib/nlds_client_setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
"""
"""
__author__ = 'Neil Massey and Jack Leland'
__date__ = '29 Jan 2024'
__copyright__ = 'Copyright 2021 United Kingdom Research and Innovation'
__license__ = 'BSD - see LICENSE file in top-level package directory'
__contact__ = '[email protected]'

import os

def get_config_file_location():
Expand Down
9 changes: 9 additions & 0 deletions nlds_client/clientlib/transactions.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
"""
"""
__author__ = 'Neil Massey and Jack Leland'
__date__ = '29 Jan 2024'
__copyright__ = 'Copyright 2021 United Kingdom Research and Innovation'
__license__ = 'BSD - see LICENSE file in top-level package directory'
__contact__ = '[email protected]'

import json
import uuid
import urllib.parse
Expand Down
12 changes: 11 additions & 1 deletion nlds_client/nlds_client.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
#! /usr/bin/env python
import click
"""
"""
__author__ = 'Neil Massey and Jack Leland'
__date__ = '29 Jan 2024'
__copyright__ = 'Copyright 2024 United Kingdom Research and Innovation'
__license__ = 'BSD - see LICENSE file in top-level package directory'
__contact__ = '[email protected]'

from json import dumps as json_dumps

import click

from nlds_client.clientlib.transactions import (get_filelist, put_filelist,
list_holding, find_file,
monitor_transactions,
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name='nlds_client',
version='0.2.1',
version='1.0.0',
packages=find_packages(),
install_requires=[
'requests',
Expand Down Expand Up @@ -37,6 +37,8 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
],
Expand Down

0 comments on commit f2904bb

Please sign in to comment.