Skip to content
This repository was archived by the owner on Mar 4, 2024. It is now read-only.

Commit 58cc377

Browse files
author
Charles Butler
committed
Cleanup the VERSION file business
I clearly dont know what i'm doing wrong here with the packaging so I'm pulling the VERSION file for now, and instead will have to remember to rev the version id in setup.py as well as docs/source/conf.py small price to pay to unbreak the version living in pypi
1 parent 08fa5c7 commit 58cc377

File tree

5 files changed

+4
-23
lines changed

5 files changed

+4
-23
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include *.md
22
include *.txt
33
include MANIFEST.in
4-
include VERSION
4+

VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/source/conf.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
import sys
1717
import os
1818

19-
version_file = os.path.abspath(
20-
os.path.join(
21-
os.path.dirname(os.path.dirname(__file__)), '..', 'VERSION'))
22-
23-
with open(version_file) as v:
24-
VERSION = v.read().strip()
25-
2619
sys.path.append(os.path.abspath('../../'))
2720
# sys.path.append(os.path.abspath('_extensions/'))
2821

@@ -70,9 +63,9 @@
7063
# built documents.
7164
#
7265
# The short X.Y version.
73-
version = u'0.0.8'
66+
version = u'0.1.1'
7467
# The full version, including alpha/beta/rc tags.
75-
release = u'0.0.8'
68+
release = u'0.1.1'
7669

7770
# The language for content autogenerated by Sphinx. Refer to documentation
7871
# for a list of supported languages.

setup.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
import os
21
from setuptools import setup
32

4-
version_file = os.path.abspath(
5-
os.path.join(
6-
os.path.dirname(os.path.dirname(__file__)), 'VERSION'))
7-
8-
with open(version_file) as v:
9-
VERSION = v.read().strip()
10-
11-
12-
133
setup(
144
name = "charms.docker",
15-
version = VERSION,
5+
version = '0.1.1',
166
author = "Charles Butler",
177
author_email = "charles.butler@ubuntu.com",
188
url = "http://github.com/juju-solutions/charms.docker",

tox.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[tox]
22
envlist = py3
3-
skipsdist = True
43

54
[testenv]
65
install_command = pip install {opts} --pre --use-wheel {packages}

0 commit comments

Comments
 (0)