Building only in Release Branch

alhaol · Sep 3, 2021 · 2d4df4f · 2d4df4f
1 parent 7ed0831
commit 2d4df4f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 80 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -26,55 +26,3 @@ jobs:
       - name: Run Tests
         run: pytest
 
-
-  build:
-     needs: testing
-     runs-on: ${{ matrix.os }}
-     strategy:
-       matrix:
-         os: [ubuntu-latest, windows-latest, macos-latest]
-         python-version: ['3.7', '3.8', '3.9']
-         exclude:
-           - os: ubuntu-latest
-             python-version: '3.7'
-           - os: ubuntu-latest
-             python-version: '3.8'
-     steps:
-     - uses: actions/checkout@v2
-     - name: Set up Python
-       uses: actions/setup-python@v2
-       with:
-         python-version: ${{ matrix.python-version }}
-     - name: Install dependencies
-       run: |
-         python -m pip install --upgrade pip
-         pip install setuptools wheel numpy
-     - uses: knicknic/os-specific-run@v1
-       with:
-         linux: python setup.py sdist
-         macos: python setup.py bdist_wheel
-         windows: python setup.py bdist_wheel
-     - uses: actions/upload-artifact@v2
-       with:
-         name: dist
-         path: dist
-
-  upload:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-     - uses: actions/checkout@v2
-     - uses: actions/download-artifact@v2
-       with:
-         name: dist
-         path: dist
-     - name: Upload
-       uses: trendyminds/github-actions-rsync@master
-       with:
-         RSYNC_OPTIONS: -avzr --delete --exclude '*.ipynb'
-         RSYNC_TARGET: /home/blankjul/releases/${BRANCH_NAME}
-         RSYNC_SOURCE: /dist/*
-       env:
-         SSH_PRIVATE_KEY: ${{secrets.SSH_PRIVATE_KEY}}
-         SSH_USERNAME: ${{secrets.SSH_USERNAME}}
-         SSH_HOSTNAME: ${{secrets.SSH_HOSTNAME}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,6 @@ on:
       - release
 
 
-
 jobs:
 
   testing:
@@ -76,34 +75,33 @@ jobs:
        uses: trendyminds/github-actions-rsync@master
        with:
          RSYNC_OPTIONS: -avzr --delete --exclude '*.ipynb'
-         RSYNC_TARGET: /home/blankjul/releases/${BRANCH_NAME}
+         RSYNC_TARGET: /home/blankjul/releases/${BRANCH_NAME}/
          RSYNC_SOURCE: /dist/*
        env:
          SSH_PRIVATE_KEY: ${{secrets.SSH_PRIVATE_KEY}}
          SSH_USERNAME: ${{secrets.SSH_USERNAME}}
          SSH_HOSTNAME: ${{secrets.SSH_HOSTNAME}}
 
+  deploy:
+     needs: build
+     runs-on: ubuntu-latest
 
-  # deploy:
-  #   needs: build
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - uses: actions/download-artifact@v2
-  #     with:
-  #       name: dist
-  #       path: dist
-  #   - name: Set up Python
-  #     uses: actions/setup-python@v2
-  #     with:
-  #       python-version: '3.8'
-  #   - name: Publish
-  #     env:
-  #       TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-  #       TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-  #     run: |
-  #       python -m pip install --upgrade pip
-  #       pip install twine
-  #       twine upload --skip-existing --repository testpypi dist/*
+     steps:
+     - uses: actions/checkout@v2
+     - uses: actions/download-artifact@v2
+       with:
+         name: dist
+         path: dist
+     - name: Set up Python
+       uses: actions/setup-python@v2
+       with:
+         python-version: '3.9'
+     - name: Publish
+       env:
+         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+       run: |
+         python -m pip install --upgrade pip
+         pip install twine
+         twine upload --skip-existing --repository testpypi dist/*
 
diff --git a/pymoo/algorithms/moo/nsga3.py b/pymoo/algorithms/moo/nsga3.py
@@ -275,6 +275,7 @@ def __init__(self, n_dim) -> None:
         self.extreme_points = None
 
     def update(self, F, nds=None):
+
         # find or usually update the new ideal point - from feasible solutions
         self.ideal_point = np.min(np.vstack((self.ideal_point, F)), axis=0)
         self.worst_point = np.max(np.vstack((self.worst_point, F)), axis=0)

diff --git a/pymoo/algorithms/soo/nonconvex/de.py b/pymoo/algorithms/soo/nonconvex/de.py
@@ -19,6 +19,7 @@
 
 
 class DE(GeneticAlgorithm):
+
     def __init__(self,
                  pop_size=100,
                  n_offsprings=None,

diff --git a/pymoo/model/algorithm.py b/pymoo/model/algorithm.py
@@ -361,9 +361,6 @@ def tell(self, *args, **kwargs):
     # PROTECTED
     # =========================================================================================================
 
-    def _initialize_advance(self, infills=None, **kwargs):
-        pass
-
     def _set_optimum(self):
         self.opt = filter_optimum(self.pop, least_infeasible=True)
 
@@ -402,6 +399,9 @@ def _setup(self, problem, **kwargs):
     def _initialize_infill(self):
         pass
 
+    def _initialize_advance(self, infills=None, **kwargs):
+        pass
+
     def _infill(self):
         pass
 

diff --git a/pymoo/model/evaluator.py b/pymoo/model/evaluator.py
@@ -2,7 +2,7 @@
 
 from pymoo.model.individual import Individual
 from pymoo.model.population import Population
-from pymoo.model.problem import Problem, default_return_values
+from pymoo.model.problem import Problem
 from pymoo.util.misc import at_least_2d_array