Skip to content

Commit 9e59b82

Browse files
authored
Merge branch 'master' into master
2 parents ee0f0db + b2a7eab commit 9e59b82

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/development.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Build pip artifacts
4343
run: |
4444
export HOST_UID=$(id -u)
45-
docker-compose -f docker-compose-build.yaml up --exit-code-from app --build
45+
docker compose -f docker-compose-build.yaml up --exit-code-from app --build
4646
echo "DJ_VERSION=${DJ_VERSION}" >> $GITHUB_ENV
4747
- if: matrix.py_ver == '3.9' && matrix.distro == 'debian'
4848
name: Add pip artifacts
@@ -87,7 +87,7 @@ jobs:
8787
COMPOSE_HTTP_TIMEOUT: "120"
8888
run: |
8989
export HOST_UID=$(id -u)
90-
docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
90+
docker compose -f LNX-docker-compose.yml up --build --exit-code-from app
9191
lint:
9292
runs-on: ubuntu-latest
9393
strategy:
@@ -218,7 +218,7 @@ jobs:
218218
- name: Publish pip release
219219
run: |
220220
export HOST_UID=$(id -u)
221-
docker-compose -f docker-compose-build.yaml run \
221+
docker compose -f docker-compose-build.yaml run \
222222
-e TWINE_USERNAME=${TWINE_USERNAME} -e TWINE_PASSWORD=${TWINE_PASSWORD} app \
223223
sh -c "pip install twine && python -m twine upload dist/*"
224224
- name: Login to DockerHub

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- Fixed - `Autopopulate.populate` excludes `reserved` jobs in addition to `ignore` and `error` jobs
1414
- Fixed - Issue [#1159]((https://github.com/datajoint/datajoint-python/pull/1159) (cascading delete) - PR [#1160](https://github.com/datajoint/datajoint-python/pull/1160)
1515
- Changed - Minimum Python version for Datajoint-Python is now 3.8 PR #1163
16+
- Fixed - `docker compose` commands in CI [#1164](https://github.com/datajoint/datajoint-python/pull/1164)
1617

1718
### 0.14.1 -- Jun 02, 2023
1819
- Fixed - Fix altering a part table that uses the "master" keyword - PR [#991](https://github.com/datajoint/datajoint-python/pull/991)

0 commit comments

Comments
 (0)