Skip to content
This repository was archived by the owner on Jun 13, 2023. It is now read-only.

Commit dfdeb13

Browse files
authored
revert pbr related changes and use python-semantic-release instead (#5)
sem-ver: bugfix
1 parent 5f09c6a commit dfdeb13

6 files changed

Lines changed: 68 additions & 49 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ dist
88
.pytest_cache
99
build
1010
epsagon.egg-info
11-
publish.sh
1211
.tox

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ before_script:
1010
- "pylint --msg-template='{path}:{line}: [{msg_id}({symbol}) {obj}] {msg}' epsagon/"
1111
script:
1212
- tox
13+
1314
deploy:
14-
provider: pypi
15-
user: epsagon
16-
skip_existing: true
17-
password:
18-
secure: vO6RcTUnTuAfuQ7Wn5R+3hHjDXmCYOr2W7WJxSkf1tbL6hzlrpZY5cQITBSHkPWClQ9Q/Ee9QBeaPxQ4zPiWVBVQmLW6M6maBL12dERH/f+yoH+FHMD3VFEqN+7kR0/rYNP9OL8OTjBxiccvk/afRo7zc7Dixvwa2zeXfHzca86vlNQi++zaem8VChX3s/3WkMzc+d7lgJc5UikTRHwaFj1s6txp2OhVWKNEFAwsCVk4EaEtl49Tv3BsZBI9POPsLsPRjFwLHqWxiWmTP36+exrkQgvn66OXeV4toRgUdaXZakkQCa864goeEigjyNjxwTqJlCGtv3FY2fhEh3s5ges9fxUGbYi58Zl2cxo0vj1b08Qz55Figm5usIFi6U7bKK5p8Cxuz41jG94jU4UJWzQrqx+KTcuORQjYQ4EtoVtzrEXO5V5RJKegQ4BrRod5FPfv5NxbSLGhAxzHAtJx1o/DupppELyk3u7lY1rV2ruwSAx/h70cv9LDvjYz3N4M/9bE9KWeo1nNtMiAF0Qem6UNuxuQtvShvU9mGZzxj7BQ376bwyIzuY5Ql9li8BUhMy+jMLVAA183oYA1HXIyEtMCiWcC9mvIiNIMIrbu4Cp+cOXqzgE1WUIxNCRvAeNsxYlgkbOzJ7nBGefuiuskLwcEde5KA83kB82X9dCrXJA=
15+
provider: script
16+
script: bash scripts/publish.sh
17+
edge: true
1918
on:
20-
tags: true
19+
branch: master

epsagon/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import os
44

5-
__version__ = '1.0.2'
5+
__version__ = '1.0.3'
66

77
DEFAULT_REGION = 'us-east-1'
88
REGION = os.environ.get('AWS_REGION', DEFAULT_REGION)

scripts/publish.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
git config --global user.name "semantic-release (via TravisCI)"
2+
git config --global user.email "semantic-release@travis"
3+
pip install python-semantic-release
4+
semantic-release publish

setup.cfg

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,6 @@ test=pytest
44
[flake8]
55
max-line-length = 80
66

7-
[metadata]
8-
name = epsagon
9-
author = Epsagon
10-
author-email = [email protected]
11-
summary = Epsagon's Python instrumentation library
12-
description-file = README.md
13-
description-content-type = text; charset=UTF-8
14-
home-page = https://epsagon.com
15-
project_urls =
16-
Documentation = https://docs.epsagon.com
17-
Source Code = https://github.com/epsagon/epsagon-python
18-
license = MIT
19-
classifier =
20-
Intended Audience :: Developers
21-
Operating System :: OS Independent
22-
Programming Language :: Python
23-
Programming Language :: Python :: 2.7
24-
Programming Language :: Python :: 3
25-
Programming Language :: Python :: 3.4
26-
Programming Language :: Python :: 3.5
27-
Programming Language :: Python :: 3.6
28-
Topic :: Software Development :: Libraries
29-
Topic :: Software Development :: Libraries :: Python Modules
30-
keywords =
31-
serverless
32-
epsagon
33-
tracing
34-
distributed-tracing
35-
lambda
36-
aws-lambda
37-
debugging
38-
monitoring
39-
40-
[files]
41-
packages =
42-
epsagon
43-
data_files =
44-
7+
[semantic_release]
8+
version_variable = epsagon/constants.py:__version__
9+
patch_without_tag = true

setup.py

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,58 @@
1-
from setuptools import setup
1+
#!/usr/bin/env python
2+
import re
3+
import os
4+
from setuptools import setup, find_packages
5+
6+
try:
7+
# For pip >= 10.
8+
from pip._internal.req import parse_requirements
9+
from pip._internal.download import PipSession
10+
except ImportError:
11+
# For pip <= 9.0.3.
12+
from pip.req import parse_requirements
13+
from pip.download import PipSession
14+
15+
install_reqs = parse_requirements('./requirements.txt', session=PipSession())
16+
reqs = [str(ir.req) for ir in install_reqs]
17+
18+
# Get version
19+
with open(os.path.join('epsagon', 'constants.py'), 'rt') as consts_file:
20+
version = re.search(r'__version__ = \'(.*?)\'', consts_file.read()).group(1)
221

322
setup(
4-
setup_requires=['pbr'],
5-
pbr=True
23+
name='epsagon',
24+
version=version,
25+
description='Epsagon Instrumentation for Python',
26+
long_description=open('README.md').read(),
27+
long_description_content_type='text/markdown',
28+
author='Epsagon',
29+
author_email='[email protected]',
30+
url='https://github.com/epsagon/epsagon-python',
31+
packages=find_packages(exclude=('tests', 'examples')),
32+
install_requires=reqs,
33+
license='MIT',
34+
setup_requires=['pytest-runner'],
35+
tests_require=['pytest'],
36+
keywords=[
37+
'serverless',
38+
'epsagon',
39+
'tracing',
40+
'distributed-tracing',
41+
'lambda',
42+
'aws-lambda',
43+
'debugging',
44+
'monitoring'
45+
],
46+
classifiers=(
47+
'Intended Audience :: Developers',
48+
'Operating System :: OS Independent',
49+
'Programming Language :: Python',
50+
'Programming Language :: Python :: 2.7',
51+
'Programming Language :: Python :: 3',
52+
'Programming Language :: Python :: 3.4',
53+
'Programming Language :: Python :: 3.5',
54+
'Programming Language :: Python :: 3.6',
55+
'Topic :: Software Development :: Libraries',
56+
'Topic :: Software Development :: Libraries :: Python Modules',
57+
)
658
)

0 commit comments

Comments
 (0)