Skip to content

Commit

Permalink
ENT-2208 Remove tincan from src (#546)
Browse files Browse the repository at this point in the history
* ENT-2208 Remove tincan from src

* Fix xvfb

* Remove AUTHORS

* Remove AUTHORS step from PR template
  • Loading branch information
crice100 authored Aug 15, 2019
1 parent bb09fbc commit 0eda44d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 39 deletions.
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ instructions.
- [ ] Documentation updated (not only docstrings)
- [ ] Commits are (reasonably) squashed
- [ ] Translations are updated
- [ ] PR author is listed in AUTHORS

**Post merge:**
- [ ] Create a tag
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ python:
env:
- TOXENV=master

services:
- xvfb

matrix:
include:
- python: 3.6
Expand All @@ -27,8 +30,6 @@ matrix:
- export PATH=$PATH:$PWD/geckodriver
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
addons:
firefox: "49.0.2"
- python: 2.7
Expand Down
28 changes: 0 additions & 28 deletions AUTHORS

This file was deleted.

16 changes: 10 additions & 6 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Change Log
==========

..
All enhancements and patches to edx-enteprise will be documented
All enhancements and patches to edx-enterprise will be documented
in this file. It adheres to the structure of http://keepachangelog.com/ ,
but in reStructuredText instead of Markdown (for ease of incorporation into
Sphinx documentation and the PyPI description).
Expand All @@ -14,12 +14,16 @@ Change Log
Unreleased
----------

[1.8.9] - 2019-08-15
--------------------

* Remove tincan from src directory

[1.8.8] - 2019-08-01
--------------------

* For CornerstoneCourseListAPI handled corner cases for default values.


[1.8.7] - 2019-07-31
--------------------

Expand Down Expand Up @@ -59,7 +63,7 @@ Unreleased
[1.8.0] - 2019-07-22
--------------------

* Replce edx-rbac jwt utils with edx-drf-extensions jwt utils
* Replace edx-rbac jwt utils with edx-drf-extensions jwt utils

[1.7.3] - 2019-07-19
--------------------
Expand Down Expand Up @@ -418,7 +422,7 @@ Unreleased
[1.2.3] - 2019-01-10
---------------------

* Add managemenet command "unlink_inactive_sap_learners" to unlink inactive SAP learners from the related enterprises
* Add management command "unlink_inactive_sap_learners" to unlink inactive SAP learners from the related enterprises

[1.2.2] - 2019-01-09
---------------------
Expand Down Expand Up @@ -1027,7 +1031,7 @@ Unreleased
[0.53.11] - 2017-11-06
----------------------

* Removing SAP_USE_ENTERPRISE_ENROLLMENT_PAGE switch via django waffle and use landing page URL instead of track slection page.
* Removing SAP_USE_ENTERPRISE_ENROLLMENT_PAGE switch via django waffle and use landing page URL instead of track selection page.

[0.53.10] - 2017-11-02
----------------------
Expand Down Expand Up @@ -1175,7 +1179,7 @@ Unreleased
---------------------

* Improved robustness for `force_fresh_session` decorator in conjunction with `enterprise_login_required`
* Conciously avoid attempting to sync back details for SAPSF users who aren't linked via SSO
* Consciously avoid attempting to sync back details for SAPSF users who aren't linked via SSO

[0.50.0] - 2017-10-03
---------------------
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__ = "1.8.8"
__version__ = "1.8.9"

default_app_config = "enterprise.apps.EnterpriseConfig" # pylint: disable=invalid-name
1 change: 0 additions & 1 deletion src/tincan
Submodule tincan deleted from 92a972

0 comments on commit 0eda44d

Please sign in to comment.