Skip to content

Commit 78d9c2d

Browse files
agorajekagorajek
authored
Merge pull request #670 from DataJunction/issue-630
Rename /client to /datajunction-clients.
2 parents dae90f8 + 40bc7fa commit 78d9c2d

Some content is hidden

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

64 files changed

+1161
-1379
lines changed

‎.github/files/python-client-gen.yml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/workflows/bump-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: 'ubuntu-latest'
3838
defaults:
3939
run:
40-
working-directory: ${{ github.event.inputs.library == 'server' && '.' || github.event.inputs.library == 'client' && './client/python' || github.event.inputs.library == 'djrs' && './djrs' || github.event.inputs.library == 'djqs' && './djqs' }}
40+
working-directory: ${{ github.event.inputs.library == 'server' && '.' || github.event.inputs.library == 'client' && './datajunction-clients/python' || github.event.inputs.library == 'djrs' && './djrs' || github.event.inputs.library == 'djqs' && './djqs' }}
4141
steps:
4242
- uses: actions/checkout@v2
4343
- name: Set up Python

‎.github/workflows/client-integration-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
- name: Install dependencies
2929
run: |
3030
pdm sync -d
31-
cd ./client/python; pdm install -d -G pandas
31+
cd ./datajunction-clients/python; pdm install -d -G pandas
3232
- name: Python client integration tests
33-
run: cd client/python && make test PYTEST_ARGS="--integration -k test_integration"
33+
run: cd datajunction-clients/python && make test PYTEST_ARGS="--integration -k test_integration"
3434

3535
javascript-client-integration:
3636
runs-on: ubuntu-latest
@@ -47,7 +47,7 @@ jobs:
4747
node-version: ${{ matrix.node-version }}
4848
- name: Install Dev Dependencies
4949
run: npm install --only=dev
50-
working-directory: ./client/javascript
50+
working-directory: ./datajunction-clients/javascript
5151
- name: Javascript client integration tests
5252
run: npm test
53-
working-directory: ./client/javascript
53+
working-directory: ./datajunction-clients/javascript

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches: [ main ]
55
paths:
66
- 'dj/__about__.py'
7-
- 'client/python/datajunction/__about__.py'
7+
- 'datajunction-clients/python/datajunction/__about__.py'
88

99
jobs:
1010
publish:
@@ -40,14 +40,14 @@ jobs:
4040
server:
4141
- 'dj/__about__.py'
4242
client:
43-
- 'client/python/datajunction/__about__.py'
43+
- 'datajunction-clients/python/datajunction/__about__.py'
4444
djrs:
4545
- 'djrs/djrs/__about__.py'
4646
djqs:
4747
- 'djqs/djqs/__about__.py'
4848
4949
- name: Tag release
50-
working-directory: ${{ steps.changes.outputs.server == 'true' && '.' || steps.changes.outputs.client == 'true' && './client/python' || steps.changes.outputs.djrs == 'true' && './djrs' || steps.changes.outputs.djqs == 'true' && './djqs' }}
50+
working-directory: ${{ steps.changes.outputs.server == 'true' && '.' || steps.changes.outputs.client == 'true' && './datajunction-clients/python' || steps.changes.outputs.djrs == 'true' && './djrs' || steps.changes.outputs.djqs == 'true' && './djqs' }}
5151
run: |
5252
export NEW_VERSION=v$(hatch version)
5353
export LIBRARY=${{ steps.changes.outputs.server == 'true' && 'server' || steps.changes.outputs.client == 'true' && 'client' || steps.changes.outputs.djrs == 'true' && 'djrs' || steps.changes.outputs.djqs == 'true' && 'djqs' }}
@@ -57,7 +57,7 @@ jobs:
5757
GITHUB_TOKEN: ${{ secrets.REPO_SCOPED_TOKEN }}
5858

