Skip to content

Commit efd255c

Browse files
NicolasColombiNicolasColombi
committed
Merge branch 'develop' into feature/subset_years
2 parents 753552e + 2da4f3b commit efd255c

File tree

7 files changed

+684
-681
lines changed

7 files changed

+684
-681
lines changed

‎.github/scripts/prepare_release.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def update_changelog(nvn):
9595
if section_name:
9696
changelog.write(f"### {section_name}\n")
9797
lines = [
98-
ln.strip()
98+
ln.rstrip()
9999
for ln in section
100100
if "code freeze date: " not in ln.lower()
101101
]

‎.github/scripts/setup_devbranch.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ git pull
1111

1212
git checkout origin/main \
1313
setup.py \
14-
doc/misc/README.md \
1514
CHANGELOG.md \
1615
*/_version.py
1716

1817
release=`python .github/scripts/setup_devbranch.py`
1918

2019
git add \
2120
setup.py \
22-
doc/misc/README.md \
2321
CHANGELOG.md \
2422
*/_version.py
2523

‎.github/workflows/make-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will create a new release from main
22

33
# the new version number is the old one increased by 1 in the given level [major, minor, patch]
4-
# first, some files are modified (_version.py, setup.py, CHANGELOG.md and doc/misc/README.md)
4+
# first, some files are modified (_version.py, setup.py and CHANGELOG.md
55
# then, a new release is created on GitHub, tagged with v[new version number]
66

77
name: Create a new release

‎.github/workflows/postrelease-setup-devbranch.yml‎

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

33
# the version number of setup.py and _version.py will be taken from main, but have a "-dev" appendix
44
# the CHANGELOG.md file will be updated and have a vanila "Unreleased" section
5-
# the doc/misc/README.md file is taken over from main
65

76
name: Post-release develop setup
87

‎CHANGELOG.md‎

Lines changed: 573 additions & 567 deletions
Large diffs are not rendered by default.

‎climada/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "6.0.1-dev"
1+
__version__ = "6.0.2-dev"

