Skip to content

Commit 378e3ac

Browse files
committed
initial setup of package for distribution, fixes sktime#4
1 parent abca211 commit 378e3ac

35 files changed

+21
-32
lines changed

CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ How to contribute
22
-----------------
33

44
The preferred workflow for contributing to sktime is to fork the
5-
[main repository](https://github.com/kiraly-group/sktime) on
5+
[main repository](https://github.com/alan-turing-institute/sktime/) on
66
GitHub, clone, and develop on a branch. Steps:
77

8-
1. Fork the [project repository](https://github.com/kiraly-group/sktime)
8+
1. Fork the [project repository](https://github.com/alan-turing-institute/sktime)
99
by clicking on the 'Fork' button near the top right of the page. This creates
1010
a copy of the code under your GitHub user account. For more details on
1111
how to fork a repository see [this guide](https://help.github.com/articles/fork-a-repo/).
@@ -99,8 +99,8 @@ It is recommended to check that your issue complies with the
9999
following rules before submitting:
100100

101101
- Verify that your issue is not being currently addressed by other
102-
[issues](https://github.com/kiraly-group/sktime/issues)
103-
or [pull requests](https://github.com/kiraly-group/sktime/pulls).
102+
[issues](https://github.com/alan-turing-institute/sktime/issues)
103+
or [pull requests](https://github.com/alan-turing-institute/sktime/pulls).
104104

105105
- Please ensure all code snippets and error messages are formatted in
106106
appropriate code blocks.

MANIFEST.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include *.rst
22
recursive-include examples *
3-
recursive-include sktime *.c *.h *.pyx *.pxd *.pxi
4-
recursive-include sktime/datasets *.csv *.csv.gz *.arff *.arff.gz *.txt *.ts
3+
recursive-include sktime-dl *.c *.h *.pyx *.pxd *.pxi
4+
#recursive-include sktime-dl/datasets *.csv *.csv.gz *.arff *.arff.gz *.txt *.ts

PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Thanks for contributing a pull request! Please ensure you have taken a look at
3-
the extension guidelines: https://github.com/sktime/sktime/blob/master/CONTRIBUTING.md
3+
the extension guidelines: https://github.com/uea-machine-learning/sktime-dl/blob/master/CONTRIBUTING.md
44
-->
55

66
#### Reference Issues/PRs

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Former and current active contributors are as follows.
6767
sktime-dl
6868
~~~~~~~~~
6969

70-
James Large (@James-Large), Aaron Bostrom (@ABostrom), Hassan Ismail Fawaz (@hfawaz)
70+
James Large (@James-Large), Aaron Bostrom (@ABostrom), Hassan Ismail Fawaz (@hfawaz), Markus Löning (@mloning)
7171

7272
sktime
7373
~~~~~~

setup.py

+12-24
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
except ModuleNotFoundError as e:
1515
raise ModuleNotFoundError("No module named 'numpy'. Please install "
1616
"numpy first using `pip install numpy`.")
17-
try:
18-
from Cython.Build import cythonize
19-
except ModuleNotFoundError as e:
20-
raise ModuleNotFoundError("No module named 'cython'. Please install "
21-
"cython first using `pip install cython`.")
2217

2318
HERE = os.path.abspath(os.path.dirname(__file__))
2419

@@ -41,32 +36,28 @@ def find_version(*file_paths):
4136

4237
# raise warning for Python versions prior to 3.6
4338
if sys.version_info < (3, 6):
44-
raise RuntimeError("sktime requires Python 3.6 or later. The current"
39+
raise RuntimeError("sktime-dl requires Python 3.6 or later. The current"
4540
" Python version is %s installed in %s."
4641
% (platform.python_version(), sys.executable))
4742

4843

49-
DISTNAME = 'sktime'
50-
DESCRIPTION = 'scikit-learn compatible toolbox for learning with time series/panel data'
44+
DISTNAME = 'sktime-dl'
45+
DESCRIPTION = 'deep learning extension toolbox for sktime, a scikit-learn compatible toolbox for learning with time series/panel data'
5146
with codecs.open('README.rst', encoding='utf-8-sig') as f:
5247
LONG_DESCRIPTION = f.read()
5348
MAINTAINER = 'F. Király'
5449
MAINTAINER_EMAIL = '[email protected]'
55-
URL = 'https://github.com/alan-turing-institute/sktime'
50+
URL = 'https://github.com/uea-machine-learning/sktime-dl'
5651
LICENSE = 'BSD-3-Clause'
57-
DOWNLOAD_URL = 'https://pypi.org/project/sktime/#files'
52+
DOWNLOAD_URL = 'https://pypi.org/project/sktime-dl/#files'
5853
PROJECT_URLS = {
59-
'Issue Tracker': 'https://github.com/alan-turing-institute/sktime/issues',
60-
'Documentation': 'https://alan-turing-institute.github.io/sktime/',
61-
'Source Code': 'https://github.com/alan-turing-institute/sktime'
54+
'Issue Tracker': 'https://github.com/uea-machine-learning/sktime-dl/issues',
55+
'Documentation': 'https://uea-machine-learning.github.io/sktime-dl/',
56+
'Source Code': 'https://github.com/uea-machine-learning/sktime-dl'
6257
}
63-
VERSION = find_version('sktime', '__init__.py')
64-
INSTALL_REQUIRES = ['numpy>=1.16.0',
65-
'scipy>=1.2.0',
66-
'scikit-learn>=0.21.0',
67-
'pandas>=0.23.0',
68-
'scikit-posthocs>=0.5.0',
69-
'statsmodels>=0.9.0']
58+
VERSION = find_version('sktime-dl', '__init__.py')
59+
INSTALL_REQUIRES = ['sktime>=0.2.0',
60+
'keras']
7061
CLASSIFIERS = ['Intended Audience :: Science/Research',
7162
'Intended Audience :: Developers',
7263
'License :: OSI Approved',
@@ -107,8 +98,5 @@ def find_version(*file_paths):
10798
include_package_data=True,
10899
install_requires=INSTALL_REQUIRES,
109100
extras_require=EXTRAS_REQUIRE,
110-
ext_modules=cythonize(
111-
["sktime/distances/elastic_cython.pyx"],
112-
annotate=True),
113101
include_dirs=[np.get_include()]
114-
)
102+
)

sktime-dl/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = "0.1.0"

sktime-dl/contrib/deeplearning_based/__init__.py

Whitespace-only changes.

sktime-dl/contrib/deeplearning_based/dl4tsc/__init__.py

Whitespace-only changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)