Skip to content

Commit edeffbc

Browse files
committed
[FSTORE-1439] Merge hopsworks-api, feature-store-api and machine-learning-api
* Remove redundant java-related files * Move java code of hsfs * Move locust_benchmark of hsfs * Move python code of hsfs * Move python code of hsml * Move hsml tests * Remove redundant __init__.py in hsml/tests * Move hsfs tests * Merge hsfs tests * Fix the problem with impure tests changing backend_fixtures One of the tests is impure, changing backend_fixtures, which breaks test_model. This commit makes backend_fixtures to return a deep copy of backend_fixtures_json isntead of returning them directly. * Fix ruff check of test_base_client * Move hsfs utils * Merge hsfs docs * Fix pyproject dependencies for hsfs docs * Merge the rest of hsfs docs * Merge hsfs mkdocs * Merge hsml docs * Add files generated by auto_doc to gitignore * Merge hsfs pyproject.toml * Merge hsml pyproject.toml * Remove hsfs and hsml pyproject.toml * Remove hive from pyproject dependencies * Fix mistypes in pyproject * Fix documentation generation * Fix circular dependencies * Fix circular dependency in hsml (CONNECTION_SAAS_HOSTNAME) * Fix circular dependency in hsml (model/util) * Ruff fix hsml/util * Fix docgen There is a very strange bug: hsml.python for some reason is available only as python.hsml.python. * Fix hsml.python import errors * Fix import problem in docgen * Ruff fix auto_doc *Revert the move of requirements-docs to an extra See PR logicalclocks#209 * Move workflows * Merge workflows * Remove redundant github files * Skip test_login until Robin is back * Fix test_connection * Fix test_hopsworks_udf * Fix import problem in docgen * Fix pyproject optional docgen dependency * Revert the move of requirements-docs to an extra See PR logicalclocks#209 * Rename unit_tests_pandas to unit_tests_pandas1 for clarity * Rename unit_tests_typechecked * Merge workflows * Fix import problem in docgen * Merge and remove the rest of python files * Merge gitignore * Move docker and jenkins files * Merge CONTRIBUTING * Merge README and remove hsfs and hsml subdirectories * Revert the move of requirements-docs to an extra See PR logicalclocks#209 * Add hopsworks_common
1 parent b3bb58a commit edeffbc

File tree

663 files changed

+1711
-8453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

663 files changed

+1711
-8453
lines changed
File renamed without changes.

hsfs/.github/workflows/java-ut.yml .github/workflows/java.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: java
33
on: pull_request
44

55
jobs:
6-
unit_tests_utc:
7-
name: Java Unit Tests
6+
unit_tests:
7+
name: Unit Tests
88
runs-on: ubuntu-latest
99

1010
steps:
@@ -17,8 +17,8 @@ jobs:
1717
- name: Set up JDK 8
1818
uses: actions/setup-java@v3
1919
with:
20-
java-version: '8'
21-
distribution: 'adopt'
20+
java-version: "8"
21+
distribution: "adopt"
2222

2323
- name: Cache local Maven repository
2424
uses: actions/cache@v2
@@ -32,8 +32,8 @@ jobs:
3232
working-directory: ./java
3333
run: mvn clean test
3434

35-
unit_tests_local:
36-
name: Java Unit Tests (Local TZ)
35+
unit_tests_local_tz:
36+
name: Unit Tests (Local TZ)
3737
runs-on: ubuntu-latest
3838

3939
steps:
@@ -46,8 +46,8 @@ jobs:
4646
- name: Set up JDK 8
4747
uses: actions/setup-java@v3
4848
with:
49-
java-version: '8'
50-
distribution: 'adopt'
49+
java-version: "8"
50+
distribution: "adopt"
5151

5252
- name: Cache local Maven repository
5353
uses: actions/cache@v2

.github/workflows/mkdocs-main.yml

+18-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,24 @@ jobs:
2424
run: cp ../README.md . && pip3 install -r ../requirements-docs.txt && pip3 install -e .[dev]
2525