‎setup.py‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,108 @@
1-
"""A setuptools based setup module.
2-
"""
3-
4-
from pathlib import Path
5-
6-
from setuptools import find_namespace_packages, setup
7-
8-
here = Path(__file__).parent.absolute()
9-
10-
# Get the long description from the README file
11-
with open(here.joinpath("README.md"), encoding="utf-8") as f:
12-
long_description = f.read()
13-
14-
# Requirements for documentation
15-
DEPS_DOC = [
16-
"ipython",
17-
"myst-nb",
18-
"readthedocs-sphinx-ext>=2.2",
19-
"sphinx",
20-
"sphinx-book-theme",
21-
"sphinx-markdown-tables",
22-
"sphinx-mdinclude",
23-
]
24-
25-
# Requirements for testing
26-
DEPS_TEST = [
27-
"ipython",
28-
"mccabe>=0.6",
29-
"pylint>=3.0",
30-
"pytest",
31-
"pytest-cov",
32-
"pytest-subtests",
33-
]
34-
35-
# Requirements for development
36-
DEPS_DEV = (
37-
DEPS_DOC
38-
+ DEPS_TEST
39-
+ [
40-
"pre-commit",
41-
]
42-
)
43-
44-
setup(
45-
name="climada",
46-
version="6.0.1-dev",
47-
description="CLIMADA in Python",
48-
long_description=long_description,
49-
long_description_content_type="text/markdown",
50-
url="https://github.com/CLIMADA-project/climada_python",
51-
author="ETH",
52-
author_email="[email protected]",
53-
license="OSI Approved :: GNU Lesser General Public License v3 (GPLv3)",
54-
classifiers=[
55-
"Development Status :: 4 - Beta",
56-
"Programming Language :: Python :: 3",
57-
"Topic :: Scientific/Engineering :: Atmospheric Science",
58-
"Topic :: Scientific/Engineering :: GIS",
59-
"Topic :: Scientific/Engineering :: Mathematics",
60-
],
61-
keywords="climate adaptation",
62-
python_requires=">=3.10,<3.12",
63-
install_requires=[
64-
"bayesian-optimization<2.0",
65-
"bottleneck",
66-
"cartopy",
67-
"cfgrib",
68-
"contextily",
69-
"dask",
70-
"deprecation",
71-
"geopandas",
72-
"h5py",
73-
"haversine",
74-
"matplotlib",
75-
"netcdf4",
76-
"numba",
77-
"openpyxl",
78-
"overpy",
79-
"pandas",
80-
"pandas-datareader",
81-
"pathos",
82-
"peewee",
83-
"pillow",
84-
"pint",
85-
"pycountry",
86-
"pyproj",
87-
"rasterio",
88-
"salib",
89-
"scikit-learn",
90-
"seaborn",
91-
"statsmodels",
92-
"sparse",
93-
"tables",
94-
"tabulate",
95-
"tqdm",
96-
"xarray",
97-
"xlrd",
98-
"xlsxwriter",
99-
],
100-
extras_require={
101-
"doc": DEPS_DOC,
102-
"test": DEPS_TEST,
103-
"dev": DEPS_DEV,
104-
},
105-
packages=find_namespace_packages(include=["climada*"]),
106-
setup_requires=["setuptools_scm"],
107-
include_package_data=True,
108-
)
1+
"""A setuptools based setup module.
2+
"""
3+
4+
from pathlib import Path
5+
6+
from setuptools import find_namespace_packages, setup
7+
8+
here = Path(__file__).parent.absolute()
9+
10+
# Get the long description from the README file
11+
with open(here.joinpath("README.md"), encoding="utf-8") as f:
12+
long_description = f.read()
13+
14+
# Requirements for documentation
15+
DEPS_DOC = [
16+
"ipython",
17+
"myst-nb",
18+
"readthedocs-sphinx-ext>=2.2",
19+
"sphinx",
20+
"sphinx-book-theme",
21+
"sphinx-markdown-tables",
22+
"sphinx-mdinclude",
23+
]
24+
25+
# Requirements for testing
26+
DEPS_TEST = [
27+
"ipython",
28+
"mccabe>=0.6",
29+
"pylint>=3.0",
30+
"pytest",
31+
"pytest-cov",
32+
"pytest-subtests",
33+
]
34+
35+
# Requirements for development
36+
DEPS_DEV = (
37+
DEPS_DOC
38+
+ DEPS_TEST
39+
+ [
40+
"pre-commit",
41+
]
42+
)
43+
44+
setup(
45+
name="climada",
46+
version="6.0.2-dev",
47+
description="CLIMADA in Python",
48+
long_description=long_description,
49+
long_description_content_type="text/markdown",
50+
url="https://github.com/CLIMADA-project/climada_python",
51+
author="ETH",
52+
author_email="[email protected]",
53+
license="OSI Approved :: GNU Lesser General Public License v3 (GPLv3)",
54+
classifiers=[
55+
"Development Status :: 4 - Beta",
56+
"Programming Language :: Python :: 3",
57+
"Topic :: Scientific/Engineering :: Atmospheric Science",
58+
"Topic :: Scientific/Engineering :: GIS",
59+
"Topic :: Scientific/Engineering :: Mathematics",
60+
],
61+
keywords="climate adaptation",
62+
python_requires=">=3.10,<3.12",
63+
install_requires=[
64+
"bayesian-optimization<2.0",
65+
"bottleneck",
66+
"cartopy",
67+
"cfgrib",
68+
"contextily",
69+
"dask",
70+
"deprecation",
71+
"geopandas",
72+
"h5py",
73+
"haversine",
74+
"matplotlib",
75+
"netcdf4",
76+
"numba",
77+
"openpyxl",
78+
"overpy",
79+
"pandas",
80+
"pandas-datareader",
81+
"pathos",
82+
"peewee",
83+
"pillow",
84+
"pint",
85+
"pycountry",
86+
"pyproj",
87+
"rasterio",
88+
"salib",
89+
"scikit-learn",
90+
"seaborn",
91+
"statsmodels",
92+
"sparse",
93+
"tables",
94+
"tabulate",
95+
"tqdm",
96+
"xarray",
97+
"xlrd",
98+
"xlsxwriter",
99+
],
100+
extras_require={
101+
"doc": DEPS_DOC,
102+
"test": DEPS_TEST,
103+
"dev": DEPS_DEV,
104+
},
105+
packages=find_namespace_packages(include=["climada*"]),
106+
setup_requires=["setuptools_scm"],
107+
include_package_data=True,
108+
)

0 commit comments

Comments
 (0)