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

Add TeamCity integration #33

Merged
merged 34 commits into from
Dec 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ae7edf7
Refactor gradle tasks and ignore failing test.
ileasile Dec 9, 2019
5c81561
Add conda build
ileasile Dec 11, 2019
2805576
Add conda package and upload, fix test
ileasile Dec 11, 2019
e0d6fc5
Refactored build.gradle
ileasile Dec 11, 2019
1bb9256
Use build.number from TC
ileasile Dec 11, 2019
6e9c033
Added conda login task
ileasile Dec 12, 2019
9715838
Added protected upload task
ileasile Dec 12, 2019
9a17b96
Fix protected upload task
ileasile Dec 12, 2019
d6bbdae
Removed Travis integration
ileasile Dec 12, 2019
dc62314
Disable autodeploy to master by default
ileasile Dec 12, 2019
b1a2d7d
Remove newline
ileasile Dec 12, 2019
269193c
PyPi set up
ileasile Dec 16, 2019
6aa1a63
Added test conda config and finalized build settings
ileasile Dec 17, 2019
8aa7812
Deploy automatically only on protected branches to dev
ileasile Dec 17, 2019
a85a257
Versioning improvements
ileasile Dec 17, 2019
df7c085
Added artifact usage
ileasile Dec 17, 2019
2580356
Fixed obtaining of build number and counter
ileasile Dec 17, 2019
96d2b20
Don't rebuild on TC upload build
ileasile Dec 18, 2019
1d04e63
Renamed build_branch => build.branch
ileasile Dec 18, 2019
920672c
Got rid of template substitution and reduced code duplication
ileasile Dec 19, 2019
07b4916
Minor .gitignore prettifying
ileasile Dec 19, 2019
9971320
Refactoring of gradle.build
ileasile Dec 19, 2019
bf836fe
Upload only fixed file name
ileasile Dec 19, 2019
2a745bb
More refactoring was applied
ileasile Dec 20, 2019
2b42d48
Catch Keyboard interrupt to avoid stacktrace on cancelling Jupyter
ileasile Dec 20, 2019
45aa58c
Added info about packages to README
ileasile Dec 20, 2019
f065ea2
Refactored and deleted unneeded files
ileasile Dec 22, 2019
1a2dc41
Refactored initial params setting
ileasile Dec 23, 2019
ff6c3b9
Refactored gradle structure
ileasile Dec 23, 2019
71e8e2c
Merge branch 'master' into add_teamcity_integration
ileasile Dec 23, 2019
b981c19
Fix post-merge issues
ileasile Dec 23, 2019
2190944
Fix post-merge issues
ileasile Dec 23, 2019
e53e1c0
Post-review fixes
ileasile Dec 24, 2019
687caf9
Move package version up
ileasile Dec 24, 2019
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.idea/
out/
build/
distrib-build/
artifacts/
.gradle/
*.iml
**/.ipynb*
Expand Down
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

22 changes: 17 additions & 5 deletions readme.md → README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[![Build Status](https://travis-ci.com/Kotlin/kotlin-jupyter.svg?branch=master)](https://travis-ci.com/Kotlin/kotlin-jupyter) <br/>
[![PyPI](https://img.shields.io/pypi/v/kotlin-jupyter-kernel?label=PyPi)](https://pypi.org/project/kotlin-jupyter-kernel/)
[![Anaconda](https://img.shields.io/conda/v/jetbrains/kotlin-jupyter-kernel?label=Anaconda)](https://anaconda.org/jetbrains/kotlin-jupyter-kernel)
[![GitHub](https://img.shields.io/github/license/Kotlin/kotlin-jupyter)](https://www.apache.org/licenses/LICENSE-2.0)

# Kotlin kernel for IPython/Jupyter

Expand All @@ -18,11 +20,21 @@ Try samples online: [![Binder](https://mybinder.org/badge_logo.svg)](https://myb

There are two ways to install kernel:

### Conda package
### Conda/PyPi packages

If you have `conda` installed, just run:
If you have `conda` installed, just run the following command to install stable package version:

`conda install kotlin-jupyter-kernel -c jetbrains`
`conda install -c jetbrains kotlin-jupyter-kernel` ([package home](https://anaconda.org/jetbrains/kotlin-jupyter-kernel))

To install conda package from the dev channel:

`conda install -c jetbrains-dev kotlin-jupyter-kernel` ([package home](https://anaconda.org/jetbrains-dev/kotlin-jupyter-kernel))

You can also install this package through `pip` (stable and dev channels accordingly):

`pip install kotlin-jupyter-kernel` ([package home](https://pypi.org/project/kotlin-jupyter-kernel/))

`pip install -i https://test.pypi.org/simple/ kotlin-jupyter-kernel` ([package home](https://test.pypi.org/project/kotlin-jupyter-kernel/))

### From sources

Expand Down Expand Up @@ -165,4 +177,4 @@ If a library descriptor with the same name is found in several locations, the fo
2. ['libraries'](libraries) folder at the latest master branch of `https://github.com/Kotlin/kotlin-jupyter` repository
3. Kernel installation directory

If you don't want some library to be updated automatically, put fixed version of its library descriptor into local settings folder.
If you don't want some library to be updated automatically, put fixed version of its library descriptor into local settings folder.
Loading