2626
- name: generate autodoc
27-
run: python3 auto_doc.py
27+
run: python3 ./python/auto_doc.py
28+
29+
- name: Cache local Maven repository
30+
uses: actions/cache@v2
31+
with:
32+
path: ~/.m2/repository
33+
key: ${{ runner.os }}-maven-${{ hashFiles('java/pom.xml') }}
34+
restore-keys: |
35+
${{ runner.os }}-maven-
36+
- name: Set up JDK 8
37+
uses: actions/setup-java@v3
38+
with:
39+
java-version: "8"
40+
distribution: "adopt"
41+
42+
- name: Build java doc documentation
43+
working-directory: ./java
44+
run: mvn clean install javadoc:javadoc javadoc:aggregate -DskipTests && cp -r target/site/apidocs ../docs/javadoc
2845

2946
- name: setup git
3047
run: |

.github/workflows/mkdocs-release.yml

+20-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: mkdocs-release
22

33
on:
44
push:
5-
branches: [branch-*\.*]
5+
branches: [branch-*]
66

77
jobs:
88
publish-release:
@@ -29,7 +29,25 @@ jobs:
2929
run: cp ../README.md . && pip3 install -r ../requirements-docs.txt && pip3 install -e .[dev]
3030

3131
- name: generate autodoc
32-
run: python3 auto_doc.py
32+
run: python3 ./python/auto_doc.py
33+
34+
- name: Cache local Maven repository
35+
uses: actions/cache@v2
36+
with:
37+
path: ~/.m2/repository
38+
key: ${{ runner.os }}-maven-${{ hashFiles('java/pom.xml') }}
39+
restore-keys: |
40+
${{ runner.os }}-maven-
41+
- name: Set up JDK 8
42+
uses: actions/setup-java@v3
43+
with:
44+
java-version: "8"
45+
distribution: "adopt"
46+
47+
- name: Build java doc documentation
48+
working-directory: ./java
49+
run:
50+
mvn clean install javadoc:javadoc javadoc:aggregate -DskipTests && cp -r target/site/apidocs ../docs/javadoc
3351

3452
- name: setup git
3553
run: |

.github/workflows/python-lint.yml

-49
This file was deleted.

hsfs/.github/workflows/python-lint.yml .github/workflows/python.yml

+46-26
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: python
22

33
on: pull_request
44

5+
env:
6+
APP_API_KEY: ${{ secrets.APP_API_KEY }}
7+
ENABLE_HOPSWORKS_USAGE: "false"
8+
59
jobs:
610
lint_stylecheck:
711
name: Lint and Stylecheck
@@ -31,22 +35,25 @@ jobs:
3135
- name: ruff on python files
3236
if: steps.get-changed-files.outputs.src_any_changed == 'true'
3337
env:
34-
SRC_ALL_CHANGED_FILES: ${{ steps.get-changed-files.outputs.src_all_changed_files }}
38+
SRC_ALL_CHANGED_FILES:
39+
${{ steps.get-changed-files.outputs.src_all_changed_files }}
3540
run: ruff check --output-format=github $SRC_ALL_CHANGED_FILES
3641

3742
- name: ruff on test files
3843
if: steps.get-changed-files.outputs.test_any_changed == 'true'
3944
env:
40-
TEST_ALL_CHANGED_FILES: ${{ steps.get-changed-files.outputs.test_all_changed_files }}
45+
TEST_ALL_CHANGED_FILES:
46+
${{ steps.get-changed-files.outputs.test_all_changed_files }}
4147
run: ruff check --output-format=github $TEST_ALL_CHANGED_FILES
4248

4349
- name: ruff format --check $ALL_CHANGED_FILES
4450
env:
45-
ALL_CHANGED_FILES: ${{ steps.get-changed-files.outputs.all_changed_files }}
51+
ALL_CHANGED_FILES:
52+
${{ steps.get-changed-files.outputs.all_changed_files }}
4653
run: ruff format $ALL_CHANGED_FILES
4754

48-
unit_tests_ubuntu_utc:
49-
name: Unit Testing (Ubuntu)
55+
unit_tests:
56+
name: Unit Tests
5057
needs: lint_stylecheck
5158
runs-on: ubuntu-latest
5259
strategy:
@@ -73,12 +80,34 @@ jobs:
7380
run: python --version
7481

7582
- name: Run Pytest suite
76-
env:
77-
ENABLE_HOPSWORKS_USAGE: "false"
7883
run: pytest python/tests
7984

