-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into to/#766-use-default-time-pattern
- Loading branch information
Showing
55 changed files
with
3,475 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
commonmark==0.9.1 | ||
recommonmark==0.7.1 | ||
Sphinx==4.2.0 | ||
sphinx-rtd-theme==1.0.0 | ||
Sphinx==5.3.0 | ||
sphinx-rtd-theme==1.2.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,7 +40,7 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha | |
url = 'https:github.com/ie3-institute/PowerSystemDatamodel' | ||
organization { | ||
name = 'Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)/TU Dortmund University' | ||
url = 'http:www.ie3.tu-dortmund.de/' | ||
url = 'https:www.ie3.tu-dortmund.de/' | ||
} | ||
issueManagement { | ||
system = 'GitHub' | ||
|
@@ -51,31 +51,18 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha | |
name = 'BSD 3-Clause License' | ||
url = 'https:github.com/ie3-institute/PowerSystemDataModel/blob/master/LICENSE' | ||
} | ||
scm { | ||
connection = 'scm:git:git:github.com/ie3-institute/PowerSystemDataModel.git' | ||
developerConnection = 'scm:git:ssh:github.com:ie3-institute/PowerSystemDataModel.git' | ||
url = 'https:github.com/ie3-institute/PowerSystemDataModel' | ||
} | ||
developers { | ||
[ | ||
developer { | ||
id = 'johanneshiry' | ||
name = 'Johannes Hiry' | ||
email = '[email protected]' | ||
}, | ||
developer { | ||
id = 'ckittl' | ||
name = 'Chris Kittl' | ||
email = '[email protected]' | ||
}, | ||
developer { | ||
id = 'sensarmad' | ||
name = 'Debopama Sen Sarma' | ||
email = '[email protected]' | ||
} | ||
] | ||
} | ||
developers { | ||
developer { | ||
organization = "Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)/TU Dortmund University" | ||
organizationUrl = "https:ie3.etit.tu-dortmund.de" | ||
} | ||
} | ||
scm { | ||
connection = 'scm:git:git:github.com/ie3-institute/PowerSystemDataModel.git' | ||
developerConnection = 'scm:git:ssh:github.com:ie3-institute/PowerSystemDataModel.git' | ||
url = 'https:github.com/ie3-institute/PowerSystemDataModel' | ||
} | ||
} | ||
|
||
removeTestDependenciesFromPom(pom) | ||
|
@@ -91,8 +78,8 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha | |
} | ||
repositories { | ||
maven { | ||
def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" | ||
def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" | ||
def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" | ||
def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/" | ||
url = versionString.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl | ||
credentials { | ||
username project.getProperty('user') | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.