Skip to content

Commit

Permalink
Merge pull request #6808 from planetf1/jupyterremove
Browse files Browse the repository at this point in the history
odpi/egeria-jupyter-notebooks#4 move jupyter notebooks to new repo
  • Loading branch information
planetf1 committed Aug 18, 2022
2 parents e6683fa + 2361a80 commit ef3ba14
Show file tree
Hide file tree
Showing 96 changed files with 14 additions and 16,527 deletions.
9 changes: 0 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@ updates:
open-pull-requests-limit: 5
reviewers:
- planetf1
- package-ecosystem: docker
directory: "./open-metadata-resources/open-metadata-deployment/docker/jupyter"
schedule:
interval: monthly
time: "03:00"
timezone: "Etc/UTC"
open-pull-requests-limit: 5
reviewers:
- planetf1
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/merge-maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,6 @@ jobs:
tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:latest, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:latest
context: ./open-metadata-resources/open-metadata-deployment/docker/configure
platforms: linux/amd64,linux/arm64
# Publish container images(jupyter) to quay.io and docker.io
- name: Copy the deploy content to be used in docker copy command
if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}}
run: |
mkdir -p ./open-metadata-resources/open-metadata-deployment/docker/jupyter/target/assembly
cp -r open-metadata-distribution/open-metadata-assemblies/target/egeria-${{ env.VERSION }}-deploy/egeria-deploy-${{ env.VERSION }}/. open-metadata-resources/open-metadata-deployment/docker/jupyter/target/assembly
- name: Build and push(jupyter) to quay.io and docker.io
if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}}
uses: docker/build-push-action@v3
with:
push: true
tags: odpi/jupyter:${{ env.VERSION }}, odpi/jupyter:latest, quay.io/odpi/jupyter:${{ env.VERSION }}, quay.io/odpi/jupyter:latest
context: ./open-metadata-resources/open-metadata-deployment/docker/jupyter
platforms: linux/amd64,linux/arm64
# --
# Mostly for verification - not published to the release itself for now
- name: Upload assemblies
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,6 @@ jobs:
tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:latest, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:latest
context: ./open-metadata-resources/open-metadata-deployment/docker/configure
platforms: linux/amd64,linux/arm64
# Publish container images(jupyter) to quay.io and docker.io
- name: Copy the deploy content to be used in docker copy command
run: |
mkdir -p ./open-metadata-resources/open-metadata-deployment/docker/jupyter/target/assembly
cp -r open-metadata-distribution/open-metadata-assemblies/target/egeria-${{ env.VERSION }}-deploy/egeria-deploy-${{ env.VERSION }}/. open-metadata-resources/open-metadata-deployment/docker/jupyter/target/assembly
- name: Build and push(jupyter) to quay.io and docker.io
uses: docker/build-push-action@v3
with:
push: true
tags: odpi/jupyter:${{ env.VERSION }}, odpi/jupyter:latest, quay.io/odpi/jupyter:${{ env.VERSION }}, quay.io/odpi/jupyter:latest
context: ./open-metadata-resources/open-metadata-deployment/docker/jupyter
platforms: linux/amd64,linux/arm64

# Mostly for verification - not published to the release itself for now
- name: Upload assemblies
uses: actions/upload-artifact@v3
Expand Down
1 change: 0 additions & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ open-metadata-resources/open-metadata-samples/ @mandy-chessell
open-metadata-resources/open-metadata-samples/postman-rest-samples/ @planetf1
open-metadata-resources/open-metadata-samples/access-services-samples/subject-area-client-samples/ @davidradl

open-metadata-resources/open-metadata-labs/ @mandy-chessell @planetf1
# Test

open-metadata-test/ @mandy-chessell
Expand Down
3 changes: 1 addition & 2 deletions Content-Organization.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ The Egeria core repository contains the core Egeria functionality, and is organi
* **[open-metadata-resources](open-metadata-resources)** - contains the open metadata demos and samples.
* **[open-metadata-archives](open-metadata-resources/open-metadata-archives)** - contains pre-canned collections of metadata for loading into an open metadata server.
* **[open-metadata-deployment](open-metadata-resources/open-metadata-deployment)** - contains resources for deploying Egeria and related technology.
* **[open-metadata-labs](open-metadata-resources/open-metadata-labs)** - contains Jupyter Notebooks to guide you through using Egeria.
* **[open-metadata-samples](open-metadata-resources/open-metadata-samples)** - contains coding samples for Egeria APIs.

* **[open-metadata-test](open-metadata-test)** - supports additional test cases beyond unit test.
Expand All @@ -143,4 +142,4 @@ documented demonstrations, and so on at https://github.com/odpi/egeria-samples

----
License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
Copyright Contributors to the ODPi Egeria project.
Copyright Contributors to the ODPi Egeria project.
2 changes: 1 addition & 1 deletion developer-resources/Developer-Guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ If you deliver a connector that is covered by this test suite, you should run th
merging changes into master. The conformance test suite is also
run as part of the release process.

Egeria's [hands on labs](../open-metadata-resources/open-metadata-labs)
Egeria's hands on labs
provide a complex multiserver environment and are typically used
by contributors to verify that their changes have not regressed any of the
basic function.
Expand Down
6 changes: 3 additions & 3 deletions developer-resources/languages/Python.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Python is an interpreted programming language. It is favored by
data scientists and script writers because it supports writing in snippets
where variables can be created on the fly and are typically global.

