Skip to content

Commit

Permalink
Merge pull request openedx#58 from edx/bexline/fix_packages
Browse files Browse the repository at this point in the history
ENT-191 Fix package listing in setup.py to avoid import errors
  • Loading branch information
brittneyexline authored Mar 1, 2017
2 parents d872e9d + 9c4f782 commit ca0c0f8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ Change Log
Unreleased
----------

[0.26.2] - 2017-03-02
---------------------

* Fixed package listing in setup.py to avoid import errors when using as a library

[0.26.1] - 2017-02-28
---------------------

Expand Down
2 changes: 1 addition & 1 deletion enterprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

from __future__ import absolute_import, unicode_literals

__version__ = "0.26.1"
__version__ = "0.26.2"

default_app_config = "enterprise.apps.EnterpriseConfig" # pylint: disable=invalid-name
2 changes: 1 addition & 1 deletion enterprise/conf/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-28 12:39-0600\n"
"POT-Creation-Date: 2017-03-01 15:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion enterprise/conf/locale/en/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-28 12:39-0600\n"
"POT-Creation-Date: 2017-03-01 15:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def get_version(*file_paths):
url="https://github.com/edx/edx-enterprise",
packages=[
"enterprise",
"integrated_channels",
"integrated_channels.integrated_channel",
"integrated_channels.sap_success_factors",
],
Expand Down

0 comments on commit ca0c0f8

Please sign in to comment.