Skip to content

Commit

Permalink
make release-tag: Merge branch 'main' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
amontanez24 committed May 13, 2024
2 parents a7a54eb + 9713baa commit e59a013
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 16 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/dependency_checker.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Dependency Checker
on:
schedule:
- cron: '0 0 * * 1-5'
- cron: '0 0 * * 1'
workflow_dispatch:
jobs:
build:
Expand All @@ -22,6 +22,8 @@ jobs:
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
commit-message: Update latest dependencies
author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
committer: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
title: Automated Latest Dependency Updates
body: "This is an auto-generated PR with **latest** dependency updates."
branch: latest-dependency-update
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ jobs:
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11','3.12']
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
include:
- os: macos-latest
python-version: '3.8'
- os: macos-latest
python-version: '3.12'
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/minimum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ jobs:
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11','3.12']
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
include:
- os: macos-latest
python-version: '3.8'
- os: macos-latest
python-version: '3.12'
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/static_code_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
commit-message: Update static code analysis
author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
committer: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
title: Latest Code Analysis
body: "This is an auto-generated PR with the **latest** code analysis results."
branch: static-code-analysis
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ jobs:
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11','3.12']
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
include:
- os: macos-latest
python-version: '3.8'
- os: macos-latest
python-version: '3.12'
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
13 changes: 13 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# History

## v0.10.1 - 2024-05-13

This release removes a warning that was cluttering the console.

### Maintenance

* Cleanup automated PR workflows - Issue [#370](https://github.com/sdv-dev/CTGAN/issues/370) by @R-Palazzo
* Only run unit and integration tests on oldest and latest python versions for macos - Issue [#375](https://github.com/sdv-dev/CTGAN/issues/375) by @R-Palazzo

### Internal

* Remove FutureWarning: Setting an item of incompatible dtype is deprecated - Issue [#373](https://github.com/sdv-dev/CTGAN/issues/373) by @fealho

## v0.10.0 - 2024-04-11

This release adds support for Python 3.12!
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ release: check-release bumpversion-release publish bumpversion-patch
release-test: check-release bumpversion-release-test publish-test bumpversion-revert

.PHONY: release-candidate
release-candidate: check-main publish bumpversion-candidate
release-candidate: check-main publish bumpversion-candidate git-push

.PHONY: release-candidate-test
release-candidate-test: check-clean check-main publish-test
Expand Down
2 changes: 1 addition & 1 deletion ctgan/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

__author__ = 'DataCebo, Inc.'
__email__ = 'info@sdv.dev'
__version__ = '0.10.0'
__version__ = '0.10.1.dev1'

from ctgan.demo import load_demo
from ctgan.synthesizers.ctgan import CTGAN
Expand Down
3 changes: 2 additions & 1 deletion ctgan/data_transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ def transform(self, raw_data):

def _inverse_transform_continuous(self, column_transform_info, column_data, sigmas, st):
gm = column_transform_info.transform
data = pd.DataFrame(column_data[:, :2], columns=list(gm.get_output_sdtypes()))
data = pd.DataFrame(
column_data[:, :2], columns=list(gm.get_output_sdtypes())).astype(float)
data[data.columns[1]] = np.argmax(column_data[:, 1:], axis=1)
if sigmas is not None:
selected_normalized_value = np.random.normal(data.iloc[:, 0], sigmas[st])
Expand Down
7 changes: 4 additions & 3 deletions latest_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
numpy==1.26.4
pandas==2.2.1
torch==2.2.2
tqdm==4.66.2
pandas==2.2.2
rdt==1.12.0
torch==2.3.0
tqdm==4.66.4
9 changes: 4 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@ license = { text = 'BSL-1.1' }
requires-python = '>=3.8,<3.13'
readme = 'README.md'
dependencies = [
"numpy>=1.20.0;python_version<'3.10'",
"numpy>=1.21.0;python_version<'3.10'",
"numpy>=1.23.3,<2;python_version>='3.10' and python_version<'3.12'",
"numpy>=1.26.0,<2;python_version>='3.12'",
"pandas>=1.1.3;python_version<'3.10'",
"pandas>=1.3.4;python_version>='3.10' and python_version<'3.11'",
"pandas>=1.4.0;python_version<'3.11'",
"pandas>=1.5.0;python_version>='3.11' and python_version<'3.12'",
"pandas>=2.1.1;python_version>='3.12'",
"torch>=1.8.0;python_version<'3.10'",
"torch>=1.9.0;python_version<'3.10'",
"torch>=1.11.0;python_version>='3.10' and python_version<'3.11'",
"torch>=2.0.0;python_version>='3.11' and python_version<'3.12'",
"torch>=2.2.0;python_version>='3.12'",
Expand Down Expand Up @@ -152,7 +151,7 @@ add-ignore = ['D107', 'D407', 'D417']
collect_ignore = ['pyproject.toml']

[tool.bumpversion]
current_version = "0.10.0"
current_version = "0.10.1.dev1"
parse = '(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?'
serialize = [
'{major}.{minor}.{patch}.{release}{candidate}',
Expand Down
2 changes: 1 addition & 1 deletion static_code_analysis.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Run started:2024-04-10 18:50:03.907830
Run started:2024-04-11 21:34:18.144855

Test results:
>> Issue: [B101:assert_used] Use of assert detected. The enclosed code will be removed when compiling to optimised byte code.
Expand Down

0 comments on commit e59a013

Please # to comment.