Skip to content

Commit 1502fe8

Browse files
authored
Merge pull request #711 from EducationalTestingService/release/3.0.0
Preparing for v3.0.0 Release
2 parents 61bef9c + c02377b commit 1502fe8

File tree

7 files changed

+11
-30
lines changed

7 files changed

+11
-30
lines changed

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ formats: all
1414

1515
# Optionally set the version of Python and requirements required to build your docs
1616
python:
17-
version: 3.7
17+
version: 3.8
1818
install:
1919
- requirements: doc/requirements.txt
2020
system_packages: true

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ You can install using either ``pip`` or ``conda``. See details `here <https://sk
4949
Requirements
5050
~~~~~~~~~~~~
5151

52-
- Python 3.7, 3.8, or 3.9
52+
- Python 3.8, 3.9, or 3.10
5353
- `beautifulsoup4 <http://www.crummy.com/software/BeautifulSoup/>`__
5454
- `gridmap <https://pypi.org/project/gridmap/>`__ (only required if you plan
5555
to run things in parallel on a DRMAA-compatible cluster)

conda-recipe/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
1. To create the SKLL conda package run: `conda build -c conda-forge .`
44

5-
2. This will create python 3.7, 3.8, and 3.9 packages for your native platform, e.g., `osx-64`.
5+
2. This will create a single noarch Python package.
66

7-
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 <packages files>`, where `<packages_files>` are the package files that were created in step 2.
7+
3. Upload the package file to anaconda.org using `anaconda upload --user ets <path_to_file>`.
88

9-
4. Upload all 9 package files (3 Python versions x 3 platforms) to anaconda.org using `anaconda upload --user ets <path_to_files>`.
10-
11-
5. Test the package: `conda create -n foobar -c conda-forge -c ets python=3.9 skll`. This should _always_ install the latest package.
9+
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.
10+
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.

conda-recipe/skll/conda_build_config.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

conda-recipe/skll/meta.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ source:
77

88
build:
99
number: 0
10+
noarch: python
1011
script:
1112
- cd $SRC_DIR
1213
- "{{ PYTHON }} -m pip install . --no-deps -vv"
@@ -32,21 +33,11 @@ build:
3233

3334
requirements:
3435
build:
35-
- python
36+
- python >=3.8
3637
- pip
3738
- setuptools
38-
- beautifulsoup4
39-
- joblib
40-
- numpy {{ numpy }}
41-
- pandas
42-
- ruamel.yaml
43-
- scikit-learn >=1.0.1,<=1.0.2
44-
- scipy
45-
- seaborn
46-
- tabulate
47-
4839
run:
49-
- python
40+
- python >=3.8
5041
- beautifulsoup4
5142
- joblib
5243
- numpy

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ def requirements():
5252
'Operating System :: Unix',
5353
'Operating System :: MacOS',
5454
'Programming Language :: Python :: 3',
55-
'Programming Language :: Python :: 3.7',
5655
'Programming Language :: Python :: 3.8',
5756
'Programming Language :: Python :: 3.9',
57+
'Programming Language :: Python :: 3.10',
5858
],
5959
zip_safe=False)

skll/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
:organization: ETS
99
"""
1010

11-
__version__ = '2.5.0'
11+
__version__ = '3.0.0'
1212
VERSION = tuple(int(x) for x in __version__.split('.'))

0 commit comments

Comments
 (0)