5959
- name: Publish to pypi
60-
working-directory: ${{ steps.changes.outputs.server == 'true' && '.' || steps.changes.outputs.client == 'true' && './client/python' || steps.changes.outputs.djrs == 'true' && './djrs' || steps.changes.outputs.djqs == 'true' && './djqs' }}
60+
working-directory: ${{ steps.changes.outputs.server == 'true' && '.' || steps.changes.outputs.client == 'true' && './datajunction-clients/python' || steps.changes.outputs.djrs == 'true' && './djrs' || steps.changes.outputs.djqs == 'true' && './djqs' }}
6161
env:
6262
HATCH_INDEX_USER: __token__
6363
HATCH_INDEX_AUTH: ${{ secrets.PYPI_TOKEN }}
@@ -66,7 +66,7 @@ jobs:
6666
hatch publish
6767
6868
- name: Create Github release
69-
working-directory: ${{ steps.changes.outputs.server == 'true' && '.' || steps.changes.outputs.client == 'true' && './client/python' || steps.changes.outputs.djrs == 'true' && './djrs' || steps.changes.outputs.djqs == 'true' && './djqs' }}
69+
working-directory: ${{ steps.changes.outputs.server == 'true' && '.' || steps.changes.outputs.client == 'true' && './datajunction-clients/python' || steps.changes.outputs.djrs == 'true' && './djrs' || steps.changes.outputs.djqs == 'true' && './djqs' }}
7070
run: |
7171
export LIBRARY=${{ steps.changes.outputs.server == 'true' && 'server' || steps.changes.outputs.client == 'true' && 'client' || steps.changes.outputs.djrs == 'true' && 'djrs' || steps.changes.outputs.djqs == 'true' && 'djqs' }}
7272
gh release create $(hatch version)-$LIBRARY

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Install dependencies
4545
run: |
4646
pdm sync -d
47-
export tests_dir=${{ matrix.library == 'server' && './datajunction-server' || matrix.library == 'client' && './client/python' || matrix.library == 'djqs' && './datajunction-query' || matrix.library == 'djrs' && './datajunction-reflection'}}
47+
export tests_dir=${{ matrix.library == 'server' && './datajunction-server' || matrix.library == 'client' && './datajunction-clients/python' || matrix.library == 'djqs' && './datajunction-query' || matrix.library == 'djrs' && './datajunction-reflection'}}
4848
cd $tests_dir; pdm install -d -G pandas
4949
5050
- uses: pre-commit/action@v3.0.0
@@ -54,13 +54,13 @@ jobs:
5454

5555
- name: Python Linters
5656
run: |
57-
export tests_dir=${{ matrix.library == 'server' && './datajunction-server' || matrix.library == 'client' && './client/python' || matrix.library == 'djqs' && './datajunction-query' || matrix.library == 'djrs' && './datajunction-reflection'}}
57+
export tests_dir=${{ matrix.library == 'server' && './datajunction-server' || matrix.library == 'client' && './datajunction-clients/python' || matrix.library == 'djqs' && './datajunction-query' || matrix.library == 'djrs' && './datajunction-reflection'}}
5858
cd $tests_dir; pdm run pre-commit run --all-files
5959
6060
- name: Test DJ ${{ matrix.library }} with pytest
6161
run: |
6262
export module=${{ matrix.library == 'server' && 'datajunction_server' || matrix.library == 'client' && 'datajunction' || matrix.library == 'djqs' && 'djqs' || matrix.library == 'djrs' && 'datajunction_reflection'}}
63-
export tests_dir=${{ matrix.library == 'server' && './datajunction-server' || matrix.library == 'client' && './client/python' || matrix.library == 'djqs' && './datajunction-query' || matrix.library == 'djrs' && './datajunction-reflection'}}
63+
export tests_dir=${{ matrix.library == 'server' && './datajunction-server' || matrix.library == 'client' && './datajunction-clients/python' || matrix.library == 'djqs' && './datajunction-query' || matrix.library == 'djrs' && './datajunction-reflection'}}
6464
cd $tests_dir; pdm run pytest ${{ matrix.library == 'server' && '-n auto' || '' }} --cov-fail-under=100 --cov=$module -vv tests/ --doctest-modules $module --without-integration --without-slow-integration
6565
6666
build-javascript:
@@ -76,13 +76,13 @@ jobs:
7676
node-version: ${{ matrix.node-version }}
7777
- name: Install Dev Dependencies
7878
run: npm install --only=dev
79-
working-directory: ./client/javascript
79+
working-directory: ./datajunction-clients/javascript
8080
- name: Build Javascript Client
8181
run: npm run build
82-
working-directory: ./client/javascript
82+
working-directory: ./datajunction-clients/javascript
8383
- name: Lint Javascript Client
8484
run: npm run lint
85-
working-directory: ./client/javascript
85+
working-directory: ./datajunction-clients/javascript
8686

