From d2f14929b148e4f35aadf22dd9915b2dfaae569d Mon Sep 17 00:00:00 2001
From: Yngve Levinsen <yngve.levinsen@esss.se>
Date: Thu, 5 Sep 2019 09:53:48 +0200
Subject: [PATCH] MIT License instead of none, use git tag to set version
---
.gitignore | 3 +++
setup.cfg | 3 +++
setup.py | 7 +++----
3 files changed, 9 insertions(+), 4 deletions(-)
create mode 100644 setup.cfg
diff --git a/.gitignore b/.gitignore
index 0d20b64..ce6cc88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
*.pyc
+.*.un~
+.DS_Store
+.idea
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..bece2cf
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,3 @@
+[options]
+setup_requires =
+ setuptools_scm
diff --git a/setup.py b/setup.py
index 2ed24b3..c851d77 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,11 @@
from setuptools import setup
-from ess import __version__
setup(
name="ESS Python Tools",
- version=__version__,
+ use_scm_version=True,
description="ESS Related Tools for Python",
url="http://ess-bp.pages.esss.lu.se/ess-python-tools",
+ license="MIT license",
author="Yngve Levinsen",
author_email="yngve.levinsen@esss.se",
install_requires=["scipy", "numpy", "matplotlib"],
@@ -18,8 +18,7 @@ setup(
# Indicate who your project is intended for
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering :: Physics",
- # Pick your license as you wish (should match "license" above)
- "License :: Other/Proprietary License",
+ "License :: OSI Approved :: MIT License",
# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
"Programming Language :: Python :: 3.6",
--
GitLab