diff --git a/talks/structuring/example_project1/LICENSE b/talks/structuring/example_project/LICENSE similarity index 100% rename from talks/structuring/example_project1/LICENSE rename to talks/structuring/example_project/LICENSE diff --git a/talks/structuring/example_project1/README.rst b/talks/structuring/example_project/README.rst similarity index 100% rename from talks/structuring/example_project1/README.rst rename to talks/structuring/example_project/README.rst diff --git a/talks/structuring/example_project/mypackage/__init__.py b/talks/structuring/example_project/mypackage/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..7ff64a54f2ca932ca45f6f97737399d653e156b7 --- /dev/null +++ b/talks/structuring/example_project/mypackage/__init__.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python + + +__version__ = '0.1.0' + + +# make myfunction available +# at the package-level +from .mymodule import myfunction diff --git a/talks/structuring/example_project1/myproject/mymodule.py b/talks/structuring/example_project/mypackage/mymodule.py similarity index 100% rename from talks/structuring/example_project1/myproject/mymodule.py rename to talks/structuring/example_project/mypackage/mymodule.py diff --git a/talks/structuring/example_project1/requirements.txt b/talks/structuring/example_project/requirements.txt similarity index 100% rename from talks/structuring/example_project1/requirements.txt rename to talks/structuring/example_project/requirements.txt diff --git a/talks/structuring/example_project/setup.py b/talks/structuring/example_project/setup.py new file mode 100644 index 0000000000000000000000000000000000000000..2705d1a462d040d82471e2e0f8dfbc36687d744f --- /dev/null +++ b/talks/structuring/example_project/setup.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python + +from setuptools import setup + +from mypackage import __version__ + +with open('requirements.txt', 'rt') as f: + requirements = [l.strip() for l in f.readlines()] + +setup( + + name='Example project', + description='Example Python project for PyTreat', + url='https://git.fmrib.ox.ac.uk/fsl/pytreat-2018-practicals/', + author='Paul McCarthy', + author_email='pauldmccarthy@gmail.com', + license='Apache License Version 2.0', + + version=__version__, + + install_requires=requirements, + + classifiers=[ + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Apache Software License', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Topic :: Software Development :: Libraries :: Python Modules'], +) diff --git a/talks/structuring/example_project1/myproject/__init__.py b/talks/structuring/example_project1/myproject/__init__.py deleted file mode 100644 index b659477bde25d2243c92ccca2f1ddca4f9636327..0000000000000000000000000000000000000000 --- a/talks/structuring/example_project1/myproject/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python - - -__version__ = '0.1.0' - - -# The top-level __init__.py can -# be used to set up the overall -# namespace for your library. -from .mymodule import myfunction diff --git a/talks/structuring/example_project1/setup.py b/talks/structuring/example_project1/setup.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000