From 6b2ebac8ce94c91afaa62dcd52c2c9baed257e8f Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sun, 18 Feb 2018 13:09:38 +0000
Subject: [PATCH] rename. add setup
---
.../LICENSE | 0
.../README.rst | 0
.../example_project/mypackage/__init__.py | 9 ++++++
.../mypackage}/mymodule.py | 0
.../requirements.txt | 0
talks/structuring/example_project/setup.py | 32 +++++++++++++++++++
.../example_project1/myproject/__init__.py | 10 ------
talks/structuring/example_project1/setup.py | 0
8 files changed, 41 insertions(+), 10 deletions(-)
rename talks/structuring/{example_project1 => example_project}/LICENSE (100%)
rename talks/structuring/{example_project1 => example_project}/README.rst (100%)
create mode 100644 talks/structuring/example_project/mypackage/__init__.py
rename talks/structuring/{example_project1/myproject => example_project/mypackage}/mymodule.py (100%)
rename talks/structuring/{example_project1 => example_project}/requirements.txt (100%)
create mode 100644 talks/structuring/example_project/setup.py
delete mode 100644 talks/structuring/example_project1/myproject/__init__.py
delete mode 100644 talks/structuring/example_project1/setup.py
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 0000000..7ff64a5
--- /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 0000000..2705d1a
--- /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 b659477..0000000
--- 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 e69de29..0000000
--
GitLab