diff --git a/docs-website/.gitignore b/docs-website/.gitignore index 482a764429..8befa30d04 100644 --- a/docs-website/.gitignore +++ b/docs-website/.gitignore @@ -3,6 +3,7 @@ /docs /genDocs /genStatic +# note that genStatic is no longer used # Generated GraphQL /graphql/combined.graphql diff --git a/docs-website/build.gradle b/docs-website/build.gradle index 1be790695e..1cc02977e5 100644 --- a/docs-website/build.gradle +++ b/docs-website/build.gradle @@ -83,7 +83,6 @@ task yarnInstall(type: YarnTask) { task yarnGenerate(type: YarnTask, dependsOn: [yarnInstall, generateGraphQLSchema, generateJsonSchema, ':metadata-ingestion:modelDocGen', ':metadata-ingestion:docGen', - ':python-build:buildWheels', ]) { inputs.files(projectMdFiles) outputs.cacheIf { true } diff --git a/docs-website/docusaurus.config.js b/docs-website/docusaurus.config.js index 4349c9b0bc..a5f794065e 100644 --- a/docs-website/docusaurus.config.js +++ b/docs-website/docusaurus.config.js @@ -11,7 +11,7 @@ module.exports = { favicon: "img/favicon.ico", organizationName: "datahub-project", // Usually your GitHub org/user name. projectName: "datahub", // Usually your repo name. - staticDirectories: ["static", "genStatic"], + staticDirectories: ["static"], stylesheets: ["https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;700&display=swap"], headTags: [ { diff --git a/docs-website/generateDocsDir.ts b/docs-website/generateDocsDir.ts index 3a14baee07..0b7a0a780c 100644 --- a/docs-website/generateDocsDir.ts +++ b/docs-website/generateDocsDir.ts @@ -16,7 +16,6 @@ const GITHUB_BROWSE_URL = "https://github.com/datahub-project/datahub/blob/master"; const OUTPUT_DIRECTORY = "docs"; -const STATIC_DIRECTORY = "genStatic/artifacts"; const SIDEBARS_DEF_PATH = "./sidebars.js"; const sidebars = require(SIDEBARS_DEF_PATH); @@ -607,25 +606,6 @@ function write_markdown_file( } } -function copy_python_wheels(): void { - // Copy the built wheel files to the static directory. - // Everything is copied to the python-build directory first, so - // we just need to copy from there. - const wheel_dir = "../python-build/wheels"; - - const wheel_output_directory = path.join(STATIC_DIRECTORY, "wheels"); - fs.mkdirSync(wheel_output_directory, { recursive: true }); - - const wheel_files = fs.readdirSync(wheel_dir); - for (const wheel_file of wheel_files) { - const src = path.join(wheel_dir, wheel_file); - const dest = path.join(wheel_output_directory, wheel_file); - - // console.log(`Copying artifact ${src} to ${dest}...`); - fs.copyFileSync(src, dest); - } -} - (async function main() { for (const filepath of markdown_files) { //console.log("Processing:", filepath); @@ -680,8 +660,5 @@ function copy_python_wheels(): void { ); } } - - // Generate static directory. - copy_python_wheels(); // TODO: copy over the source json schemas + other artifacts. })(); diff --git a/docs-website/package.json b/docs-website/package.json index 52f04e46c4..258196e576 100644 --- a/docs-website/package.json +++ b/docs-website/package.json @@ -14,8 +14,8 @@ "_generate-python-sdk": "cd sphinx && make md", "_generate-docs-dir-script": "ts-node -O '{ \"lib\": [\"es2020\"], \"target\": \"es6\" }' generateDocsDir.ts", "_generate-docs": "rm -rf docs && mkdir docs && yarn _generate-graphql && yarn _generate-python-sdk && yarn run _generate-docs-dir-script", - "generate": "rm -rf genDocs genStatic && mkdir genDocs genStatic && yarn _generate-docs && mv docs/* genDocs/ && rmdir docs", - "generate-rsync": "mkdir -p genDocs genStatic && yarn _generate-docs && rsync -v --checksum -r -h -i --delete docs/ genDocs && rm -rf docs", + "generate": "rm -rf genDocs && mkdir genDocs && yarn _generate-docs && mv docs/* genDocs/ && rmdir docs", + "generate-rsync": "mkdir -p genDocs && yarn _generate-docs && rsync -v --checksum -r -h -i --delete docs/ genDocs && rm -rf docs", "lint": "prettier -w generateDocsDir.ts sidebars.js src/pages/index.js", "lint-check": "prettier -l generateDocsDir.ts sidebars.js src/pages/index.js", "lint-fix": "prettier --write generateDocsDir.ts sidebars.js src/pages/index.js",