Skip to content

Commit

Permalink
Merge #763 from pc494/attempting-python39
Browse files Browse the repository at this point in the history
Testing on python 3.9
  • Loading branch information
pc494 committed Apr 14, 2021
2 parents ac0fd13 + 1e261bc commit e7d4514
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.7, 3.8]
python-version: [3.7, 3.8, 3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## 2021-04-14 - version 0.13.2
### Added
- Code now support python 3.9
- Code now runs on hyperspy 1.6.2
### Fixed
- np.bool replaced by bool
- np.object replaced by object

## 2021-03-21 - version 0.13.1
### Fixed
- load_mib (#734)
Expand Down
2 changes: 1 addition & 1 deletion pyxem/release_info.py
@@ -1,5 +1,5 @@
name = "pyxem"
version = "0.13.1"
version = "0.13.2"
author = "Duncan Johnstone, Phillip Crout, Magnus Nord"
copyright = "Copyright 2016-2021, The pyxem developers"
credits = [
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Expand Up @@ -49,6 +49,7 @@
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
Expand All @@ -64,14 +65,14 @@
"matplotlib >= 3.1.1", # 3.1.0 failed
"scikit-learn >= 0.19", # reason unknown
"hyperspy == 1.6.2", # significant improvements
"diffsims >= 0.4.0,<0.5",
"diffsims ~= 0.4",
"lmfit >= 0.9.12",
"pyfai",
"ipywidgets",
"numba",
"orix >= 0.3",
],
python_requires=">=3.0, <3.9", # some dependencies do not currently support 3.9 (Jan 2020)
python_requires=">=3.7",
package_data={
"": ["LICENSE", "readme.rst"],
"pyxem": ["*.py", "hyperspy_extension.yaml"],
Expand Down

0 comments on commit e7d4514

Please sign in to comment.