Remove support for Python v2.x

- Prepare for introducing vtk/pyvista
sayerhs · Jul 6, 2021 · 65ddc7a · 65ddc7a
1 parent bfecd0d
commit 65ddc7a
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 83 deletions.
diff --git a/etc/caelus2-dev.yml b/etc/caelus2-dev.yml
diff --git a/etc/caelus2.yml b/etc/caelus2.yml
diff --git a/etc/caelus3-dev.yml b/etc/caelus3-dev.yml
@@ -8,10 +8,10 @@
 #    conda env create -f etc/caelus3.yml
 #
 
-name: caelus3-dev
+name: caelus-dev
 
 dependencies:
-  - python=3
+  - python>=3.6
   - pip
   - six
   - numpy
@@ -22,6 +22,8 @@ dependencies:
   - ply
   - pytz
   - jinja2
+  - vtk
+  - pyvista
   - pytest
   - pylint
   - ipython

diff --git a/etc/caelus3.yml b/etc/caelus3.yml
@@ -5,13 +5,13 @@
 # For use with Python v3.x
 #
 # Usage:
-#    conda env create -f etc/caelus3.yml
+#    conda env create -f etc/caelus.yml
 #
 
-name: caelus3
+name: caelus
 
 dependencies:
-  - python=3
+  - python>=3.6
   - pip
   - six
   - numpy
@@ -22,3 +22,5 @@ dependencies:
   - ply
   - pytz
   - jinja2
+  - vtk
+  - pyvista
diff --git a/etc/conda/caelus/meta.yaml b/etc/conda/caelus/meta.yaml
@@ -23,6 +23,8 @@ requirements:
     - ply
     - pytz
     - jinja2
+    - vtk
+    - pyvista
 
 about:
   home: https://bitbucket.org/appliedccm/cpl

diff --git a/etc/conda/installer/construct-template.yaml b/etc/conda/installer/construct-template.yaml
@@ -21,6 +21,8 @@ specs:
   - pyyaml
   - pytz
   - jinja2
+  - vtk
+  - pyvista
   - caelus
 
 exclude:

diff --git a/etc/requirements-test.txt b/etc/requirements-test.txt
diff --git a/requirements.txt b/requirements.txt
@@ -15,6 +15,8 @@ PyYAML
 pytz
 Jinja2
 ply
+vtk
+pyvista
 #### Additional packages for development
 pytest
 pylint

diff --git a/setup.py b/setup.py
@@ -17,7 +17,6 @@
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: Microsoft :: Windows",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Scientific/Engineering :: Physics",
@@ -39,18 +38,20 @@
     classifiers=classifiers,
     packages=[
         'caelus',
+        'caelus.build',
         'caelus.config',
-        'caelus.utils',
+        'caelus.fvmesh',
+        'caelus.io',
         'caelus.post',
         'caelus.run',
-        'caelus.io',
         'caelus.scripts',
-        'caelus.build',
+        'caelus.utils',
     ],
     entry_points="""
         [console_scripts]
         caelus=caelus.scripts.caelus:main
         caelus_tutorials=caelus.scripts.caelus_tutorials:main
         caelus_sim=caelus.scripts.caelus_sim:main
     """,
+    python_requires='>=3.6',
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,8 @@ requirements: @@
         - ply
         - pytz
         - jinja2
+        - vtk
+        - pyvista
     about:
       home: https://bitbucket.org/appliedccm/cpl
@@ Expand Down @@