Egeria uses python in the [Hands-On Labs](../../open-metadata-resources/open-metadata-labs)
since it is the native language of the [Jupyter Notebooks](../tools/Jupyter-Notebooks.md).
Egeria uses python in the [Hands-On Labs](https://egeria-project.org/education/open-metadata-labs/overview/)
since it is the native language of the [Jupyter Notebooks](https://egeria-project.org/guides/contributor/runtime/?h=jupyter+notebooks#jupyter-notebooks).


----
* Return to [Programming Languages](.)

----
License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
Copyright Contributors to the ODPi Egeria project.
Copyright Contributors to the ODPi Egeria project.
4 changes: 2 additions & 2 deletions developer-resources/tools/Jupyter-Notebooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Jupyter notebooks to provide an interactive environment for running snippets of python code, interspersed
with [Markdown](Markdown.md) documentation.

This is an example of a Jupyter notebook from the [Open Metadata Labs](../../open-metadata-resources/open-metadata-labs).
This is an example of a Jupyter notebook from the [Open Metadata Labs](https://egeria-project.org/education/open-metadata-labs/overview/).

![Jupyter notebook](jupyter-notebook-browser-window.png#pagewidth)

Expand All @@ -25,4 +25,4 @@ through the **Anaconda Navigator** desktop. It can be downloaded from the follo

----
License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
Copyright Contributors to the ODPi Egeria project.
Copyright Contributors to the ODPi Egeria project.
6 changes: 3 additions & 3 deletions developer-resources/tools/Markdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

Markdown is a simple tagging language that generates HTML webpages.
We use it for documentation (this page is written in markdown for example), in GitHub comments and
in the [Jupyter Notebooks](Jupyter-Notebooks.md) that form the teaching material for the
[Hand-on Labs](../../open-metadata-resources/open-metadata-labs).
in the Jupyter Notebooks that form the teaching material for the
[Hand-on Labs](https://egeria-project.org/education/open-metadata-labs/overview/).

This summary for markdown is very useful
* [Markdown Syntax (from GitHub)](https://guides.github.com/pdfs/markdown-cheatsheet-online.pdf)
Expand Down Expand Up @@ -37,4 +37,4 @@ Now you see the same README.md formatted using the website styling.

----
License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
Copyright Contributors to the ODPi Egeria project.
Copyright Contributors to the ODPi Egeria project.
2 changes: 1 addition & 1 deletion developer-resources/tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This documentation has moved to [https://odpi.github.io/egeria-docs](https://odp
* [Gradle (to build Egeria)](Gradle.md)
* [HTTPie and curl](HTTPie-Curl.md) - Command line tools for issuing REST API calls
* [IntelliJ](IntelliJ.md) - Developer tool for working with the egeria content
* [Jupyter Notebooks](Jupyter-Notebooks.md) - Interactive python environment used in the hands on labs
* [Jupyter Notebooks](https://egeria-project.org/education/open-metadata-labs/overview/) - Interactive python environment used in the hands on labs
* [Kubernetes](Kubernetes.md) - Orchestrating container environment - useful for production operation and hands-on labs
* [Markdown](Markdown.md) - Website/document tagging language for documentation
* [Maven](Maven.md) - Build management
Expand Down
23 changes: 1 addition & 22 deletions open-metadata-distribution/open-metadata-assemblies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -190,24 +190,6 @@ distributions {
}
}
}
deploy {
//distributionBaseName = "${rootProject.name}-deploy"
contents {
into('notebooks') {
from("${project(':open-metadata-resources:open-metadata-labs').projectDir}")
exclude 'pom.xml'
exclude '*.iml'
exclude '.classpath'
exclude '.project'
exclude '.settings/**'
exclude '.ipynb_checkpoints/**'
exclude '**/target/**'
exclude '**/build/**'
exclude 'build.gradle'
fileMode = 0755
}
}
}
}
// Override the distribution filenames to match what we use with maven (replaces baseName above)
egeriaomagDistTar.compression = Compression.GZIP
Expand All @@ -216,10 +198,7 @@ egeriaomagDistTar.archiveFileName = (rootProject.name + '-' + rootProject.versio
egeriaomagDistZip.enabled=false // TODO: does not seem to work

// Ditto for the deploy distribution
deployDistTar.compression = Compression.GZIP
//deployDistTar.archiveExtension = 'tar.gz'
deployDistTar.archiveFileName = (rootProject.name + '-' + rootProject.version + '-deploy.tar.gz')
deployDistZip.enabled=false // TODO: does not seem to work


task unzip(type: Copy) {
String zipFile = "${project.buildDir}/distributions/${rootProject.name}-${rootProject.version}-distribution.tar.gz"
Expand Down
2 changes: 0 additions & 2 deletions open-metadata-distribution/open-metadata-assemblies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@
<artifactId>egeria</artifactId>
</dependency-->

<!-- Deployment assembly needs some artifacts, but currently they are only pulled from source, so no binary dependency -->
</dependencies>

<build>
Expand All @@ -383,7 +382,6 @@
<configuration>
<descriptors>
<descriptor>src/main/assemblies/egeria-omag.xml</descriptor>
<descriptor>src/main/assemblies/egeria-deploy.xml</descriptor>
</descriptors>
<finalName>egeria-${open-metadata.version}</finalName>
<attach>true</attach>
Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions open-metadata-resources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ deployment configurations of Egeria and other integrated technology.
* **[open-metadata-samples](open-metadata-samples)** - provides samples of
different types of plugin components.

* **[open-metadata-labs](open-metadata-labs)** - provides interactive hands on examples of using Egeria.


----
* Return to [Site Map](../Content-Organization.md)
* Return to [Home Page](../index.md)
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit ef3ba14

Please sign in to comment.