Skip to content

Commit bff82bd

Browse files
authored
Merge pull request #79 from MJedr/gh-action-fix
release 0.7.6
2 parents 8f4a8c2 + 000f957 commit bff82bd

File tree

3 files changed

+56
-57
lines changed

3 files changed

+56
-57
lines changed

.github/workflows/build-and-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Build and release
33
on:
44
push:
55
branches: [master]
6+
tags:
7+
- "*"
68
pull_request:
79
branches: [master]
810

json_merger/version.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,4 @@
3030

3131
from __future__ import absolute_import, print_function
3232

33-
from autosemver.packaging import get_current_version
34-
35-
__version__ = get_current_version(project_name="json-merger")
33+
__version__ = "0.7.6"

setup.py

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -24,91 +24,90 @@
2424

2525
"""Python module that is able to merge json record objects."""
2626

27+
import os
2728
import sys
2829

2930
from setuptools import find_packages, setup
3031

31-
readme = open("README.rst").read()
32-
history = open("CHANGES.rst").read()
33-
34-
35-
url = "https://github.com/inveniosoftware-contrib/json-merger"
36-
32+
readme = open('README.rst').read()
33+
history = open('CHANGES.rst').read()
3734

3835
tests_require = [
39-
"check-manifest>=0.25",
40-
"coverage>=4.0",
41-
"isort>=4.2.2",
42-
"pydocstyle>=1.0.0",
43-
"pytest-cache>=1.0",
44-
"pytest-cov>=1.8.0",
45-
"pytest>=4.6.11",
46-
"flake8>=3.9.0",
36+
'check-manifest>=0.25',
37+
'coverage>=4.0',
38+
'isort>=4.2.2',
39+
'pydocstyle>=1.0.0',
40+
'pytest-cache>=1.0',
41+
'pytest-cov>=1.8.0',
42+
'pytest>=4.6.11',
43+
'flake8>=3.9.0',
4744
]
4845

4946
contrib_require = [
50-
"editdistance>=0.3.1",
51-
"munkres<=1.0.12",
52-
"Unidecode==0.4.19" if sys.version_info < (3, 6) else "Unidecode>=0.4.19",
47+
'editdistance>=0.3.1',
48+
'munkres<=1.0.12',
49+
'Unidecode==0.4.19' if sys.version_info < (3, 6) else 'Unidecode>=0.4.19'
5350
]
5451

5552
tests_require += contrib_require
5653

5754
extras_require = {
58-
"contrib": contrib_require,
59-
"docs": [
60-
"Sphinx>=1.4.2",
55+
'contrib': contrib_require,
56+
'docs': [
57+
'Sphinx>=1.4.2',
6158
],
62-
"tests": tests_require,
59+
'tests': tests_require
6360
}
6461

65-
extras_require["all"] = []
62+
extras_require['all'] = []
6663
for reqs in extras_require.values():
67-
extras_require["all"].extend(reqs)
64+
extras_require['all'].extend(reqs)
6865

6966
install_requires = [
70-
"autosemver==0.5.5",
71-
"dictdiffer==0.8.1" if sys.version_info < (3, 6) else "dictdiffer>=0.6.0",
72-
"six>=1.10.0",
73-
"pyrsistent>=0.11.13",
74-
]
75-
76-
setup_requires = [
77-
"autosemver==0.5.5",
67+
'dictdiffer==0.8.1' if sys.version_info < (3, 6) else 'dictdiffer>=0.6.0',
68+
'six>=1.10.0',
69+
'pyrsistent>=0.11.13'
7870
]
7971

8072
packages = find_packages()
8173

74+
75+
# Get the version string. Cannot be done with import!
76+
g = {}
77+
with open(os.path.join('json_merger', 'version.py'), 'rt') as fp:
78+
exec(fp.read(), g)
79+
version = g['__version__']
80+
8281
setup(
83-
name="json-merger",
84-
autosemver=True,
82+
name='json-merger',
83+
version=version,
8584
description=__doc__,
86-
long_description=readme + "\n\n" + history,
87-
keywords="JSON patch merge conflict",
88-
license="GPLv2",
89-
author="CERN",
90-
author_email="[email protected]",
91-
url=url,
85+
long_description=readme + '\n\n' + history,
86+
keywords='JSON patch merge conflict',
87+
license='GPLv2',
88+
author='CERN',
89+
author_email='[email protected]',
90+
url='https://github.com/inveniosoftware-contrib/json-merger',
9291
packages=packages,
9392
zip_safe=False,
9493
include_package_data=True,
95-
platforms="any",
96-
entry_points={},
97-
setup_requires=setup_requires,
94+
platforms='any',
95+
entry_points={
96+
},
9897
extras_require=extras_require,
9998
install_requires=install_requires,
10099
classifiers=[
101-
"Environment :: Web Environment",
102-
"Intended Audience :: Developers",
103-
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
104-
"Operating System :: OS Independent",
105-
"Programming Language :: Python",
106-
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
107-
"Topic :: Software Development :: Libraries :: Python Modules",
108-
"Programming Language :: Python :: 2",
109-
"Programming Language :: Python :: 2.7",
110-
"Programming Language :: Python :: 3",
111-
"Programming Language :: Python :: 3.6",
112-
"Development Status :: 4 - Beta",
100+
'Environment :: Web Environment',
101+
'Intended Audience :: Developers',
102+
'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
103+
'Operating System :: OS Independent',
104+
'Programming Language :: Python',
105+
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
106+
'Topic :: Software Development :: Libraries :: Python Modules',
107+
'Programming Language :: Python :: 2',
108+
'Programming Language :: Python :: 2.7',
109+
'Programming Language :: Python :: 3',
110+
'Programming Language :: Python :: 3.6',
111+
'Development Status :: 4 - Beta',
113112
],
114113
)

0 commit comments

Comments
 (0)