Skip to content

Commit

Permalink
Merge pull request #6 from RWTH-EBC/issue_pypi_release
Browse files Browse the repository at this point in the history
Issue pypi release
  • Loading branch information
FWuellhorst authored Sep 3, 2021
2 parents 67fe110 + 6036d68 commit 6b391a5
Showing 7 changed files with 44 additions and 43 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "modelica_calibration_templates"]
path = modelica_calibration_templates
url = https://github.com/RWTH-EBC/calibration_templates_modelica
[submodule "ebcpy"]
path = ebcpy
url = https://github.com/RWTH-EBC/ebcpy
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@ We tested this with `cmd` on a *Windows* 10 machine.
Until this is not publicly available, you have to install it (and [ebcpy](https://github.com/RWTH-EBC/ebcpy)) via:
```
git clone --recurse-submodules https://github.com/RWTH-EBC/AixCaliBuHA
pip install -e AixCaliBuHA/ebcpy
pip install -e AixCaliBuHA
```

1 change: 0 additions & 1 deletion ebcpy
Submodule ebcpy deleted from c724cb
3 changes: 1 addition & 2 deletions examples/README.md
Original file line number Diff line number Diff line change
@@ -12,8 +12,7 @@ Before being able to run these examples, be sure to:
3. Clone the library using `git clone --recurse-submodules https://github.com/RWTH-EBC/AixCaliBuHA`
4. Clone the AixLib in order to use the models: `git clone https://github.com/RWTH-EBC/AixLib`
Also check if you're on development using `cd AixLib && git status && cd ..`
5. Install ebcpy using `pip install -e AixCaliBuHA/ebcpy`
6. Install the library using `pip install -e AixCaliBuHA`
5. Install the library using `pip install -e AixCaliBuHA`

# What can I learn in the examples?

2 changes: 1 addition & 1 deletion modelica_calibration_templates
11 changes: 5 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
numpy
scipy
pandas
matplotlib
numpy>=1.19.5
matplotlib>=3.3.4
pandas>=1.1.5
SALib==1.3.12
ebcpy @ git+https://gitlab-ci-token:${CI_JOB_TOKEN}@git.rwth-aachen.de/EBC/EBC_all/github_ci/ebcpy@development
toml
ebcpy>=0.2.1
toml>=0.10.2
66 changes: 37 additions & 29 deletions setup.py
Original file line number Diff line number Diff line change
@@ -2,33 +2,41 @@

import setuptools

INSTALL_REQUIRES = ['numpy',
'scipy',
'pandas',
'matplotlib',
'SALib==1.3.12',
'ebcpy>=0.2.0',
'toml'
]
SETUP_REQUIRES = INSTALL_REQUIRES.copy() # Add all open-source packages to setup-requires
INSTALL_REQUIRES = [
'numpy>=1.19.5',
'matplotlib>=3.3.4',
'pandas>=1.1.5',
'SALib==1.3.12',
'ebcpy>=0.2.1',
'toml>=0.10.2'
]

setuptools.setup(name='aixcalibuha',
version='0.2.0',
description='Framework used for sensitivity-analysis'
'and calibration for models of HVAC '
'components.',
url='not set yet',
author='RWTH Aachen University, E.ON Energy Research Center, Institute\
of Energy Efficient Buildings and Indoor Climate',
# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
classifiers=['Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7', ],
packages=setuptools.find_packages(exclude=['img']),
setup_requires=SETUP_REQUIRES,
install_requires=INSTALL_REQUIRES,
entry_points={
'console_scripts': ['modelica_calibration=bin.run_modelica_calibration:main',
'guided_setup=bin.guided_setup:main'],
}
)
setuptools.setup(
name='aixcalibuha',
version='0.2.0',
description='Framework used for sensitivity-analysis'
'and calibration for models of HVAC '
'components.',
url='https://github.com/RWTH-EBC/AixCaliBuHA',
download_url='https://github.com/RWTH-EBC/AixCaliBuHA/archive/refs/tags/0.2.0.tar.gz',
license='MIT',
author='RWTH Aachen University, E.ON Energy Research Center, Institute '
'of Energy Efficient Buildings and Indoor Climate',
author_email='fabian.wuellhorst@eonerc.rwth-aachen.de',
# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
classifiers=[
'Development Status :: 3 - Alpha',
'License :: OSI Approved :: MIT License',
'Topic :: Scientific/Engineering',
'Intended Audience :: Science/Research',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8'
],
keywords=[
'calibration', 'building', 'energy',
'black-box optimization', 'sensitivity_analysis'
],
packages=setuptools.find_packages(exclude=['img']),
install_requires=INSTALL_REQUIRES
)

0 comments on commit 6b391a5

Please sign in to comment.