Skip to content

Commit 3f19598

Browse files
Update release date, enable unused imports check, dynamically check GHA's uid/gid setting.
1 parent 0d4646a commit 3f19598

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

.github/workflows/development.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- '!gh-pages' # exclude gh-pages branch
77
- '!stage*' # exclude branches beginning with stage
88
tags:
9-
- '\d+\.\d+\.\d+'
9+
- '\d+\.\d+\.\d+' # only semver tags
1010
pull_request:
1111
branches:
1212
- '**' # every branch
@@ -64,19 +64,20 @@ jobs:
6464
run: flake8 datajoint --count --select=E9,F63,F7,F82 --show-source --statistics
6565
- name: Run primary tests
6666
env:
67-
UID: "1001"
68-
GID: "121"
6967
PY_VER: ${{matrix.py_ver}}
7068
MYSQL_VER: ${{matrix.mysql_ver}}
7169
ALPINE_VER: "3.10"
7270
MINIO_VER: RELEASE.2021-09-03T03-56-13Z
7371
COMPOSE_HTTP_TIMEOUT: "120"
7472
COVERALLS_SERVICE_NAME: travis-ci
7573
COVERALLS_REPO_TOKEN: fd0BoXG46TPReEem0uMy7BJO5j0w1MQiY
76-
run: docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
74+
run: |
75+
export HOST_UID=$(id -u)
76+
export HOST_GID=$(id -g)
77+
docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
7778
- name: Run style tests
7879
run: |
79-
flake8 --ignore=E203,E722,F401,W503 datajoint \
80+
flake8 --ignore=E203,E722,W503 datajoint \
8081
--count --max-complexity=62 --max-line-length=127 --statistics
8182
black datajoint --check -v
8283
black tests --check -v

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Release notes
22

3-
### 0.13.8 -- Sep 28, 2022
3+
### 0.13.8 -- Sep 21, 2022
44
* Bugfix - Fix queries with backslashes ([#999](https://github.com/datajoint/datajoint-python/issues/999)) PR [#1052](https://github.com/datajoint/datajoint-python/pull/1052)
55

66
### 0.13.7 -- Jul 13, 2022

LNX-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ services:
8585
# jupyter notebook
8686
# ports:
8787
# - "8888:8888"
88-
user: ${UID}:${GID}
88+
user: ${HOST_UID}:${HOST_GID}
8989
volumes:
9090
- .:/src
9191
- /tmp/.X11-unix:/tmp/.X11-unix:rw

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ PY_VER=3.7
132132
ALPINE_VER=3.10
133133
MYSQL_VER=5.7
134134
MINIO_VER=RELEASE.2021-09-03T03-56-13Z
135-
UID=1000
136-
GID=1000
135+
HOST_UID=1000
136+
HOST_GID=1000
137137
```
138138
* `cp local-docker-compose.yml docker-compose.yml`
139139
* `docker-compose up -d` (Note configured `JUPYTER_PASSWORD`)

docs/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
mkdocs serve --config-file ./docs/mkdocs.yaml -a 0.0.0.0:80
2929
elif echo "$${MODE}" | grep -iE "qa|build" &>/dev/null; then
3030
git branch -D gh-pages || true
31-
git fetch $${UPSTREAM_REPO} gh-pages:gh-pages
31+
git fetch $${UPSTREAM_REPO} gh-pages:gh-pages || true
3232
mike deploy --config-file ./docs/mkdocs.yaml -u $$(grep -oE '\d+\.\d+' /main/$${PACKAGE}/version.py) latest
3333
mike set-default --config-file ./docs/mkdocs.yaml latest
3434
if echo "$${MODE}" | grep -i qa &>/dev/null; then

local-docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ services:
9090
# nosetests -vs --tests=tests.test_external_class:test_insert_and_fetch; #run specific basic test
9191
# nosetests -vs --tests=tests.test_fetch:TestFetch.test_getattribute_for_fetch1; #run specific Class test
9292
# flake8 datajoint --count --select=E9,F63,F7,F82 --show-source --statistics
93-
# flake8 --ignore=E203,E722,F401,W503 datajoint --count --max-complexity=62 --max-line-length=127 --statistics
93+
# flake8 --ignore=E203,E722,W503 datajoint --count --max-complexity=62 --max-line-length=127 --statistics
9494
# black datajoint --check -v
9595
## Interactive Jupyter Notebook environment
9696
jupyter notebook &
@@ -103,7 +103,7 @@ services:
103103
ports:
104104
- "8888:8888"
105105
- "5678:5678"
106-
user: ${UID}:${GID}
106+
user: ${HOST_UID}:${HOST_GID}
107107
volumes:
108108
- .:/src
109109
- /tmp/.X11-unix:/tmp/.X11-unix:rw

0 commit comments

Comments
 (0)