Merge branch 'master' of https://github.com/alchem0x2A/py-wdf-reader

alchem0x2A · Aug 6, 2020 · 396bbf8 · 396bbf8
2 parents 4cf5031 + 25c2445
commit 396bbf8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/.github/workflows/conda-upload.yml b/.github/workflows/conda-upload.yml
@@ -0,0 +1,19 @@
+# Upload python package to conda forge
+
+name: publish_conda
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: publish-to-conda
+      uses: fcakyon/[email protected]
+      with:
+        subdir: 'conda'
+        anacondatoken: ${{ secrets.ANACONDA_TOKEN }}
+        platforms: 'win osx linux'
diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
@@ -5,7 +5,7 @@ name: Upload Python Package
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   deploy:

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -2,7 +2,7 @@
 {% set version = data['version'] %}
 
 package:
-  name: renishawwire
+  name: renishaw_wire
   version: {{ data['version'] }}
 
 source:
@@ -21,6 +21,8 @@ requirements:
   run:
     - python
     - numpy >=1.12.0
+    - matplotlib >=2.1.0
+    - Pillow >=3.4.0
 
 test:
   imports:
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ name: Upload Python Package @@
     on:
       release:
-        types: [created]
+        types: [published]
     jobs:
       deploy:
@@ Expand Down @@