80-
unit_tests_ubuntu_pandas:
81-
name: Unit Testing (Ubuntu) (Pandas 1.x)
85+
unit_tests_no_opt:
86+
name: Unit Tests (No Optional Dependencies)
87+
needs: lint_stylecheck
88+
runs-on: ubuntu-latest
89+
90+
steps:
91+
- name: Set Timezone
92+
run: sudo timedatectl set-timezone UTC
93+
94+
- uses: actions/checkout@v4
95+
- name: Copy README
96+
run: cp README.md python/
97+
98+
- uses: actions/setup-python@v5
99+
name: Setup Python
100+
with:
101+
python-version: "3.10"
102+
cache: "pip"
103+
cache-dependency-path: "python/setup.py"
104+
- run: pip install -e python[python,dev-no-opt]
105+
106+
- name: Run Pytest suite
107+
run: pytest python/tests
108+
109+
unit_tests_pandas1:
110+
name: Unit Tests (Pandas 1.x)
82111
needs: lint_stylecheck
83112
runs-on: ubuntu-latest
84113

@@ -102,12 +131,10 @@ jobs:
102131
run: python --version
103132

104133
- name: Run Pytest suite
105-
env:
106-
ENABLE_HOPSWORKS_USAGE: "false"
107134
run: pytest python/tests
108135

109-
unit_tests_ubuntu_local:
110-
name: Unit Testing (Ubuntu) (Local TZ)
136+
unit_tests_local_tz:
137+
name: Unit Tests (Local TZ)
111138
needs: lint_stylecheck
112139
runs-on: ubuntu-latest
113140

@@ -131,12 +158,10 @@ jobs:
131158
run: python --version
132159

133160
- name: Run Pytest suite
134-
env:
135-
ENABLE_HOPSWORKS_USAGE: "false"
136161
run: pytest python/tests
137162

138-
unit_tests_ubuntu_typechecked:
139-
name: Typechecked Unit Testing (Ubuntu)
163+
unit_tests_typechecked:
164+
name: Unit Tests (Typechecked)
140165
needs: lint_stylecheck
141166
runs-on: ubuntu-latest
142167

@@ -155,13 +180,12 @@ jobs:
155180

156181
- name: Run Pytest suite
157182
env:
158-
ENABLE_HOPSWORKS_USAGE: "false"
159183
HOPSWORKS_RUN_WITH_TYPECHECK: "true"
160184
run: pytest python/tests
161185
continue-on-error: true
162186

163-
unit_tests_windows_utc:
164-
name: Unit Testing (Windows)
187+
unit_tests_windows:
188+
name: Unit Tests (Windows)
165189
needs: lint_stylecheck
166190
runs-on: windows-latest
167191

@@ -185,12 +209,10 @@ jobs:
185209
run: python --version
186210

187211
- name: Run Pytest suite
188-
env:
189-
ENABLE_HOPSWORKS_USAGE: "false"
190212
run: pytest python/tests
191213

192-
unit_tests_windows_local:
193-
name: Unit Testing (Windows) (Local TZ)
214+
unit_tests_windows_local_tz:
215+
name: Unit Tests (Windows) (Local TZ)
194216
needs: lint_stylecheck
195217
runs-on: windows-latest
196218

@@ -217,6 +239,4 @@ jobs:
217239
run: pip freeze
218240

219241
- name: Run Pytest suite
220-
env:
221-
ENABLE_HOPSWORKS_USAGE: "false"
222242
run: pytest python/tests

.gitignore

+11
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ coverage.xml
5151
.hypothesis/
5252
.pytest_cache/
5353
.ruff_cache/
54+
bigquery.json
55+
metastore_db/
5456

5557
# Translations
5658
*.mo
@@ -71,6 +73,9 @@ instance/
7173
# Sphinx documentation
7274
docs/_build/
7375

76+
# Mike Javadoc
77+
docs/javadoc
78+
7479
# PyBuilder
7580
target/
7681

@@ -128,3 +133,9 @@ target/
128133

129134
# mkdocs intemediate files
130135
docs/generated
136+
137+
docs/CONTRIBUTING.md
138+
docs/index.md
139+
140+
# Test artifacts
141+
keyFile.json

0 commit comments

Comments
 (0)