From 46f4bce5c4dd8348b65f201e6673a91beef6a976 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Thu, 23 Jun 2022 07:10:51 +0300 Subject: [PATCH 01/22] added build scripts and meta.yaml --- bld.bat | 2 ++ build.sh | 1 + meta.yaml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 bld.bat create mode 100644 build.sh create mode 100644 meta.yaml diff --git a/bld.bat b/bld.bat new file mode 100644 index 000000000..602113031 --- /dev/null +++ b/bld.bat @@ -0,0 +1,2 @@ +"%PYTHON%" setup.py install +if errorlevel 1 exit 1 \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 000000000..ee2375615 --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ +$PYTHON setup.py install \ No newline at end of file diff --git a/meta.yaml b/meta.yaml new file mode 100644 index 000000000..1a942ba70 --- /dev/null +++ b/meta.yaml @@ -0,0 +1,57 @@ +package: + name: "graphistry-dev" + version: "0.25.2" #To get version + +source: + git_rev: 0.25.2 + git_url: https://github.com/graphistry/pygraphistry + +requirements: + host: + - python + - setuptools + build: + - python + run: + - numpy + - pandas>=0.17.0 + - protobuf>=2.6.0 + - pyarrow>=0.15.0 + - requests + - typing-extensions + - packaging>=20.1 + +outputs: + - name: igraph + requirements: + - python-igraph + # - name: networkx + # requirements: + # - networkx>=2.5 + - name: gremlin + requirements: + - gremlinpython + - name: bolt + requirements: + - neo4j + - neotime + - name: nodexl + requirements: + - openpyxl + - xlrd + - name: jupyter + requirements: + - ipython + - name: umap-learn + requirements: + - umap-learn + - dirty-cat + - name: ai + requirements: + - scikit-learn + - scipy + - dirty-cat + - umap-learn + - dgl + - torch + - sentence-transformers \ No newline at end of file From 6f48d093ac7154bd0bd9f7d1a90887140e1902ba Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Wed, 29 Jun 2022 13:20:33 +0300 Subject: [PATCH 02/22] two meta files --- meta.yaml | 45 +++++---------------------------------- subpackages/meta_sub.yaml | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 subpackages/meta_sub.yaml diff --git a/meta.yaml b/meta.yaml index 1a942ba70..e3c68644d 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,6 +1,6 @@ package: - name: "graphistry-dev" - version: "0.25.2" #To get version + name: graphistry-dev + version: "0.25.2" source: git_rev: 0.25.2 @@ -13,45 +13,10 @@ requirements: build: - python run: + - packaging>=20.1 + - typing-extensions - numpy - pandas>=0.17.0 - protobuf>=2.6.0 - pyarrow>=0.15.0 - - requests - - typing-extensions - - packaging>=20.1 - -outputs: - - name: igraph - requirements: - - python-igraph - # - name: networkx - # requirements: - # - networkx>=2.5 - - name: gremlin - requirements: - - gremlinpython - - name: bolt - requirements: - - neo4j - - neotime - - name: nodexl - requirements: - - openpyxl - - xlrd - - name: jupyter - requirements: - - ipython - - name: umap-learn - requirements: - - umap-learn - - dirty-cat - - name: ai - requirements: - - scikit-learn - - scipy - - dirty-cat - - umap-learn - - dgl - - torch - - sentence-transformers \ No newline at end of file + - requests \ No newline at end of file diff --git a/subpackages/meta_sub.yaml b/subpackages/meta_sub.yaml new file mode 100644 index 000000000..18e9c9bc4 --- /dev/null +++ b/subpackages/meta_sub.yaml @@ -0,0 +1,37 @@ +package: + name: graphistry-dev + version: "0.25.2" + +source: + git_rev: 0.25.2 + git_url: https://github.com/graphistry/pygraphistry + +requirements: + host: + - python + - setuptools + build: + - python + run: + - packaging>=20.1 + - typing-extensions + - numpy + - pandas>=0.17.0 + - protobuf>=2.6.0 + - pyarrow>=0.15.0 + - requests + +outputs: + - name: graphistry-umap + requirements: + - umap-learn + - dirty_cat + - name: graphistry-ai + requirements: + - scikit-learn + - scipy + - umap-learn + - dirty_cat + - dgl + - pytorch + - sentence-transformers \ No newline at end of file From 1ed0cf902533f7a1dedbe5555521ef85ba26a6b0 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Thu, 30 Jun 2022 12:35:03 +0300 Subject: [PATCH 03/22] addet test and about --- meta.yaml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/meta.yaml b/meta.yaml index e3c68644d..5c231b997 100644 --- a/meta.yaml +++ b/meta.yaml @@ -19,4 +19,27 @@ requirements: - pandas>=0.17.0 - protobuf>=2.6.0 - pyarrow>=0.15.0 - - requests \ No newline at end of file + - requests + +test: + requires: + - flake8 + - mock + - mypy + - pytest + - pandas-stubs + - types-requests + +about: + home: https://www.graphistry.com/ + license: BSD + summary: Visual Graph Analytics library for Python + description: | + Graphistry is a visual graph analytics library for extracting, transforming, + displaying, and sharing big graphs with end-to-end GPU acceleration + doc_url: https://www.graphistry.com/docs + dev_url: https://github.com/graphistry/pygraphistry + +extra: + author: The Graphistry Team + author_email: pygraphistry@graphistry.com \ No newline at end of file From eceb9ba30473c11fed6dcd1f6d30b3df99d4c68b Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 5 Jul 2022 15:43:59 +0300 Subject: [PATCH 04/22] working creating 3 packages --- .github/workflows/publish-conda.yml | 35 +++++++ build.sh | 2 +- conda/meta.yaml | 138 ++++++++++++++++++++++++++++ meta.yaml | 45 --------- subpackages/meta_sub.yaml | 37 -------- 5 files changed, 174 insertions(+), 83 deletions(-) create mode 100644 .github/workflows/publish-conda.yml create mode 100644 conda/meta.yaml delete mode 100644 meta.yaml delete mode 100644 subpackages/meta_sub.yaml diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml new file mode 100644 index 000000000..0fefeaf1f --- /dev/null +++ b/.github/workflows/publish-conda.yml @@ -0,0 +1,35 @@ +name: Publish Python 🐍 distributions 📦 to Conda + +on: + release: + types: [published] + + +jobs: + build-n-publish: + name: Build and publish Python 🐍 distributions 📦 to Conda + runs-on: ubuntu-18.04 + + steps: + - uses: actions/checkout@master + with: # fetch tag for versioneer + fetch-depth: 0 + + - name: Set up Python 3.7 + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Install pypa/build + run: >- + python -m pip install -e .[build] + + - name: Build a binary wheel and a source tarball + run: >- + ./bin/build.sh + + + - name: Publish distribution 📦 to PyPI + uses: pypa/gh-action-pypi-publish@master + with: + password: ${{ secrets.PYGGRAPHISTRY_PYPI }} \ No newline at end of file diff --git a/build.sh b/build.sh index ee2375615..aa8a1fc34 100644 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -$PYTHON setup.py install \ No newline at end of file +python setup.py install \ No newline at end of file diff --git a/conda/meta.yaml b/conda/meta.yaml new file mode 100644 index 000000000..d2596d78f --- /dev/null +++ b/conda/meta.yaml @@ -0,0 +1,138 @@ +package: + name: graphistry-dev + version: "0.25.2" + +source: + git_rev: 0.25.2 + git_url: https://github.com/graphistry/pygraphistry + +requirements: + host: + - python + - setuptools + run: + - graphistry_dev.graphistry_core + - graphistry_dev.graphistry-umap + - graphistry_dev.graphistry-ai + +test: + requires: + - flake8 + - mock + - mypy + - pytest + - pandas-stubs + - types-requests + +outputs: + - name: graphistry_dev.graphistry_core + requirements: + - packaging>=20.1 + - typing-extensions + - numpy + - pandas>=0.17.0 + - protobuf>=2.6.0 + - pyarrow>=0.15.0 + - requests + - name: graphistry_dev.graphistry-umap + requirements: + - umap-learn + - dirty_cat + - name: graphistry_dev.graphistry-ai + requirements: + - scikit-learn + - scipy + - umap-learn + - dirty_cat + - dgl + - pytorch + - sentence-transformers + + +about: + home: https://www.graphistry.com/ + license: BSD + summary: Visual Graph Analytics library for Python + description: | + Graphistry is a visual graph analytics library for extracting, transforming, + displaying, and sharing big graphs with end-to-end GPU acceleration + doc_url: https://www.graphistry.com/docs + dev_url: https://github.com/graphistry/pygraphistry + +extra: + author: The Graphistry Team + author_email: pygraphistry@graphistry.com + + + +# package: +# name: graphistry_dev +# version: "0.25.2" + +# source: +# git_rev: 0.25.2 +# git_url: https://github.com/graphistry/pygraphistry + +# requirements: +# host: +# - python +# - setuptools +# - numpy>=1.18.5 +# - pyarrow>=0.15.0 +# - packaging>=20.1 +# - typing-extensions +# - protobuf>=2.6.0 +# - pandas>=0.17.0 +# - requests +# build: +# - python +# run: +# - python +# - {{ pin_compatible('numpy') }} +# - graphistry_dev.graphistry_core +# # - graphistry_dev.graphistry_umap +# # - graphistry_dev.graphistry_ai + + + +# outputs: +# - name: graphistry_dev.graphistry_core +# requirements: +# - scipy +# # - name: graphistry_dev.graphistry_umap +# # requirements: +# # - umap-learn +# # - dirty_cat +# # - name: graphistry_dev.graphistry_ai +# # requirements: +# # - scikit-learn +# # - scipy +# # - umap-learn +# # - dirty_cat +# # - dgl +# # - pytorch +# # - sentence-transformers + + +# test: +# requires: +# - flake8 +# - mock +# - mypy +# - pytest +# - pandas-stubs +# - types-requests + +# about: +# home: https://www.graphistry.com/ +# license: BSD +# summary: Visual Graph Analytics library for Python +# description: | +# Graphistry is a visual graph analytics library for extracting, transforming, +# displaying, and sharing big graphs with end-to-end GPU acceleration +# doc_url: https://www.graphistry.com/docs +# dev_url: https://github.com/graphistry/pygraphistry + +# extra: +# author: The Graphistry Team +# author_email: pygraphistry@graphistry.com \ No newline at end of file diff --git a/meta.yaml b/meta.yaml deleted file mode 100644 index 5c231b997..000000000 --- a/meta.yaml +++ /dev/null @@ -1,45 +0,0 @@ -package: - name: graphistry-dev - version: "0.25.2" - -source: - git_rev: 0.25.2 - git_url: https://github.com/graphistry/pygraphistry - -requirements: - host: - - python - - setuptools - build: - - python - run: - - packaging>=20.1 - - typing-extensions - - numpy - - pandas>=0.17.0 - - protobuf>=2.6.0 - - pyarrow>=0.15.0 - - requests - -test: - requires: - - flake8 - - mock - - mypy - - pytest - - pandas-stubs - - types-requests - -about: - home: https://www.graphistry.com/ - license: BSD - summary: Visual Graph Analytics library for Python - description: | - Graphistry is a visual graph analytics library for extracting, transforming, - displaying, and sharing big graphs with end-to-end GPU acceleration - doc_url: https://www.graphistry.com/docs - dev_url: https://github.com/graphistry/pygraphistry - -extra: - author: The Graphistry Team - author_email: pygraphistry@graphistry.com \ No newline at end of file diff --git a/subpackages/meta_sub.yaml b/subpackages/meta_sub.yaml deleted file mode 100644 index 18e9c9bc4..000000000 --- a/subpackages/meta_sub.yaml +++ /dev/null @@ -1,37 +0,0 @@ -package: - name: graphistry-dev - version: "0.25.2" - -source: - git_rev: 0.25.2 - git_url: https://github.com/graphistry/pygraphistry - -requirements: - host: - - python - - setuptools - build: - - python - run: - - packaging>=20.1 - - typing-extensions - - numpy - - pandas>=0.17.0 - - protobuf>=2.6.0 - - pyarrow>=0.15.0 - - requests - -outputs: - - name: graphistry-umap - requirements: - - umap-learn - - dirty_cat - - name: graphistry-ai - requirements: - - scikit-learn - - scipy - - umap-learn - - dirty_cat - - dgl - - pytorch - - sentence-transformers \ No newline at end of file From 29d52a691b7b3e9f3bbc427b015ea871499cd56a Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 5 Jul 2022 15:55:21 +0300 Subject: [PATCH 05/22] added actiond to push to conda --- .github/workflows/publish-conda.yml | 37 +++++++++-------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index 0fefeaf1f..adcd7aff6 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -1,35 +1,20 @@ name: Publish Python 🐍 distributions 📦 to Conda on: - release: - types: [published] + push: + tags: + - '*' + workflow_dispatch: jobs: build-n-publish: name: Build and publish Python 🐍 distributions 📦 to Conda - runs-on: ubuntu-18.04 - + runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - with: # fetch tag for versioneer - fetch-depth: 0 - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install pypa/build - run: >- - python -m pip install -e .[build] - - - name: Build a binary wheel and a source tarball - run: >- - ./bin/build.sh - - - - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@master - with: - password: ${{ secrets.PYGGRAPHISTRY_PYPI }} \ No newline at end of file + - uses: actions/checkout@v1 + - name: publish-to-conda + uses: maxibor/conda-package-publish-action@v1.1 + with: + subDir: 'conda' + AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file From 6c701806f45c743ed165aa52c756dce5670fc768 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 5 Jul 2022 16:18:44 +0300 Subject: [PATCH 06/22] switched to forked github action --- .github/workflows/publish-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index adcd7aff6..9b77c3518 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: publish-to-conda - uses: maxibor/conda-package-publish-action@v1.1 + uses: blanderbuss/conda-package-publish-action@v1.1 with: subDir: 'conda' AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file From e39964a1575cde2110735208dc1b77e90132a072 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 5 Jul 2022 16:30:06 +0300 Subject: [PATCH 07/22] testing git action --- .github/workflows/publish-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index 9b77c3518..f599699ca 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: publish-to-conda - uses: blanderbuss/conda-package-publish-action@v1.1 + uses: fcakyon/conda-package-publish-action@v1.3 with: subDir: 'conda' AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file From 89198b70883eb2e87cc7b06c8e2e1da2ebed1dad Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 5 Jul 2022 16:39:55 +0300 Subject: [PATCH 08/22] another action --- .github/workflows/publish-conda.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index f599699ca..053b3dca0 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -12,9 +12,10 @@ jobs: name: Build and publish Python 🐍 distributions 📦 to Conda runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: publish-to-conda - uses: fcakyon/conda-package-publish-action@v1.3 + uses: fcakyon/conda-publish-action@v1.3 with: subDir: 'conda' - AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file + AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} + platforms: 'linux' \ No newline at end of file From cf184f3683e968a7f0e35ac24c13fe9513a3cb9d Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 5 Jul 2022 16:50:46 +0300 Subject: [PATCH 09/22] switched to v1.4 --- .github/workflows/publish-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index 053b3dca0..32ec73bcd 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: publish-to-conda - uses: fcakyon/conda-publish-action@v1.3 + uses: fcakyon/conda-publish-action@v1.4 with: subDir: 'conda' AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} From 82b0ac1fc6b415740dfb3b1843ade732cefb5ab3 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 5 Jul 2022 16:52:31 +0300 Subject: [PATCH 10/22] switched to v1.4 blanderbuss --- .github/workflows/publish-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index 32ec73bcd..6e4131615 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: publish-to-conda - uses: fcakyon/conda-publish-action@v1.4 + uses: blanderbuss/conda-publish-action@v1.4 with: subDir: 'conda' AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} From 3253d969f55b3fecc821e505d552fa5207605878 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Wed, 6 Jul 2022 10:26:51 +0300 Subject: [PATCH 11/22] added git --- conda/meta.yaml | 73 +------------------------------------------------ 1 file changed, 1 insertion(+), 72 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index d2596d78f..32c3cb356 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -10,6 +10,7 @@ requirements: host: - python - setuptools + - git run: - graphistry_dev.graphistry_core - graphistry_dev.graphistry-umap @@ -64,75 +65,3 @@ extra: author_email: pygraphistry@graphistry.com - -# package: -# name: graphistry_dev -# version: "0.25.2" - -# source: -# git_rev: 0.25.2 -# git_url: https://github.com/graphistry/pygraphistry - -# requirements: -# host: -# - python -# - setuptools -# - numpy>=1.18.5 -# - pyarrow>=0.15.0 -# - packaging>=20.1 -# - typing-extensions -# - protobuf>=2.6.0 -# - pandas>=0.17.0 -# - requests -# build: -# - python -# run: -# - python -# - {{ pin_compatible('numpy') }} -# - graphistry_dev.graphistry_core -# # - graphistry_dev.graphistry_umap -# # - graphistry_dev.graphistry_ai - - - -# outputs: -# - name: graphistry_dev.graphistry_core -# requirements: -# - scipy -# # - name: graphistry_dev.graphistry_umap -# # requirements: -# # - umap-learn -# # - dirty_cat -# # - name: graphistry_dev.graphistry_ai -# # requirements: -# # - scikit-learn -# # - scipy -# # - umap-learn -# # - dirty_cat -# # - dgl -# # - pytorch -# # - sentence-transformers - - -# test: -# requires: -# - flake8 -# - mock -# - mypy -# - pytest -# - pandas-stubs -# - types-requests - -# about: -# home: https://www.graphistry.com/ -# license: BSD -# summary: Visual Graph Analytics library for Python -# description: | -# Graphistry is a visual graph analytics library for extracting, transforming, -# displaying, and sharing big graphs with end-to-end GPU acceleration -# doc_url: https://www.graphistry.com/docs -# dev_url: https://github.com/graphistry/pygraphistry - -# extra: -# author: The Graphistry Team -# author_email: pygraphistry@graphistry.com \ No newline at end of file From 228c4fbd1ef0502895cc29deae8e727c47fb0859 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Wed, 6 Jul 2022 11:20:18 +0300 Subject: [PATCH 12/22] changed source --- conda/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 32c3cb356..a66220b6a 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -3,14 +3,12 @@ package: version: "0.25.2" source: - git_rev: 0.25.2 - git_url: https://github.com/graphistry/pygraphistry + path: ./ requirements: host: - python - setuptools - - git run: - graphistry_dev.graphistry_core - graphistry_dev.graphistry-umap From b912140200464a03487c4322522e972d7828a636 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Mon, 11 Jul 2022 15:22:01 +0300 Subject: [PATCH 13/22] modified meta --- conda/meta.yaml | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index a66220b6a..a2d3309d1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,6 +1,6 @@ package: - name: graphistry-dev - version: "0.25.2" + name: graphistry + version: {{ GIT_DESCRIBE_TAG }} source: path: ./ @@ -10,9 +10,9 @@ requirements: - python - setuptools run: - - graphistry_dev.graphistry_core - - graphistry_dev.graphistry-umap - - graphistry_dev.graphistry-ai + - graphistry.graphistry-core + - graphistry.graphistry-umap + - graphistry.graphistry-ai test: requires: @@ -24,7 +24,7 @@ test: - types-requests outputs: - - name: graphistry_dev.graphistry_core + - name: graphistry.graphistry-core requirements: - packaging>=20.1 - typing-extensions @@ -33,16 +33,18 @@ outputs: - protobuf>=2.6.0 - pyarrow>=0.15.0 - requests - - name: graphistry_dev.graphistry-umap + description: test desc + - name: graphistry.graphistry-umap requirements: - umap-learn - - dirty_cat - - name: graphistry_dev.graphistry-ai + - dirty_cat==0.2.0 + - scikit-learn>=1.0 + - name: graphistry.graphistry-ai requirements: - - scikit-learn + - scikit-learn>=1.0 - scipy - umap-learn - - dirty_cat + - dirty_cat==0.2.0 - dgl - pytorch - sentence-transformers @@ -50,12 +52,20 @@ outputs: about: home: https://www.graphistry.com/ - license: BSD - summary: Visual Graph Analytics library for Python + license: BSD3 + license_file: LICENSE + summary: Graphistry Visual Graph Analytics library for Python description: | Graphistry is a visual graph analytics library for extracting, transforming, - displaying, and sharing big graphs with end-to-end GPU acceleration - doc_url: https://www.graphistry.com/docs + displaying, and sharing big graphs with end-to-end GPU acceleration. + You can install the whole package via: + `conda install -c pygraphistry_dev graphistry` + Just the core package via: + `conda install -c pygraphistry_dev graphistry.graphistry-core` + Or other part of the package via: + `conda install -c pygraphistry_dev graphistry.graphistry-ai` + `conda install -c pygraphistry_dev graphistry.graphistry-umap` + doc_url: https://hub.graphistry.com/docs dev_url: https://github.com/graphistry/pygraphistry extra: From 16d42545340a6e8351865e1323ea8c2d6199a75f Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Mon, 11 Jul 2022 15:34:25 +0300 Subject: [PATCH 14/22] change method of git tag --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index a2d3309d1..26c5f8c72 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: graphistry - version: {{ GIT_DESCRIBE_TAG }} + version: {{ environ.get('GIT_DESCRIBE_TAG', 'failed')}} source: path: ./ From b89b078e781646bd8f0bd588243e48628eb52715 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Mon, 11 Jul 2022 16:23:12 +0300 Subject: [PATCH 15/22] changed license path --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 26c5f8c72..fee135c3b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -53,7 +53,7 @@ outputs: about: home: https://www.graphistry.com/ license: BSD3 - license_file: LICENSE + license_file: ../LICENSE summary: Graphistry Visual Graph Analytics library for Python description: | Graphistry is a visual graph analytics library for extracting, transforming, From 33f83be82eb7ce9aa19123390242854b1a872432 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Mon, 11 Jul 2022 17:11:22 +0300 Subject: [PATCH 16/22] changed license path --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index fee135c3b..145bbf820 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -53,7 +53,7 @@ outputs: about: home: https://www.graphistry.com/ license: BSD3 - license_file: ../LICENSE + license_file: ../LICENSE.txt summary: Graphistry Visual Graph Analytics library for Python description: | Graphistry is a visual graph analytics library for extracting, transforming, From c3b2fff1db4d2089de674a3c368a5c1b02e24ea8 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 12 Jul 2022 11:43:02 +0300 Subject: [PATCH 17/22] format of desription and git tag --- conda/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 145bbf820..f6104b78b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: graphistry - version: {{ environ.get('GIT_DESCRIBE_TAG', 'failed')}} + version: {{ git tag --sort=-creatordate | head -n 1 }} source: path: ./ @@ -57,13 +57,13 @@ about: summary: Graphistry Visual Graph Analytics library for Python description: | Graphistry is a visual graph analytics library for extracting, transforming, - displaying, and sharing big graphs with end-to-end GPU acceleration. - You can install the whole package via: - `conda install -c pygraphistry_dev graphistry` - Just the core package via: - `conda install -c pygraphistry_dev graphistry.graphistry-core` - Or other part of the package via: - `conda install -c pygraphistry_dev graphistry.graphistry-ai` + displaying, and sharing big graphs with end-to-end GPU acceleration.\n + You can install the whole package via:\n + `conda install -c pygraphistry_dev graphistry`\n + Just the core package via:\n + `conda install -c pygraphistry_dev graphistry.graphistry-core`\n + Or other part of the package via:\n + `conda install -c pygraphistry_dev graphistry.graphistry-ai`\n `conda install -c pygraphistry_dev graphistry.graphistry-umap` doc_url: https://hub.graphistry.com/docs dev_url: https://github.com/graphistry/pygraphistry From 3b6e4481c90f3d1d240f6b73d0f50fc614fdcbbd Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 12 Jul 2022 13:01:35 +0300 Subject: [PATCH 18/22] format of desription and git tag --- conda/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index f6104b78b..620e03b5e 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,9 +1,10 @@ package: name: graphistry - version: {{ git tag --sort=-creatordate | head -n 1 }} + version: {{ GIT_DESCRIBE_TAG }} source: - path: ./ + git_rev: 0.25.2 + git_url: https://github.com/graphistry/pygraphistry requirements: host: From 22e46d0568b03426c66cae9e4a01edd040615a21 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 12 Jul 2022 13:01:52 +0300 Subject: [PATCH 19/22] format of desription and git tag --- .github/workflows/publish-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index 6e4131615..b92d6e590 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -12,7 +12,7 @@ jobs: name: Build and publish Python 🐍 distributions 📦 to Conda runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: publish-to-conda uses: blanderbuss/conda-publish-action@v1.4 with: From c8ebde0c42815bb397e80c109a3b97c883a6ae23 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 12 Jul 2022 14:34:53 +0300 Subject: [PATCH 20/22] changed publish workflow --- .github/workflows/publish-conda.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index b92d6e590..5d3989c12 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -12,10 +12,21 @@ jobs: name: Build and publish Python 🐍 distributions 📦 to Conda runs-on: ubuntu-latest steps: + - uses: actions/checkout@v3 - - name: publish-to-conda - uses: blanderbuss/conda-publish-action@v1.4 + + - uses: conda-incubator/setup-miniconda@v2 with: - subDir: 'conda' - AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} - platforms: 'linux' \ No newline at end of file + auto-update-conda: true + + - name: Build Conda Packages + # Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitely declared as shell: + # bash -l {0} on steps that need to be properly activated + shell: bash -l {0} + env: + ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} + run: | + conda install conda-build anaconda-client conda-verify + conda config --set anaconda_upload yes + cd conda + conda build -c conda-forge -c pytorch -c dglteam -c districtdatalabs --token "$ANACONDA_TOKEN" . \ No newline at end of file From 2eb9279d6c47af0bf7a0bcf77e4b05ba09282e54 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Tue, 12 Jul 2022 16:03:43 +0300 Subject: [PATCH 21/22] formatted description --- conda/meta.yaml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 620e03b5e..f886f2854 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -58,13 +58,20 @@ about: summary: Graphistry Visual Graph Analytics library for Python description: | Graphistry is a visual graph analytics library for extracting, transforming, - displaying, and sharing big graphs with end-to-end GPU acceleration.\n - You can install the whole package via:\n - `conda install -c pygraphistry_dev graphistry`\n - Just the core package via:\n - `conda install -c pygraphistry_dev graphistry.graphistry-core`\n - Or other part of the package via:\n - `conda install -c pygraphistry_dev graphistry.graphistry-ai`\n + displaying, and sharing big graphs with end-to-end GPU acceleration. + + You can install the whole package via: + + `conda install -c pygraphistry_dev graphistry` + + Just the core package via: + + `conda install -c pygraphistry_dev graphistry.graphistry-core` + + Or other parts of the package via: + + `conda install -c pygraphistry_dev graphistry.graphistry-ai` + `conda install -c pygraphistry_dev graphistry.graphistry-umap` doc_url: https://hub.graphistry.com/docs dev_url: https://github.com/graphistry/pygraphistry From 6a72546e7099db792f56bba34d083c37d4ae7ccc Mon Sep 17 00:00:00 2001 From: Bohdan Fedorak Date: Fri, 15 Jul 2022 15:30:40 +0300 Subject: [PATCH 22/22] added git_rev jinja template --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index f886f2854..a8f773381 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -3,7 +3,7 @@ package: version: {{ GIT_DESCRIBE_TAG }} source: - git_rev: 0.25.2 + git_rev: {{ GIT_DESCRIBE_TAG }} git_url: https://github.com/graphistry/pygraphistry requirements: