Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert move to SCM driven version number derived from VCS and back to hard coded version #69

Merged
merged 1 commit into from
Nov 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.2.2] - 2019-10-07
### Fixed
* Reverted the move to using setuptools-scm as it's [not actually meant to be
used in the package code, only in setup.py](/~https://github.com/pypa/setuptools_scm/issues/354#issuecomment-519407730).
setuptools-scm was causing an `LookupError: setuptools-scm was unable to detect version` error

## [2.2.1] - 2019-10-07
### Added
* Mozilla code of conduct
Expand Down Expand Up @@ -89,7 +95,8 @@ contributed!)
* Has a version number. (Yippie!)
* First more-or-less stable version

[Unreleased]: /~https://github.com/mozilla/agithub/compare/v2.2.1...HEAD
[Unreleased]: /~https://github.com/mozilla/agithub/compare/v2.2.2...HEAD
[2.2.2]: /~https://github.com/mozilla/agithub/compare/v2.2.1...v2.2.2
[2.2.1]: /~https://github.com/mozilla/agithub/compare/v2.2.0...v2.2.1
[2.2.0]: /~https://github.com/mozilla/agithub/compare/v2.1...v2.2.0
[2.1]: /~https://github.com/mozilla/agithub/compare/v2.0...v2.1
Expand Down
4 changes: 2 additions & 2 deletions agithub/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2012-2016 Jonathan Paugh and contributors
# See COPYING for license details
from agithub.base import VERSION
from agithub.base import VERSION, STR_VERSION

__all__ = ["VERSION"]
__all__ = ["VERSION", "STR_VERSION"]
6 changes: 3 additions & 3 deletions agithub/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# See COPYING for license details
import json
from functools import partial, update_wrapper
from setuptools_scm import get_version

import sys
if sys.version_info[0:2] > (3, 0):
Expand All @@ -15,13 +14,14 @@
class ConnectionError(OSError):
pass

VERSION = get_version(root='..', relative_to=__file__)
VERSION = [2, 2, 2]
STR_VERSION = 'v' + '.'.join(str(v) for v in VERSION)

# These headers are implicitly included in each request; however, each
# can be explicitly overridden by the client code. (Used in Client
# objects.)
_default_headers = {
'user-agent': 'agithub/' + VERSION,
'user-agent': 'agithub/' + STR_VERSION,
'content-type': 'application/json'
}

Expand Down
5 changes: 5 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0

12 changes: 2 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@
with open(path.join(here, 'README.md')) as f:
long_description = f.read()

test_requirements = ['pytest']

extras = {
"test": test_requirements,
}
version = '2.2.2'

setup(name='agithub',
version=version,
description="A lightweight, transparent syntax for REST clients",
long_description=long_description,
long_description_content_type='text/markdown',
Expand All @@ -32,9 +29,4 @@
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
include_package_data=True,
zip_safe=False,
tests_require=test_requirements,
extras_require=extras,
setup_requires=['setuptools-scm'],
use_scm_version=True,
install_requires=['setuptools-scm'],
)