more dist cleanup

deathbeds · Nov 6, 2022 · 1aec094 · 1aec094
1 parent 5b91206
commit 1aec094
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -244,12 +244,6 @@ jobs:
             CI_ARTIFACT: 'sdist'
           - python-version: '3.11'
             CI_ARTIFACT: 'wheel'
-          - os: macos
-            CONDA_SHELL: bash -l {0}
-          - os: ubuntu
-            CONDA_SHELL: bash -l {0}
-          - os: windows
-            CONDA_SHELL: cmd /C CALL {0}
     env:
       TESTING_IN_CI: '1'
     steps:
@@ -288,13 +282,25 @@ jobs:
           name: ipydrawio-${{ github.run_number }}-dist
           path: ./dist
 
-      - name: test (unit)
-        shell: ${{ matrix.CONDA_SHELL }}
+      - name: unit test (unix)
+        if: matrix.os != 'windows'
+        shell: bash -l {0}
         run: doit test:pytest:* || doit test:pytest:*
 
-      - name: test (acceptance)
-        shell: ${{ matrix.CONDA_SHELL }}
-        run: doit test
+      - name: acceptance test (unix)
+        if: matrix.os != 'windows'
+        shell: bash -l {0}
+        run: doit test || doit test
+
+      - name: unit test (windows)
+        if: matrix.os == 'windows'
+        shell: cmd /C CALL {0}
+        run: doit test:pytest:* || doit test:pytest:*
+
+      - name: acceptance test (windows)
+        if: matrix.os == 'windows'
+        shell: cmd /C CALL {0}
+        run: doit test || doit test
 
       - name: upload coverage
         shell: bash -l {0}

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -59,15 +59,16 @@ outputs:
         - ipywidgets >=7.6,<9
         - python >=3.7
     test:
+      source_files:
+        - tests
       imports:
         - ipydrawio_widgets
       requires:
         - pip
-        - pytest-console-scripts
-        - pytest-cov
+        - pytest
       commands:
         - pip check
-        - pytest -vv --pyargs ipydrawio_widgets
+        - pytest -vv
     about:
       home: https://github.com/deathbeds/ipydrawio
       summary: Draw.io Diagrams as Jupyter Widgets (kernel only)
@@ -94,6 +95,8 @@ outputs:
         - lxml
         - python >=3.7
     test:
+      source_files:
+        - tests
       imports:
         - ipydrawio
       requires:
@@ -109,7 +112,7 @@ outputs:
         - cat labextensions | grep -ie "@deathbeds/ipydrawio-webpack .*OK"
         - cat labextensions | grep -ie "@deathbeds/ipydrawio-notebook .*OK"
         - cat labextensions | grep -ie "@deathbeds/ipydrawio-jupyter-templates .*OK"
-        - pytest -vv --pyargs ipydrawio
+        - pytest -vv
     about:
       home: https://github.com/deathbeds/ipydrawio
       summary: Draw.io Diagrams as Jupyter Widgets
@@ -143,6 +146,8 @@ outputs:
         - python >=3.7
         - requests_cache
     test:
+      source_files:
+        - tests
       imports:
         - ipydrawio_export
       requires:
@@ -159,7 +164,7 @@ outputs:
         - jupyter serverextension list
         - jupyter serverextension list 1>serverextensions 2>&1
         - cat serverextensions | grep -ie "ipydrawio_export .*OK"
-        - pytest -vv --pyargs ipydrawio_export --script-launch-mode=subprocess  # [unix]
+        - pytest -vv --script-launch-mode=subprocess  # [unix]
     about:
       home: https://github.com/deathbeds/ipydrawio
       summary: PDF export for IPyDrawio

diff --git a/py_packages/ipydrawio-export/setup.cfg b/py_packages/ipydrawio-export/setup.cfg
@@ -43,6 +43,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Topic :: Multimedia :: Graphics :: Editors :: Vector-Based
     Topic :: Multimedia :: Graphics :: Presentation
 

diff --git a/py_packages/ipydrawio-widgets/setup.cfg b/py_packages/ipydrawio-widgets/setup.cfg
@@ -41,6 +41,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [options]
 python_requires = >=3.7

diff --git a/py_packages/ipydrawio/setup.cfg b/py_packages/ipydrawio/setup.cfg
@@ -44,6 +44,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Topic :: Multimedia :: Graphics :: Editors :: Vector-Based
     Topic :: Multimedia :: Graphics :: Presentation