Make merge

Signed-off-by: Bruno Khélifi <khelifi@in2p3.fr>
gammapy · Jul 3, 2023 · 9720f12 · 9720f12
2 parents a1548f0 + 4905bfd
commit 9720f12
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 8 deletions.
diff --git a/download/index.json b/download/index.json
@@ -1,8 +1,18 @@
-{
+{    
     "dev": {
         "notebooks": "https://docs.gammapy.org/dev/_downloads/a5659940aa3f8f568547d47752a43172/tutorials_jupyter.zip",
         "datasets": "https://github.com/gammapy/gammapy-data/tarball/master",
-        "conda-environment": "https://raw.githubusercontent.com/gammapy/gammapy/master/environment-dev.yml" 
+        "conda-environment": "https://raw.githubusercontent.com/gammapy/gammapy/master/environment-dev.yml"
+    },
+    "1.1": {
+        "notebooks": "https://docs.gammapy.org/1.1/_downloads/a5659940aa3f8f568547d47752a43172/tutorials_jupyter.zip",
+        "datasets": "https://github.com/gammapy/gammapy-data/tarball/v1.1",
+        "conda-environment": "https://gammapy.org/download/install/gammapy-1.1-environment.yml"
+    },
+    "1.1rc1": {
+        "notebooks": "https://docs.gammapy.org/1.1rc1/_downloads/a5659940aa3f8f568547d47752a43172/tutorials_jupyter.zip",
+        "datasets": "https://github.com/gammapy/gammapy-data/tarball/master",
+        "conda-environment": "https://gammapy.org/download/install/gammapy-1.1rc1-environment.yml"
     },
    "1.0.1": {
         "notebooks": "https://docs.gammapy.org/1.0.1/_downloads/a5659940aa3f8f568547d47752a43172/tutorials_jupyter.zip",

diff --git a/download/install/gammapy-1.1-environment.yml b/download/install/gammapy-1.1-environment.yml
@@ -0,0 +1,42 @@
+# Conda environment for Gammapy version 1.1
+# Install:    conda env create -f gammapy-1.1-environment.yml
+# Activate:   conda activate gammapy-1.1
+# Deactivate: conda deactivate
+
+name: gammapy-1.1
+
+channels:
+  - conda-forge
+  - sherpa
+
+variables:
+  PYTHONNOUSERSITE: "1"
+
+dependencies:
+  - python=3.9
+  - gammapy=1.1
+  - ipython=8.7.0
+  - cython
+  - jupyter
+  - jupyterlab=3.5
+  - pyyaml=6.0
+  - click=8.1.3
+  - numpy=1.24
+  - scipy=1.10.1
+  - pandas=1.5.2
+  - matplotlib=3.7
+  - astropy=5.3
+  - regions=0.7
+  - iminuit=2.21
+  - sherpa=4.15
+  - healpy=1.16
+  - naima=0.10
+  - pydantic=1.9
+  - emcee=3.1.3
+  - corner=2.2.1
+  - pip
+  - requests
+  - tqdm
+
+
+
diff --git a/download/install/gammapy-1.1rc1-environment.yml b/download/install/gammapy-1.1rc1-environment.yml
@@ -0,0 +1,43 @@
+# Conda environment for Gammapy version 1.1rc1
+# Install:    conda env create -f gammapy-1.1rc1-environment.yml
+# Activate:   conda activate gammapy-1.1rc1
+# Deactivate: conda deactivate
+
+name: gammapy-1.1rc1
+
+channels:
+  - conda-forge
+  - sherpa
+
+variables:
+  PYTHONNOUSERSITE: "1"
+
+dependencies:
+  - python=3.9
+  - ipython=8.7.0
+  - cython
+  - jupyter
+  - jupyterlab=3.5.3
+  - pyyaml=6.0
+  - click=8.1.3
+  - numpy=1.24.3
+  - scipy=1.10.1
+  - pandas=1.5.2
+  - matplotlib=3.7.1
+  - astropy=5.3
+  - regions=0.7
+  - iminuit=2.21
+  - sherpa=4.15.0
+  - healpy=1.16.1
+  - naima=0.10.0
+  - pydantic=1.9.0
+  - emcee=3.1.3
+  - corner=2.2.1
+  - pip
+  - requests
+  - tqdm
+  - pip:
+    - gammapy==1.1rc1
+
+
+
diff --git a/index.html b/index.html
@@ -94,8 +94,9 @@
 
         <br>
         <p class="lead mb-4">
-            <span style="font-size: 100%;"><mark  style="background: #00ced1! important" colot="white"> News:</mark> Nov. 10th, 2022: The LTS v1.0 has been released</span> <br>
-            <span style="font-size: 100%;"><b>News:</b> In 2022, Gammapy received the jury prize of the Open Science awards for open source research software (see <a href="about.html#awards">link</a>)</span>
+            <span style="font-size: 100%;"><b>News:</b> Jun. 13th 2023: Minor version release v1.1 </span> <br>
+            <span style="font-size: 100%;"> Nov. 10th, 2022: The LTS v1.0 has been released</span>  <br>
+            <span style="font-size: 100%;"> In 2022, Gammapy received the jury prize of the Open Science awards for open source research software (see <a href="about.html#awards">link</a>)</span>
         </p>
 
         <br>
@@ -105,14 +106,14 @@
 
         <br>
         <div class="mb-4">
-            <a href="https://docs.gammapy.org/1.0/"
+            <a href="https://docs.gammapy.org/1.1/"
                class="btn btn-lg btn-outline-primary mb-3 mb-md-0 mr-md-3">Documentation</a>
-            <a href="https://docs.gammapy.org/1.0/getting-started/index.html"
+            <a href="https://docs.gammapy.org/1.1/getting-started/index.html"
                class="btn btn-lg btn-outline-primary  mb-3 mb-md-0 mr-md-3">Install</a>
 
 
-            <p class="lead mb-2">Current version: 1.0 </p>
-            <p><a href="https://docs.gammapy.org/1.0/release-notes/v1.0.html">v1.0 changelog</a> and other <a href="news.html">releases</a></p>
+            <p class="lead mb-2">Current version: 1.1 </p>
+            <p><a href="https://docs.gammapy.org/1.1/release-notes/v1.1.html">v1.0.1 changelog</a> and other <a href="news.html">releases</a></p>
         </div>
     </div>
 

diff --git a/news.html b/news.html
@@ -105,6 +105,11 @@ <h1 id="releases"><a href="#releases">Releases</a></h1>
         <!-- tag news -->
         <ul>
             <li>
+                <em>June 13, 2023</em> - Gammapy <strong>1.1</strong>
+                    (<a href="https://docs.gammapy.org/1.1/">documentation</a> ,
+                    <a href="https://docs.gammapy.org/1.1/release-notes/v1.1.html">changelog</a>)
+            </li>
+ 	    <li>
                 <em>March 14, 2023</em> - Gammapy <strong>1.0.1</strong>
                     (<a href="https://docs.gammapy.org/1.0.1/">documentation</a> ,
                     <a href="https://docs.gammapy.org/1.0.1/release-notes/v1.0.1.html">changelog</a>)
@@ -215,6 +220,8 @@ <h2 id="2023"><a href="#2023">2023</a></h2>
         <ul>
             <li><em>October 16-20, 2023</em> - Gammapy Coding Sprint (INAF, Palermo) (<a href="https://github.com/gammapy/gammapy-meetings/blob/master/coding-sprints/2023-10-Palermo" class="card-link">infos</a>) </li>
             <li><em>March 20-24, 2023</em> - Gammapy Coding Sprint (UCM, Madrid) (<a href="https://github.com/gammapy/gammapy-meetings/blob/master/coding-sprints/2023-03-Madrid/README.md" class="card-link">infos</a>) </li>
+        	  <li><em>June 13th, 2023</em> - Gammapy <strong>1.1</strong>
+            (<a href="https://docs.gammapy.org/1.1/release-notes/v1.1.html" class="card-link">changelog</a>)</li>	
           <li><em>March 14th, 2023</em> - Gammapy <strong>1.0.1</strong>
             (<a href="https://docs.gammapy.org/1.0.1/release-notes/v1.0.1.html" class="card-link">changelog</a>)</li>
         </ul>