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.

Sign up for GitHub

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

Jump to bottom

Include docs in sdist and add Makefile for common build, dev, test #4565

Merged
merged 6 commits into from
Oct 12, 2015
Merged

Include docs in sdist and add Makefile for common build, dev, test #4565

merged 6 commits into from
Oct 12, 2015

Conversation

benjaoming
Copy link
Contributor

Taking over from #4526

Change affecting 0.15 release

Docs are included in the sdist and built automatically by running make sdist.

PR for #4348 (partly) and #4375

Change affecting build process

The PyPi and .deb for 0.15 will be released by using a new Makefile. Yay!
#4459

Makefile does this:

➜  ka-lite git:(makefile-dist-docs) make help
clean - remove all build, test, coverage and Python artifacts
clean-build - remove build artifacts
clean-pyc - remove Python file artifacts
clean-test - remove test and coverage artifacts
lint - check style with pep8
test - run tests the default Python
test-bdd - run BDD tests only
test-nobdd - run non-BDD tests only
assets - build all JS/CSS assets
coverage - check code coverage quickly with the default Python
docs - generate Sphinx HTML documentation, including API docs
release - package and upload a release
dist - package locally
install - install the package to the active Python's site-packages

@benjaoming
Copy link
Contributor Author

Still creating the same weird weird pkg_resources.DistributionNotFound: ka-lite==0.15.0

@MCGallaspy
Copy link
Contributor

Can you rebase against 0.15.x?

MCGallaspy
MCGallaspy reviewed Oct 12, 2015
View reviewed changes
kalite/distributed/features/steps/content_rating.py
except (NoSuchElementException, StaleElementReferenceException):
return False

WebDriverWait(context.browser, 10).until(rate_element)
rating_el = WebDriverWait(context.browser, 10).until(get_rating_el)
rating_el.click()

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@benjaoming
Copy link
Contributor Author

Hmm, not so nice, sorry about that, I wanted to squash everything into one commit, but perhaps in doing that, I failed to update properly. Will have a look....

@benjaoming
Copy link
Contributor Author

@MCGallaspy thanks for checking this!

MCGallaspy
MCGallaspy reviewed Oct 12, 2015
View reviewed changes
setup.py
@@ -162,6 +171,11 @@ def gen_data_files(*dirs):
gen_data_files('static-libraries')
)

data_files += map(
lambda x: (os.path.join(kalite.ROOT_DATA_PATH, x[0]), x[1]),
gen_data_files('docs/_build/html', optional=True)

This comment was marked as spam.

Sign in to view

@benjaoming benjaoming mentioned this pull request Oct 12, 2015
Closed
MCGallaspy added a commit that referenced this pull request Oct 12, 2015
@MCGallaspy
Merge pull request #4565 from benjaoming/makefile-dist-docs
583743c 
Include docs in sdist and add Makefile for common build, dev, test
@MCGallaspy MCGallaspy merged commit 583743c into learningequality:0.15.x Oct 12, 2015
@MCGallaspy MCGallaspy removed the has PR label Oct 12, 2015
@benjaoming benjaoming deleted the makefile-dist-docs branch October 20, 2015 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@benjaoming @MCGallaspy