Do not depende on pyd, thus making project more portable

katyukha · Sep 11, 2023 · 1a71ed7 · 1a71ed7
1 parent ffaf9e0
commit 1a71ed7
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,8 +27,8 @@ jobs:
 
       - name: Build Odood
         run: |
-          dub build -b release -c bash-autocomplete --override-config=pyd/python38
-          dub build -b release --override-config=pyd/python38
+          dub build -b release -c bash-autocomplete
+          dub build -b release
 
       - name: Prepare dependencies for deb package
         id: prepare_deb_deps
@@ -86,8 +86,8 @@ jobs:
 
       - name: Build Odood
         run: |
-          dub build -b release -c bash-autocomplete --override-config=pyd/python310
-          dub build -b release --override-config=pyd/python310
+          dub build -b release -c bash-autocomplete
+          dub build -b release
 
       - name: Prepare dependencies for deb package
         id: prepare_deb_deps
@@ -152,8 +152,8 @@ jobs:
 
       - name: Build Odood
         run: |
-          dub build -b release -c bash-autocomplete --override-config=pyd/python39
-          dub build -b release --override-config=pyd/python39
+          dub build -b release -c bash-autocomplete
+          dub build -b release
 
       - name: Prepare dependencies for deb package
         id: prepare_deb_deps

diff --git a/.github/workflows/test-os-integrations.yml b/.github/workflows/test-os-integrations.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Run tests (Debian Bullseye)
         if: matrix.image == 'debian:bullseye'
-        run: dub test -b unittest-cov --override-config=pyd/python39
+        run: dub test -b unittest-cov
 
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v3
@@ -103,7 +103,7 @@ jobs:
 
       - name: Run tests (Debian Bullseye)
         if: matrix.image == 'debian:bullseye'
-        run: dub test -b unittest-cov -c unittest-silly --override-config=pyd/python39 -- --threads=1 --verbose
+        run: dub test -b unittest-cov -c unittest-silly
 
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v3

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,10 +28,10 @@ jobs:
 
       - name: Run tests
         if: matrix.os == 'ubuntu-20.04'
-        run: dub test -b unittest-cov --override-config=pyd/python38
+        run: dub test -b unittest-cov
       - name: Run tests
         if: matrix.os == 'ubuntu-22.04'
-        run: dub test -b unittest-cov --override-config=pyd/python310
+        run: dub test -b unittest-cov
 
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v3
@@ -98,15 +98,15 @@ jobs:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
         if: matrix.os == 'ubuntu-20.04'
-        run: dub test -b unittest-cov -c unittest-silly --override-config=pyd/python38
+        run: dub test -b unittest-cov -c unittest-silly
       - name: Run tests (Ubuntu 22.04)
         env:
           POSTGRES_HOST: localhost
           POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
         if: matrix.os == 'ubuntu-22.04'
-        run: dub test -b unittest-cov -c unittest-silly --override-config=pyd/python310
+        run: dub test -b unittest-cov -c unittest-silly
 
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v3

diff --git a/dub.sdl b/dub.sdl
@@ -3,7 +3,6 @@ description "Manage local development odoo installations with ease"
 authors "Dmytro Katyukha"
 copyright "Copyright © 2022-2023, Dmytro Katyukha"
 license "MPL-2.0"
-dependency "pyd" version=">=0.14.4"
 
 dependency ":exception" version="*"
 dependency ":utils" version="*"
@@ -16,8 +15,6 @@ subPackage "./subpackages/cli"
 
 targetPath "build"
 
-subConfiguration "pyd" "python311"
-
 configuration "executable" {
     targetType "executable"
     mainSourceFile "source/odood/app.d"

diff --git a/dub.selections.json b/dub.selections.json
@@ -14,7 +14,6 @@
 		"dyaml": "0.9.2",
 		"east_asian_width": "1.1.0",
 		"prettyprint": "1.0.9",
-		"pyd": "0.14.4",
 		"requests": "2.1.1",
 		"semver": "0.5.0",
 		"silly": "1.1.1",

diff --git a/subpackages/cli/dub.selections.json b/subpackages/cli/dub.selections.json
@@ -1,6 +1,8 @@
 {
 	"fileVersion": 1,
 	"versions": {
+		"bindbc-common": "~master",
+		"bindbc-loader": "1.1.2",
 		"cachetools": "0.3.1",
 		"color": "0.0.9",
 		"colored": "0.0.31",
@@ -13,7 +15,6 @@
 		"east_asian_width": "1.1.0",
 		"odood": {"path":"../../"},
 		"prettyprint": "1.0.9",
-		"pyd": "0.14.4",
 		"requests": "2.1.1",
 		"semver": "0.5.0",
 		"tabletool": "0.5.0",

diff --git a/subpackages/lib/dub.selections.json b/subpackages/lib/dub.selections.json
@@ -1,6 +1,8 @@
 {
 	"fileVersion": 1,
 	"versions": {
+		"bindbc-common": "~master",
+		"bindbc-loader": "1.1.2",
 		"cachetools": "0.3.1",
 		"dini": "2.0.0",
 		"dlibzip": "1.9.2",
@@ -9,7 +11,6 @@
 		"dyaml": "0.9.2",
 		"odood": {"path":"../../"},
 		"prettyprint": "1.0.9",
-		"pyd": "0.14.4",
 		"requests": "2.1.1",
 		"semver": "0.5.0",
 		"thepath": "0.1.8",

diff --git a/subpackages/utils/dub.sdl b/subpackages/utils/dub.sdl
@@ -9,7 +9,6 @@ dependency "thepath" version=">=0.1.7"
 dependency "theprocess" version=">=0.0.5"
 dependency "zipper" version=">=0.0.3"
 dependency "semver" version=">=0.4.0"
-dependency "pyd" version=">=0.14.4"
 dependency "bindbc-loader" version="~>1.1.2"
 dependency "bindbc-common" version="~master"
 

diff --git a/subpackages/utils/dub.selections.json b/subpackages/utils/dub.selections.json
@@ -1,12 +1,13 @@
 {
 	"fileVersion": 1,
 	"versions": {
+		"bindbc-common": "~master",
+		"bindbc-loader": "1.1.2",
 		"cachetools": "0.3.1",
 		"dlibzip": "1.9.2",
 		"dshould": "1.7.1",
 		"odood": {"path":"../../"},
 		"prettyprint": "1.0.9",
-		"pyd": "0.14.4",
 		"requests": "2.1.1",
 		"semver": "0.5.0",
 		"thepath": "0.1.8",