Merge branch 'bot_token' into 'master'

Bot token

See merge request !20

.gitlab-ci.yml

-image: frza/gitlab-ci-debian:gcc73-openmpi311
+image: quay.io/pypa/manylinux_2_28_x86_64:latest
 
 test37:
+  tags:
+    - docker
+    - linux
   script:
-    - source activate py37
+    - python3.11 -m venv build_env
+    - source build_env/bin/activate
+    - python -m pip install --upgrade pip
+    - pip install pytest
     - pip install -e .
-    - nosetests
+    - pytest 
 

ellipsyswrapper/testsuite.py

@@ -130,6 +130,7 @@ class CaseRunner(object):
                 subprocess.check_output('git checkout -b %s' % self.make_test_data_branch, shell=True)
             else:
                 print('branch %s exists, switching to it' % self.make_test_data_branch, flush=True)
+                subprocess.check_output('git fetch origin', shell=True)
                 subprocess.check_output('git checkout %s' % (self.make_test_data_branch), shell=True)
             if os.environ.get('CI_JOB_ID', None) is not None:
                 subprocess.check_output('git config user.email "%s"' % 'ellipsys_ci_bot@dtu.dk', shell=True)
@@ -161,6 +162,9 @@ class CaseRunner(object):
                         url2 = '%s//ellipsys_ci_bot:%s@%s' % (parts[0], bot_token, parts[1])
                         if "ellipsys_ci_bot" not in url: 
                             os.system('git remote set-url origin %s' % url2) 
+                        command = 'git pull origin %s' % self.make_test_data_branch
+                        print('checking remote branch %s for updates' % self.make_test_data_branch, flush=True)
+                        status = subprocess.check_output(command, shell=True)
                         command = 'git push origin %s' % self.make_test_data_branch
                         print('pushing code with ellipsys_ci_bot user', flush=True)
                         status = subprocess.check_output(command, shell=True)

pyproject.toml

+[build-system]
+requires = [
+    "setuptools>=61",
+    "setuptools-scm>=8.0"]
+build-backend = "setuptools.build_meta"
+
+
+[project]
+name = "ellipsyswrapper"
+authors = [
+  {name="Department of Wind and Energy Systems, DTU"},
+]
+maintainers = [
+  { name="Frederik Zahle", email="frza@dtu.dk"},
+  { name="Paul van der Laan", email="plaa@dtu.dk"},
+]
+description = "Python tools used for regression testing of EllipSys"
+readme = "README.md"
+requires-python = ">=3.7"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: POSIX :: Linux"
+]
+dependencies = ["pytest", "numpy"]
+dynamic = ["version"]
+
+
+[tool.setuptools]
+packages = [
+            "ellipsyswrapper",
+]
+
+[tool.setuptools.package-data]
+ellipsys3d = [
+              "test/outputs_data3d",
+]
+
+[tool.setuptools_scm]
+version_file = "ellipsyswrapper/version.py"
+

setup.py

-from setuptools import setup, find_packages
-
-kwargs = {'author': '',
- 'author_email': '',
- 'description': '',
- 'download_url': '',
- 'include_package_data': True,
- 'install_requires': [],
- 'keywords': [],
- 'license': '',
- 'maintainer': '',
- 'maintainer_email': '',
- 'name': 'ellipsyswrapper',
- 'packages': ['ellipsyswrapper'],
- 'version': '0.1',
- 'zip_safe': False}
-
-
-setup(**kwargs)