diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 1863358..8c1d375 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -58,4 +58,4 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ - password: ${{ secrets.PYPI_PASSWORD }} + password: ${{ secrets.PYPI_PASSWORD }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 68d47d7..598d428 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,8 @@ RUN git clone https://github.com/CURENT/dime.git && \ rm -rf dime \ && rm -rf /tmp/dime -RUN git clone --single-branch --branch unittesting https://github.com/CURENT/agvis.git && \ + +RUN git clone --single-branch --branch master https://github.com/CURENT/agvis.git && \ cd agvis && \ python3 -m pip install -e . && \ cd .. diff --git a/setup.py b/setup.py index 0089a07..6c299dc 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ def get_extra_requires(filename, add_all=True): description="Web application of geographical visualizer for energy systems", long_description=readme, long_description_content_type='text/markdown', - author="Nicholas West, Nicholas Parsly, Jinning Wang", + author="Zack Malkmus, Nicholas West, Nicholas Parsly, Jinning Wang", author_email='jinninggm@gmail.com', url='https://github.com/CURENT/agvis', packages=find_packages(exclude=[]), @@ -93,6 +93,7 @@ def get_extra_requires(filename, add_all=True): # 'path/to/data_file', ] }, + use_scm_version=True, install_requires=parse_requires('requirements.txt'), extras_require=extras_require, license="GNU Public License v3",