Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/compatibility python 3.11 #408

Merged
merged 9 commits into from
Jul 17, 2024
Merged

Feature/compatibility python 3.11 #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb51022
improve python3.11 compatibility
joda9 Jul 16, 2024
55c54d3
improve python3.11 compatibility
joda9 Jul 16, 2024
6c1ed80
Update pypsa dependency to version 0.26.2
joda9 Jul 16, 2024
5b0df1b
improve python3.11 compatibility
joda9 Jul 16, 2024
a139795
Merge 'dev' into feature/compatibility-python-3.11
joda9 Jul 17, 2024
6a90cc4
removing unused conda installs
joda9 Jul 17, 2024
d8f1a68
removing doubled line
joda9 Jul 17, 2024
f9f5fd8
removing space
joda9 Jul 17, 2024
f2c7f84
removing unused conda installs
joda9 Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/tests-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ jobs:
- name-suffix: "basic"
os: ubuntu-latest
python-version: "3.10"
- name-suffix: "basic"
os: ubuntu-latest
python-version: 3.11
- name-suffix: "basic"
os: windows-latest
python-version: 3.9
Expand Down
2 changes: 1 addition & 1 deletion eDisGo_env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python >= 3.9, < 3.11
- python >= 3.9, <= 3.11
- pip
- pandas >= 1.4, < 2.2.0
- conda-forge::fiona
Expand Down
2 changes: 1 addition & 1 deletion eDisGo_env_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python >= 3.9, < 3.11
- python >= 3.9, <= 3.11
- pip
- pandas >= 1.4, < 2.2.0
- conda-forge::fiona
Expand Down
2 changes: 1 addition & 1 deletion edisgo/network/topology.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2123,7 +2123,7 @@ def _choose_random_substation_id():

"""
if comp_type == "generator":
random.seed(a=comp_data["generator_id"])
random.seed(a=int(comp_data["generator_id"]))
elif comp_type == "storage_unit":
random.seed(a=len(self.storage_units_df))
else:
Expand Down
2 changes: 1 addition & 1 deletion rtd_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pyproj >= 3.0.0
pypsa == 0.26.2
pyyaml
saio
scikit-learn
scikit-learn < 1.3.0
sphinx
sphinx_rtd_theme >=0.5.2
sphinx-autodoc-typehints
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def read(fname):
"pypsa == 0.26.2",
"pyyaml",
"saio",
"scikit-learn <= 1.1.1",
"scikit-learn < 1.3.0",
"shapely >= 1.7.0",
"sqlalchemy < 1.4.0",
"sshtunnel",
Expand Down
Loading