From b7193a9d0686b60e4b7dd2e908f4fb82a35f0d3b Mon Sep 17 00:00:00 2001
From: virgesmith <andrew@friarswood.net>
Date: Sat, 21 Nov 2020 10:24:47 +0000
Subject: [PATCH] fix compiler flags for conda-forge; bump version

---
 .gitignore        |  9 ---------
 VERSION           |  2 +-
 docs/developer.md | 10 +++++-----
 setup.py          |  3 +--
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b32a3fd..b2b1c07d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,13 +8,6 @@ src/**/*.so
 
 .vscode*/
 build/
-node_modules/
-
-# binaries
-neworder
-neworder_mpi
-testharness
-testharness_mpi
 
 # data
 dm*.csv
@@ -38,5 +31,3 @@ dist/*
 
 *_old*
 
-# eval
-docs/_build/
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 17e51c38..d917d3e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.1
+0.1.2
diff --git a/docs/developer.md b/docs/developer.md
index 16a28aba..e7a42ed6 100644
--- a/docs/developer.md
+++ b/docs/developer.md
@@ -146,8 +146,8 @@ Merge branches/PRs into master and fix any CI issues (builds, tests, major code
 5. Tag: `git tag -a $(cat VERSION) -m"release v$(cat VERSION)"`
 6. Push, including tag: `git push --atomic origin master $(cat VERSION)`
 7. Check tagged CI builds and docker image are ok
-8. Create release on github, using release notes from above
-9. Check zenodo for new DOI
-10. Package and upload to PyPI: `scripts/package.sh`
-11. Update conda feedstock, see instructions [here](https://github.com/conda-forge/neworder-feedstock)
-12. Install pypi/conda-forge/docker releases in a fresh environment and ensure all is well
+8. Check zenodo for new DOI
+9. Package and upload to PyPI: `scripts/package.sh`
+10. Update conda feedstock, see instructions [here](https://github.com/conda-forge/neworder-feedstock)
+11. Install pypi/conda-forge/docker releases in a fresh environment and ensure all is well. If not, fix and go back to 2.
+12. Create release on github, using the tag and the release notes from above
diff --git a/setup.py b/setup.py
index c3b4bb8a..d474b7e0 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,6 @@ def cxxflags(platform):
   if platform == "unix":
     return [
       "-Wall",
-      "-Werror",
       "-pedantic",
       "-pthread",
       "-Wsign-compare",
@@ -109,7 +108,7 @@ def build_extensions(self):
 
     for ext in self.extensions:
       print(self.distribution.get_version())
-      ext.define_macros = defines(ct) #[('NEWORDER_VERSION', self.distribution.get_version())]
+      ext.define_macros = defines(ct)
       ext.extra_compile_args = cxxflags(ct)
       ext.extra_link_args = ldflags(ct)