Updating with new Phis tests

.github/workflows/conda-package-build.yml

@@ -10,9 +10,9 @@ on:
     branches:
       - '**'
 
-
 jobs:
   build:
     uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@main
     secrets:
       anaconda_token: ${{ secrets.ANACONDA_TOKEN }}
+

README.md

@@ -25,27 +25,26 @@ Follow official website instruction to install miniconda : http://conda.pydata.o
 
 ### User
 
-**Create a new environment with agroservice installed in there :**
+**Create a new environment with agroservices installed in there :**
 ```
-conda create -n agroservices -c conda-forge -c openalea3 agroservices
-conda activate agroservices
+mamba create -n agroservices -c conda-forge -c openalea3 openalea.agroservices
+mamba activate agroservices
 ```
-**In a existing environment :**
+**In an existing environment :**
 ```
-conda install -c openalea3 -c conda-forge agroservices
+mamba install -c openalea3 -c conda-forge openalea.agroservices
 ```
 
 ### From source
 ```
 # Install dependency with conda
-conda create -n agroservices -c conda-forge python
-conda activate agroservices
-conda install -c conda-forge appdirs bs4 pygments colorlog requests requests_cache pytest jsf
+mamba create -n agroservices -f conda/environment.yml
+mamba activate agroservices
 
-# Load agroservice and install
+# Clone agroservice and install
 git clone https://github.com/openalea/agroservices.git
 cd agroservices
-python setup.py develop
+pip install -e .
 
 # (Optional) Test your installation
 cd test; pytest

conda/environment.yml

@@ -0,0 +1,13 @@
+channel:
+  - conda-forge
+dependencies:
+  - python
+  - appdirs
+  - bs4
+  - pygments
+  - colorlog
+  - requests
+  - requests_cache
+  - pytest
+  - jsf
+  - six

conda/meta.yaml

@@ -1,8 +1,8 @@
-{% set data = load_setup_py_data() %}
+{% set version = "1.0.1"%}
 
 package:
   name: agroservices
-  version: {{ data.get('version') }}
+  version: {{ version }}
 
 source:
   path: ..
@@ -11,7 +11,7 @@ build:
   noarch: python
   preserve_egg_dir: True
   number: 0
-  script: {{PYTHON}} setup.py install 
+  script: python -m pip install .
 
 requirements:
   build:
@@ -23,7 +23,8 @@ requirements:
     - bs4 
     - pygments 
     - colorlog 
-    - requests 
+    - requests
+    - pyyaml
     - requests_cache
     - jsf
 
@@ -38,7 +39,7 @@ test:
     - cd test
     - pytest -v --ignore=test_weatherdata.py --ignore=test_dss.py
 about:
-  home: {{ data.get('url') }}
+  home: "https://github.com/openalea/agroservices"
   license: GPL-v3
-  summary: {{ data.get('description') }}
+  summary: "AgroService is a Python package that provides access to IPM Web Services (at least) and a framework to easily implement Web Services wrappers."
 

doc/environment.yml

@@ -3,14 +3,16 @@ channels:
   - conda-forge
 
 dependencies:
- - python=3.8
+ - python
  - appdirs 
  - bs4 
  - pygments 
  - colorlog 
  - requests 
  - requests_cache
  - pytest
- - sphinx_rtd_theme
+ - pydata_sphinx_theme
+ - sphinx-favicon
  - nbsphinx
- - nbsphinx-link
+ - nbsphinx-link
+ - myst-parser

doc/requierements.txt → doc/requirements.txt

@@ -1,10 +1,11 @@
-python=3.8
 appdirs
 bs4
 colorlog
 requests
 requests_cache
 pygments
 nbsphinx
-sphinx_rtd_theme
+pydata_sphinx_theme
 nbsphinx-link
+myst-parser
+sphinx-favicon