Overhaul package versioning for 2023

.circleci/config.yml

@@ -1,77 +1,75 @@
 version: 2
 jobs:
-  build-python37:  # required for runs that don't use workflows
+  build-python39:  # required for runs that don't use workflows
     docker:
       - image: continuumio/miniconda3
-    working_directory: ~/circleci-pyrcel37
+    working_directory: ~/circleci-pyrcel39
     steps:
       - checkout
       # Download and cache dependencies
       - restore_cache:
           keys:
             - v2-dependencies
-      - run: echo "Building Python 3.7 version..."
+      - run: echo "Building Python 3.9 version..."
       - run:
           name: Create Conda Environment
           command: |
-            conda env create -f ci/requirements-py37.yml
+            conda env create -f ci/requirements-py39.yml
       - run:
           name: Install and Test Pyrcel Simulation
           command: |
             source activate pyrcel
             pip install -e .
             run_parcel examples/simple.yml
 
-  build-python36:  # required for runs that don't use workflows
+  build-python38:  # required for runs that don't use workflows
     docker:
       - image: continuumio/miniconda3
-    working_directory: ~/circleci-pyrcel36
+    working_directory: ~/circleci-pyrcel38
     steps:
       - checkout
       # Download and cache dependencies
       - restore_cache:
           keys:
             - v2-dependencies
-      - run: echo "Building Python 3.6 version..."
+      - run: echo "Building Python 3.8 version..."
       - run:
           name: Create Conda Environment
           command: |
-            conda env create -f ci/requirements-py36.yml
+            conda env create -f ci/requirements-py38.yml
       - run:
           name: Install and Test Pyrcel Simulation
           command: |
             source activate pyrcel
             pip install -e .
             run_parcel examples/simple.yml
 
-#  build-python35:  # required for runs that don't use workflows
-#    docker:
-#      - image: continuumio/miniconda3
-#    working_directory: ~/circleci-pyrcel35
-#    steps:
-#      - checkout
-#      # Download and cache dependencies
-#      - restore_cache:
-#          keys:
-#            - v2-dependencies
-#      - run: echo "Building Python 3.5 version..."
-#      - run:
-#          name: Create Conda Environment
-#          command: |
-#            conda env create -f ci/requirements-py35.yml
-#      - run:
-#          name: Install and Test Pyrcel Simulation
-#          command: |
-#            source activate pyrcel
-#            pip install -e .
-#            run_parcel examples/simple.yml
-
-
+  build-python37:  # required for runs that don't use workflows
+    docker:
+      - image: continuumio/miniconda3
+    working_directory: ~/circleci-pyrcel37
+    steps:
+      - checkout
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v2-dependencies
+      - run: echo "Building Python 3.7 version..."
+      - run:
+          name: Create Conda Environment
+          command: |
+            conda env create -f ci/requirements-py37.yml
+      - run:
+          name: Install and Test Pyrcel Simulation
+          command: |
+            source activate pyrcel
+            pip install -e .
+            run_parcel examples/simple.yml
 
 workflows:
   version: 2
   build:
     jobs:
-      - build-python37
-      - build-python36
-#      - build-python35
+      - build-python39
+      - build-python38
+      - build-python37

README.md

@@ -31,12 +31,12 @@ Requirements
 
 **Required**
 
-* Python >= 3.5
+* Python >= 3.7
 * [numba](http://numba.pydata.org)
 * [NumPy](http://www.numpy.org)
 * [SciPy](http://www.scipy.org)
-* [pandas](http://pandas.pydata.org) - v0.17+
-* [xarray](http://xarray.pydata.org/en/stable/) - v0.7+
+* [pandas](http://pandas.pydata.org) - v0.25+
+* [xarray](http://xarray.pydata.org/en/stable/) - v2023+
 * [PyYAML](http://pyyaml.org/)
 
 **Optional**

ci/requirements-py36.yml → ci/requirements-py38.yml

@@ -2,7 +2,7 @@ name: pyrcel
 channels:
     - conda-forge
 dependencies:
-    - python=3.6
+    - python=3.8
     - gcc_linux-64
     - gxx_linux-64
     - assimulo

ci/requirements-py35.yml → ci/requirements-py39.yml

@@ -2,11 +2,10 @@ name: pyrcel
 channels:
     - conda-forge
 dependencies:
-    - python=3.5
+    - python=3.9
     - gcc_linux-64
     - gxx_linux-64
     - assimulo
-    - cython>=0.19
     - numba
     - numpy
     - pandas

requirements.txt

@@ -1,6 +1,8 @@
-Assimulo==3.0
-numba==0.45.1
-numpy==1.22.0
-pandas==0.25.1
-scipy==1.3.1
-xarray==0.12.3
+Cython
+numba<0.57
+numpy<1.25
+pandas==2
+pyyaml
+scipy==1.11
+setuptools==60
+xarray==2023.7

setup.py

@@ -64,12 +64,14 @@ def _write_version_file():
     download_url="https://github.com/darothen/pyrcel",
     # TODO: Update install requirements and corresponding documentation
     install_requires=[
-        "Assimulo==3.0",
-        "numba==0.45.1",
-        "numpy==1.22.0",
-        "pandas==0.25.1",
-        "scipy==1.3.1",
-        "xarray==0.12.3",
+        'Cython',
+        'numba<0.57',
+        'numpy<1.25',
+        'pandas==2',
+        'pyyaml',
+        'scipy==1.11',
+        'setuptools==60',
+        'xarray==2023.7',
     ],
     packages=["pyrcel"],
     package_data={"pyrcel": ["data/std_atm.csv"]},
@@ -82,9 +84,9 @@ def _write_version_file():
         "License :: OSI Approved :: BSD License",
         "Natural Language :: English",
         "Operating System :: Unix",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Topic :: Scientific/Engineering :: Atmospheric Science",
     ],
 )