diff --git a/.readthedocs.yml b/.readthedocs.yml
index edfe1b46..bcbc31d3 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -14,7 +14,7 @@ formats: all
# Optionally set the version of Python and requirements required to build your docs
python:
- version: 3.7
+ version: 3.8
install:
- requirements: doc/requirements.txt
system_packages: true
diff --git a/README.rst b/README.rst
index 5444cd7f..320c1373 100644
--- a/README.rst
+++ b/README.rst
@@ -49,7 +49,7 @@ You can install using either ``pip`` or ``conda``. See details `here `__
- `gridmap `__ (only required if you plan
to run things in parallel on a DRMAA-compatible cluster)
diff --git a/conda-recipe/README.md b/conda-recipe/README.md
index ea3f74a0..92e286b4 100644
--- a/conda-recipe/README.md
+++ b/conda-recipe/README.md
@@ -2,10 +2,9 @@
1. To create the SKLL conda package run: `conda build -c conda-forge .`
-2. This will create python 3.7, 3.8, and 3.9 packages for your native platform, e.g., `osx-64`.
+2. This will create a single noarch Python package.
-3. Convert these built packages for the other two platforms. For example, if you ran the above command on macOS, run `conda convert -p linux-64 -p win-64 `, where `` are the package files that were created in step 2.
+3. Upload the package file to anaconda.org using `anaconda upload --user ets `.
-4. Upload all 9 package files (3 Python versions x 3 platforms) to anaconda.org using `anaconda upload --user ets `.
-
-5. Test the package: `conda create -n foobar -c conda-forge -c ets python=3.9 skll`. This should _always_ install the latest package.
+4. Test the package: `conda create -n foobar -c ets -c conda-forge python=3.9 skll`. This should _always_ install the latest package from the ``ets`` conda channel.
+ Note that we are specifying the ``ets`` channel first since SKLL is now also in conda-forge but runs a version behind until we do the actual release on GitHub.
diff --git a/conda-recipe/skll/conda_build_config.yaml b/conda-recipe/skll/conda_build_config.yaml
deleted file mode 100644
index e0c6422a..00000000
--- a/conda-recipe/skll/conda_build_config.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-python:
- - 3.7
- - 3.8
- - 3.9
-numpy: 1.20.0
-pin_run_as_build:
- numpy:
- max_pin: x
-ignore_version: numpy
diff --git a/conda-recipe/skll/meta.yaml b/conda-recipe/skll/meta.yaml
index cf1c1e0b..5271af38 100644
--- a/conda-recipe/skll/meta.yaml
+++ b/conda-recipe/skll/meta.yaml
@@ -7,6 +7,7 @@ source:
build:
number: 0
+ noarch: python
script:
- cd $SRC_DIR
- "{{ PYTHON }} -m pip install . --no-deps -vv"
@@ -32,21 +33,11 @@ build:
requirements:
build:
- - python
+ - python >=3.8
- pip
- setuptools
- - beautifulsoup4
- - joblib
- - numpy {{ numpy }}
- - pandas
- - ruamel.yaml
- - scikit-learn >=1.0.1,<=1.0.2
- - scipy
- - seaborn
- - tabulate
-
run:
- - python
+ - python >=3.8
- beautifulsoup4
- joblib
- numpy
diff --git a/setup.py b/setup.py
index 30e1ea55..3f30df13 100644
--- a/setup.py
+++ b/setup.py
@@ -52,8 +52,8 @@ def requirements():
'Operating System :: Unix',
'Operating System :: MacOS',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
],
zip_safe=False)
diff --git a/skll/version.py b/skll/version.py
index 9338f5e5..e49b198d 100644
--- a/skll/version.py
+++ b/skll/version.py
@@ -8,5 +8,5 @@
:organization: ETS
"""
-__version__ = '2.5.0'
+__version__ = '3.0.0'
VERSION = tuple(int(x) for x in __version__.split('.'))