8787
build-ui:
8888
runs-on: ubuntu-latest
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: ubuntu-latest
111111
defaults:
112112
run:
113-
working-directory: ./client/java
113+
working-directory: ./datajunction-clients/java
114114
steps:
115115
- uses: actions/checkout@v3
116116
- name: Set up JDK 17
@@ -124,4 +124,4 @@ jobs:
124124
uses: gradle/gradle-build-action@v2
125125
with:
126126
arguments: build
127-
build-root-directory: ./client/java
127+
build-root-directory: ./datajunction-clients/java

‎.pre-commit-config.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
files: ^datajunction-(server|query|reflection)/
2-
exclude: (^docs/|^openapi/|^client/python/|^client/javascript/|^datajunction-server/dj/sql/parsing/backends/grammar/generated|^README.md)
2+
exclude: (^docs/|^openapi/|^datajunction-clients/python/|^datajunction-clients/javascript/|^datajunction-server/dj/sql/parsing/backends/grammar/generated|^README.md)
33

44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -69,7 +69,6 @@ repos:
6969
- types-freezegun
7070
- types-python-dateutil
7171
- types-pkg_resources
72-
- types-PyYAML
7372
- types-tabulate
7473
- repo: https://github.com/asottile/add-trailing-comma
7574
rev: v2.2.1
@@ -81,7 +80,7 @@ repos:
8180
# - id: reorder-python-imports
8281
# args: [--application-directories=.:src]
8382
- repo: https://github.com/hadialqattan/pycln
84-
rev: v1.1.0 # Possible releases: https://github.com/hadialqattan/pycln/tags
83+
rev: v2.1.7 # Possible releases: https://github.com/hadialqattan/pycln/tags
8584
hooks:
8685
- id: pycln
8786
args: [--config=pyproject.toml]
@@ -104,28 +103,28 @@ repos:
104103
- id: black-nb
105104
files: '\.ipynb$'
106105
- repo: https://github.com/pdm-project/pdm
107-
rev: 2.6.1
106+
rev: 2.8.1
108107
hooks:
109108
- id: pdm-lock-check
110109
name: pdm-lock-check-root
111110
entry: pdm lock --check --project .
112111
files: ^pyproject.toml$
113112
- repo: https://github.com/pdm-project/pdm
114-
rev: 2.6.1
113+
rev: 2.8.1
115114
hooks:
116115
- id: pdm-lock-check
117116
name: pdm-lock-check-server
118117
entry: pdm lock --check --project datajunction-server
119118
files: ^datajunction-server/pyproject.toml$
120119
- repo: https://github.com/pdm-project/pdm
121-
rev: 2.6.1
120+
rev: 2.8.1
122121
hooks:
123122
- id: pdm-lock-check
124123
name: pdm-lock-check-query
125124
entry: pdm lock --check --project datajunction-query
126125
files: ^datajunction-query/pyproject.toml$
127126
- repo: https://github.com/pdm-project/pdm
128-
rev: 2.6.1
127+
rev: 2.8.1
129128
hooks:
130129
- id: pdm-lock-check
131130
name: pdm-lock-check-reflection

‎CONTRIBUTING.rst‎

Lines changed: 1 addition & 1 deletion

client/java/.gitignore renamed to datajunction-clients/java/.gitignore

File renamed without changes.

client/java/build.gradle renamed to datajunction-clients/java/build.gradle

File renamed without changes.

client/java/gradle/wrapper/gradle-wrapper.jar renamed to datajunction-clients/java/gradle/wrapper/gradle-wrapper.jar

File renamed without changes.

0 commit comments

Comments
 (0)