diff --git a/Makefile b/Makefile index 352ab87e..138f9b87 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ all: container # Not used wheels: + pip3 wheel --no-deps --wheel-dir dist trustgraph/ pip3 wheel --no-deps --wheel-dir dist trustgraph-base/ pip3 wheel --no-deps --wheel-dir dist trustgraph-flow/ pip3 wheel --no-deps --wheel-dir dist trustgraph-vertexai/ @@ -19,6 +20,7 @@ wheels: packages: update-package-versions rm -rf dist/ + cd trustgraph && python3 setup.py sdist --dist-dir ../dist/ cd trustgraph-base && python3 setup.py sdist --dist-dir ../dist/ cd trustgraph-flow && python3 setup.py sdist --dist-dir ../dist/ cd trustgraph-vertexai && python3 setup.py sdist --dist-dir ../dist/ @@ -34,6 +36,7 @@ CONTAINER=docker.io/trustgraph/trustgraph-flow update-package-versions: mkdir -p trustgraph-cli/trustgraph + mkdir -p trustgraph/trustgraph echo __version__ = \"${VERSION}\" > trustgraph-base/trustgraph/base_version.py echo __version__ = \"${VERSION}\" > trustgraph-flow/trustgraph/flow_version.py echo __version__ = \"${VERSION}\" > trustgraph-vertexai/trustgraph/vertexai_version.py @@ -41,6 +44,7 @@ update-package-versions: echo __version__ = \"${VERSION}\" > trustgraph-parquet/trustgraph/parquet_version.py echo __version__ = \"${VERSION}\" > trustgraph-embeddings-hf/trustgraph/embeddings_hf_version.py echo __version__ = \"${VERSION}\" > trustgraph-cli/trustgraph/cli_version.py + echo __version__ = \"${VERSION}\" > trustgraph/trustgraph/trustgraph_version.py container: update-package-versions ${DOCKER} build -f Containerfile -t ${CONTAINER}:${VERSION} \ diff --git a/README.md b/README.md index 9336cd6d..7f83b8ee 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ TrustGraph releases are available [here](https://github.com/trustgraph-ai/trustg | Release Type | Release Version | | ------------ | --------------- | -| Latest | [0.11.19](https://github.com/trustgraph-ai/trustgraph/releases/download/v0.11.19/deploy.zip) | -| Stable | [0.11.19](https://github.com/trustgraph-ai/trustgraph/releases/download/v0.11.19/deploy.zip) | +| Latest | [0.11.20](https://github.com/trustgraph-ai/trustgraph/releases/download/v0.11.20/deploy.zip) | +| Stable | [0.11.20](https://github.com/trustgraph-ai/trustgraph/releases/download/v0.11.20/deploy.zip) | TrustGraph is fully containerized and is launched with a `YAML` configuration file. Unzipping the `deploy.zip` will add the `deploy` directory with the following subdirectories: diff --git a/trustgraph-bedrock/setup.py b/trustgraph-bedrock/setup.py index 317f2bdf..787cbad4 100644 --- a/trustgraph-bedrock/setup.py +++ b/trustgraph-bedrock/setup.py @@ -34,7 +34,7 @@ setuptools.setup( python_requires='>=3.8', download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz", install_requires=[ - "trustgraph-base", + "trustgraph-base<0.12", "pulsar-client", "prometheus-client", "boto3", diff --git a/trustgraph-cli/setup.py b/trustgraph-cli/setup.py index 68024de6..061234a6 100644 --- a/trustgraph-cli/setup.py +++ b/trustgraph-cli/setup.py @@ -34,7 +34,7 @@ setuptools.setup( python_requires='>=3.8', download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz", install_requires=[ - "trustgraph-base", + "trustgraph-base<0.12", "requests", "pulsar-client", "rdflib", diff --git a/trustgraph-embeddings-hf/setup.py b/trustgraph-embeddings-hf/setup.py index f3c2869b..7f1aafa4 100644 --- a/trustgraph-embeddings-hf/setup.py +++ b/trustgraph-embeddings-hf/setup.py @@ -34,8 +34,8 @@ setuptools.setup( python_requires='>=3.8', download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz", install_requires=[ - "trustgraph-base", - "trustgraph-flow", + "trustgraph-base<0.12", + "trustgraph-flow<0.12", "torch", "urllib3", "transformers", diff --git a/trustgraph-flow/setup.py b/trustgraph-flow/setup.py index cbebc885..bf0bfe58 100644 --- a/trustgraph-flow/setup.py +++ b/trustgraph-flow/setup.py @@ -34,7 +34,7 @@ setuptools.setup( python_requires='>=3.8', download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz", install_requires=[ - "trustgraph-base", + "trustgraph-base<0.12", "urllib3", "rdflib", "pymilvus", diff --git a/trustgraph-parquet/setup.py b/trustgraph-parquet/setup.py index 6da7d916..db01e98a 100644 --- a/trustgraph-parquet/setup.py +++ b/trustgraph-parquet/setup.py @@ -34,15 +34,18 @@ setuptools.setup( python_requires='>=3.8', download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz", install_requires=[ - "trustgraph-base", + "trustgraph-base<0.12", "pulsar-client", "prometheus-client", "pyarrow", + "pandas", ], scripts=[ "scripts/concat-parquet", "scripts/dump-parquet", "scripts/ge-dump-parquet", "scripts/triples-dump-parquet", + "scripts/load-graph-embeddings", + "scripts/load-triples", ] ) diff --git a/trustgraph-vertexai/setup.py b/trustgraph-vertexai/setup.py index 73c03b20..3ef59da9 100644 --- a/trustgraph-vertexai/setup.py +++ b/trustgraph-vertexai/setup.py @@ -34,7 +34,7 @@ setuptools.setup( python_requires='>=3.8', download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz", install_requires=[ - "trustgraph-base", + "trustgraph-base<0.12", "pulsar-client", "google-cloud-aiplatform", "prometheus-client", diff --git a/trustgraph/setup.py b/trustgraph/setup.py new file mode 100644 index 00000000..f840943e --- /dev/null +++ b/trustgraph/setup.py @@ -0,0 +1,47 @@ +import setuptools +import os +import importlib + +with open("README.md", "r") as fh: + long_description = fh.read() + +# Load a version number module +spec = importlib.util.spec_from_file_location( + 'version', 'trustgraph/trustgraph_version.py' +) +version_module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(version_module) + +version = version_module.__version__ + +setuptools.setup( + name="trustgraph", + version=version, + author="trustgraph.ai", + author_email="security@trustgraph.ai", + description="TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.", + long_description=long_description, + long_description_content_type="text/markdown", + url="https://github.com/trustgraph-ai/trustgraph", + packages=setuptools.find_namespace_packages( + where='./', + ), + classifiers=[ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Operating System :: OS Independent", + ], + python_requires='>=3.8', + download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz", + install_requires=[ + "trustgraph-base<0.12", + "trustgraph-bedrock<0.12", + "trustgraph-cli<0.12", + "trustgraph-embeddings-hf<0.12", + "trustgraph-flow<0.12", + "trustgraph-parquet<0.12", + "trustgraph-vertexai<0.12", + ], + scripts=[ + ] +)