Skip to content

Commit a0d6853

Browse files
Merge pull request #38 from Axelrod-Python/cleanup
Cleanup - preparation for release
2 parents 5965de5 + ab892a6 commit a0d6853

File tree

6 files changed

+9
-40
lines changed

6 files changed

+9
-40
lines changed

.bumpversion.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ tag = True
77

88
[bumpversion:file:README.rst]
99

10-
[bumpversion:file:docs/conf.py]
11-
1210
[bumpversion:file:src/axelrod_fortran/__init__.py]
1311

AUTHORS.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

CHANGELOG.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Changelog
32
=========
43

LICENSE

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
MIT License
22

3-
Copyright (c) 2017, Owen Campbell
3+
Copyright (c) 2017 The Axelrod-Python project team members listed at
4+
https://github.com/Axelrod-Python/Axelrod/graphs/contributors
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
67

78
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
89

9-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
10+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ include .coveragerc
99
include .cookiecutterrc
1010
include .editorconfig
1111

12-
include AUTHORS.rst
1312
include CHANGELOG.rst
1413
include CONTRIBUTING.rst
1514
include LICENSE

setup.py

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,25 @@ def read(*names, **kwargs):
2525
).read()
2626

2727

28-
# Enable code coverage for C code: we can't use CFLAGS=-coverage in tox.ini, since that may mess with compiling
29-
# dependencies (e.g. numpy). Therefore we set SETUPPY_CFLAGS=-coverage in tox.ini and copy it to CFLAGS here (after
30-
# deps have been safely installed).
31-
if 'TOXENV' in os.environ and 'SETUPPY_CFLAGS' in os.environ:
32-
os.environ['CFLAGS'] = os.environ['SETUPPY_CFLAGS']
33-
3428
setup(
3529
name='axelrod-fortran',
3630
version='0.1.0',
3731
license='MIT license',
3832
description='Python wrapper for strategies originally written in Fortran',
3933
long_description='%s\n%s' % (
40-
re.compile('^.. start-badges.*^.. end-badges', re.M | re.S).sub('', read('README.rst')),
34+
re.compile('^.. start-badges.*^.. end-badges', re.M | re.S).sub(
35+
'', read('README.rst')),
4136
re.sub(':[a-z]+:`~?(.*?)`', r'``\1``', read('CHANGELOG.rst'))
4237
),
43-
author='Owen Campbell',
44-
author_email='[email protected]',
45-
url='https://github.com/meatballs/axelrod-fortran',
38+
author='Owen Campbell, Vincent Knight, Marc Harper',
39+
author_email=('[email protected]'),
40+
url='https://github.com/axelrod-python/axelrod-fortran',
4641
packages=find_packages('src'),
4742
package_dir={'': 'src'},
4843
py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')],
4944
include_package_data=True,
5045
zip_safe=False,
5146
classifiers=[
52-
# complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
53-
'Development Status :: 5 - Production/Stable',
5447
'Intended Audience :: Developers',
5548
'License :: OSI Approved :: MIT License',
5649
'Operating System :: Unix',
@@ -60,24 +53,8 @@ def read(*names, **kwargs):
6053
'Programming Language :: Python :: Implementation :: CPython',
6154
'Topic :: Utilities',
6255
],
63-
keywords=[
64-
# eg: 'keyword1', 'keyword2', 'keyword3',
65-
],
6656
install_requires=[
6757
'axelrod == 3.1.2',
6858
],
69-
extras_require={
70-
# eg:
71-
# 'rst': ['docutils>=0.11'],
72-
# ':python_version=="2.6"': ['argparse'],
73-
},
74-
ext_modules=[
75-
Extension(
76-
splitext(relpath(path, 'src').replace(os.sep, '.'))[0],
77-
sources=[path],
78-
include_dirs=[dirname(path)]
79-
)
80-
for root, _, _ in os.walk('src')
81-
for path in glob(join(root, '*.c'))
82-
],
59+
python_requires=">=3.6",
8360
)

0 commit comments

Comments
 (0)