Skip to content

Commit 6485b10

Browse files
committed
make release-tag: Merge branch 'master' into stable
2 parents ad53bd6 + 2711beb commit 6485b10

File tree

11 files changed

+26
-35
lines changed

11 files changed

+26
-35
lines changed

.github/workflows/integration.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,14 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
python-version: ['3.7', '3.8', '3.9', '3.10']
13+
python-version: ['3.8', '3.9', '3.10', '3.11']
1414
os: [ubuntu-latest, macos-latest, windows-latest]
1515
steps:
1616
- uses: actions/checkout@v1
1717
- name: Set up Python ${{ matrix.python-version }}
1818
uses: actions/setup-python@v2
1919
with:
2020
python-version: ${{ matrix.python-version }}
21-
- if: matrix.os == 'windows-latest'
22-
name: Install dependencies - Windows
23-
run: |
24-
python -m pip install --upgrade pip
25-
python -m pip install 'torch>=1.8,<2' -f https://download.pytorch.org/whl/cpu/torch/
2621
- name: Install dependencies
2722
run: |
2823
python -m pip install --upgrade pip

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v1
13-
- name: Set up Python 3.8
13+
- name: Set up Python 3.9
1414
uses: actions/setup-python@v2
1515
with:
16-
python-version: 3.8
16+
python-version: 3.9
1717
- name: Install dependencies
1818
run: |
1919
python -m pip install --upgrade pip

.github/workflows/minimum.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,14 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
python-version: ['3.7', '3.8', '3.9', '3.10']
13+
python-version: ['3.8', '3.9', '3.10', '3.11']
1414
os: [ubuntu-latest, macos-latest, windows-latest]
1515
steps:
1616
- uses: actions/checkout@v1
1717
- name: Set up Python ${{ matrix.python-version }}
1818
uses: actions/setup-python@v2
1919
with:
2020
python-version: ${{ matrix.python-version }}
21-
- if: matrix.os == 'windows-latest' && matrix.python-version != 3.10
22-
name: Install dependencies - Windows
23-
run: |
24-
python -m pip install --upgrade pip
25-
python -m pip install 'torch==1.8' -f https://download.pytorch.org/whl/cpu/torch/
26-
- if: matrix.os == 'windows-latest' && matrix.python-version == 3.10
27-
name: Install dependencies - Windows
28-
run: |
29-
python -m pip install --upgrade pip
30-
python -m pip install 'torch==1.11.0' -f https://download.pytorch.org/whl/cpu/torch/
3121
- name: Install dependencies
3222
run: |
3323
python -m pip install --upgrade pip

.github/workflows/readme.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
python-version: ['3.7', '3.8', '3.9', '3.10']
13+
python-version: ['3.8', '3.9', '3.10', '3.11']
1414
os: [ubuntu-latest, macos-latest] # skip windows bc rundoc fails
1515
steps:
1616
- uses: actions/checkout@v1

.github/workflows/unit.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,14 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
python-version: ['3.7', '3.8', '3.9', '3.10']
13+
python-version: ['3.8', '3.9', '3.10', '3.11']
1414
os: [ubuntu-latest, macos-latest, windows-latest]
1515
steps:
1616
- uses: actions/checkout@v1
1717
- name: Set up Python ${{ matrix.python-version }}
1818
uses: actions/setup-python@v2
1919
with:
2020
python-version: ${{ matrix.python-version }}
21-
- if: matrix.os == 'windows-latest'
22-
name: Install dependencies - Windows
23-
run: |
24-
python -m pip install --upgrade pip
25-
python -m pip install 'torch>=1.8,<2' -f https://download.pytorch.org/whl/cpu/torch/
2621
- name: Install dependencies
2722
run: |
2823
python -m pip install --upgrade pip

HISTORY.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# History
22

3+
## 0.4.2 - 2023-07-25
4+
5+
This release drops support for Python 3.7 and adds support for Python 3.11.
6+
7+
### Maintenance
8+
9+
* Add support for Python 3.11 - Issue [#74](https://github.com/sdv-dev/DeepEcho/issues/74) by @fealho
10+
* Drop support for Python 3.7 - Issue [#75](https://github.com/sdv-dev/DeepEcho/issues/75) by @R-Palazzo
11+
312
## 0.4.1 - 2023-05-02
413

514
This release adds support for Pandas 2.0 and PyTorch 2.0!

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Requirements
44

55
**DeepEcho** has been developed and tested on
6-
[Python 3.7, 3.8, 3.9, 3.10 and 3.11](https://www.python.org/downloads/)
6+
[Python 3.8, 3.9, 3.10 and 3.11](https://www.python.org/downloads/)
77

88
Also, although it is not strictly required, the usage of a [virtualenv](
99
https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid

deepecho/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
__author__ = 'DataCebo, Inc.'
44
__email__ = '[email protected]'
5-
__version__ = '0.4.1'
5+
__version__ = '0.4.2.dev1'
66
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
77

88
from deepecho.demo import load_demo

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.4.1
2+
current_version = 0.4.2.dev1
33
commit = True
44
tag = True
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?

setup.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
"numpy>=1.20.0,<2;python_version<'3.10'",
1616
"numpy>=1.23.3,<2;python_version>='3.10'",
1717
"pandas>=1.1.3;python_version<'3.10'",
18-
"pandas>=1.3.4;python_version>='3.10'",
18+
"pandas>=1.3.4;python_version>='3.10' and python_version<'3.11'",
19+
"pandas>=1.5.0;python_version>='3.11'",
1920
"torch>=1.8.0;python_version<'3.10'",
20-
"torch>=1.11.0;python_version>='3.10'",
21+
"torch>=1.11.0;python_version>='3.10' and python_version<'3.11'",
22+
"torch>=2.0.0;python_version>='3.11'",
2123
'tqdm>=4.15,<5',
2224
]
2325

@@ -86,10 +88,10 @@
8688
'License :: Free for non-commercial use',
8789
'Natural Language :: English',
8890
'Programming Language :: Python :: 3',
89-
'Programming Language :: Python :: 3.7',
9091
'Programming Language :: Python :: 3.8',
9192
'Programming Language :: Python :: 3.9',
9293
'Programming Language :: Python :: 3.10',
94+
'Programming Language :: Python :: 3.11',
9395
'Topic :: Scientific/Engineering :: Artificial Intelligence',
9496
],
9597
description='Create sequential synthetic data of mixed types using a GAN.',
@@ -105,11 +107,11 @@
105107
long_description_content_type='text/markdown',
106108
name='deepecho',
107109
packages=find_packages(include=['deepecho', 'deepecho.*']),
108-
python_requires='>=3.7,<3.11',
110+
python_requires='>=3.8,<3.12',
109111
setup_requires=setup_requires,
110112
test_suite='tests',
111113
tests_require=tests_require,
112114
url='https://github.com/sdv-dev/DeepEcho',
113-
version='0.4.1',
115+
version='0.4.2.dev1',
114116
zip_safe=False,
115117
)

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py38-lint, py3{7,8,9,10}-{readme,unit,integration,minimum,tutorials}
2+
envlist = py38-lint, py3{8,9,10,11}-{readme,unit,integration,minimum,tutorials}
33

44
[testenv]
55
skipsdist = false

0 commit comments

Comments
 (0)