Skip to content

Commit 880be93

Browse files
author
Ivan
committed
Merge branch 'windows' into 'dev'
Windows support See merge request objectbox/objectbox-python!3
2 parents 35e69e1 + 8133c65 commit 880be93

3 files changed

Lines changed: 15 additions & 7 deletions

File tree

.gitlab-ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@ stages:
22
- build
33
- test
44

5-
before_script:
6-
- pip3 install virtualenv pytest
7-
85
build:
96
image: python:latest
107
stage: build
118
script:
9+
- pip3 install virtualenv
1210
# a function to download a library from another Gitlab repos CI artifacts
1311
- 'download_library(){ curl --create-dirs -o objectbox/lib/$1 -H "PRIVATE-TOKEN: $CI_API_TOKEN" $2; }'
1412
- 'download_library x86_64/libobjectbox.so "${OBXLIB_URL_Linux64}"'
1513
- 'download_library x86_64/libobjectbox.dylib "${OBXLIB_URL_Mac64}"'
1614
- 'download_library armv7l/libobjectbox.so "${OBXLIB_URL_LinuxARMv7hf}"'
1715
- 'download_library armv6l/libobjectbox.so "${OBXLIB_URL_LinuxARMv6hf}"'
16+
- 'download_library AMD64/objectbox.dll "${OBXLIB_URL_Win64}"'
1817
- make test
1918
- make build
2019
artifacts:
@@ -25,8 +24,9 @@ build:
2524
.test:
2625
stage: test
2726
script:
27+
- pip3 install --user pytest
2828
- rm -r objectbox
29-
- pip3 install --force-reinstall dist/*.whl
29+
- pip3 install --user --force-reinstall dist/*.whl
3030
- python3 -m pytest
3131

3232
.test:linux:x64:
@@ -65,4 +65,8 @@ test:linux:armv7hf:
6565

6666
test:mac:x64:
6767
extends: .test
68-
tags: [mac, x64, shell, python3]
68+
tags: [mac, x64, shell, python3]
69+
70+
test:windows:x64:
71+
extends: .test
72+
tags: [windows, x64, shell, python3]

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ObjectBox is a superfast database for objects, now also available for Python wit
99
* Linux ARMv6hf (e.g. Raspberry PI Zero)
1010
* Linux ARMv7hf (e.g. Raspberry PI 3)
1111
* MacOS 64-bit
12+
* Windows 64-bit
1213

1314
Getting started
1415
---------------

setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"Programming Language :: C++",
2828

2929
'Operating System :: POSIX :: Linux',
30-
# 'Operating System :: MacOS',
31-
# 'Operating System :: Microsoft :: Windows',
30+
'Operating System :: MacOS',
31+
'Operating System :: Microsoft :: Windows',
3232

3333
"Topic :: Database",
3434
"Topic :: Database :: Database Engines/Servers",
@@ -47,9 +47,12 @@
4747
packages=setuptools.find_packages(),
4848
package_data={
4949
'objectbox': [
50+
# Linux, macOS
5051
'lib/x86_64/*',
5152
'lib/armv7l/*',
5253
'lib/armv6l/*',
54+
# Windows
55+
'lib/AMD64/*',
5356
],
5457
}
5558
)

0 commit comments

Comments
 (0)