Revert PRs #21, #22 (#23)

This reverts commits c132883 869663a
MusicalNinjaDad · May 13, 2024 · ce45da7 · ce45da7
1 parent 5f9f284
commit ce45da7
Show file tree

Hide file tree

Showing 23 changed files with 15 additions and 131 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,4 @@
 {
-    // "image": "ghcr.io/musicalninjas/pyo3-devcontainer:latest", // untested with mac, expect issues due to x_64 rust installation
     "build": {
         "dockerfile": "Dockerfile",
         "args": {

diff --git a/.github/workflows/deploy-rust.yml b/.github/workflows/deploy-rust.yml
@@ -1,4 +1,3 @@
-name: Deploy Rust
 concurrency: ADO-Cargo
 
 on:

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install -e .[test]
+        python -m pip install -e .[dev]
         python -m pip install pytest-cov
     - name: Test with pytest
       run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,5 @@
 # FizzBuzz Changelog
 
-## Python 2.0.0
-
-- **Breaking:** Changed top level module name to `fizzbuzz`. Use `from fizzbuzz.fizzbuzzo3 import fizzbuzz`
-for rust implementation or `from fizzbuzz.fizzbuzzpy import fizzbuzz` for python implementation (slower).
-
 ## Rust 2.1.0 & Python 1.3.0
 
 - Process `Vec`s / `list`s with more than 300k elements in parallel

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 
 members = [
-    "fizzbuzz-rust",
+    "fizzbuzz",
     "fizzbuzzo3"
 ]
 

diff --git a/__pyversion__ b/__pyversion__
@@ -1 +1 @@
-2.0.0
+1.3.0
diff --git a/fizzbuzz-rust/Cargo.toml → fizzbuzz/Cargo.toml b/fizzbuzz-rust/Cargo.toml → fizzbuzz/Cargo.toml
diff --git a/fizzbuzz-rust/benches/bench_fizzbuzz.rs → fizzbuzz/benches/bench_fizzbuzz.rs b/fizzbuzz-rust/benches/bench_fizzbuzz.rs → fizzbuzz/benches/bench_fizzbuzz.rs
diff --git a/fizzbuzz-rust/benches/results.md → fizzbuzz/benches/results.md b/fizzbuzz-rust/benches/results.md → fizzbuzz/benches/results.md
diff --git a/fizzbuzz-rust/src/lib.rs → fizzbuzz/src/lib.rs b/fizzbuzz-rust/src/lib.rs → fizzbuzz/src/lib.rs
diff --git a/fizzbuzz-rust/tests/test_numbertypes.rs → fizzbuzz/tests/test_numbertypes.rs b/fizzbuzz-rust/tests/test_numbertypes.rs → fizzbuzz/tests/test_numbertypes.rs
diff --git a/fizzbuzz-rust/tests/test_vec.rs → fizzbuzz/tests/test_vec.rs b/fizzbuzz-rust/tests/test_vec.rs → fizzbuzz/tests/test_vec.rs
diff --git a/fizzbuzzo3/Cargo.toml b/fizzbuzzo3/Cargo.toml
@@ -10,6 +10,6 @@ crate-type = ["cdylib"]  # cdylib required for python import, rlib required for
 
 [dependencies]
 pyo3 = { git = "https://github.com/MusicalNinjaDad/pyo3.git", branch = "pyo3-testing" }
-fizzbuzz = { path = "../fizzbuzz-rust" }
+fizzbuzz = { path = "../fizzbuzz" }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/python/fizzbuzz/fizzbuzzpy/__init__.py → fizzbuzzpy/fizzbuzzpy/__init__.py b/python/fizzbuzz/fizzbuzzpy/__init__.py → fizzbuzzpy/fizzbuzzpy/__init__.py
diff --git a/python/fizzbuzz/fizzbuzzpy/fizzbuzzer.py → fizzbuzzpy/fizzbuzzpy/fizzbuzzer.py b/python/fizzbuzz/fizzbuzzpy/fizzbuzzer.py → fizzbuzzpy/fizzbuzzpy/fizzbuzzer.py
diff --git a/tests/perf_results.md → fizzbuzzpy/tests/perf_results.md b/tests/perf_results.md → fizzbuzzpy/tests/perf_results.md
diff --git a/tests/perftest.py → fizzbuzzpy/tests/perftest.py b/tests/perftest.py → fizzbuzzpy/tests/perftest.py
@@ -1,8 +1,8 @@
 # ruff: noqa
 import timeit
 
-from fizzbuzz.fizzbuzzo3 import fizzbuzz as fbo3
-from fizzbuzz.fizzbuzzpy import fizzbuzz as fbpy
+from fizzbuzzo3 import fizzbuzz as fbo3
+from fizzbuzzpy import fizzbuzz as fbpy
 
 
 REPEAT = 1

diff --git a/tests/test_fizzbuzzo3.py → fizzbuzzpy/tests/test_fizzbuzzo3.py b/tests/test_fizzbuzzo3.py → fizzbuzzpy/tests/test_fizzbuzzo3.py
@@ -1,5 +1,6 @@
 import pytest
-from fizzbuzz.fizzbuzzo3 import fizzbuzz
+
+from fizzbuzzo3 import fizzbuzz
 
 
 def test_lazy():

diff --git a/tests/test_fizzbuzzpy.py → fizzbuzzpy/tests/test_fizzbuzzpy.py b/tests/test_fizzbuzzpy.py → fizzbuzzpy/tests/test_fizzbuzzpy.py
@@ -1,4 +1,4 @@
-from fizzbuzz.fizzbuzzpy import fizzbuzz
+from fizzbuzzpy import fizzbuzz
 
 
 def test_lazy():

diff --git a/pyproject.toml b/pyproject.toml
@@ -30,14 +30,14 @@ Issues = "https://github.com/MusicalNinjaDad/fizzbuzz/issues"
 version = { file = "__pyversion__" }
 
 [tool.setuptools.packages.find]
-where = ["python"]
+where = ["fizzbuzzpy"]
 
 [[tool.setuptools-rust.ext-modules]]
 # Private Rust extension module to be nested into the Python package
-target = "fizzbuzz.fizzbuzzo3" # The last part of the name (e.g. "_lib") has to match lib.name in Cargo.toml,
+target = "fizzbuzzo3" # The last part of the name (e.g. "_lib") has to match lib.name in Cargo.toml,
 # but you can add a prefix to nest it inside of a Python package.
-path = "fizzbuzzo3/Cargo.toml"
-binding = "PyO3"
+path = "fizzbuzzo3/Cargo.toml"       # Default value, can be omitted
+binding = "PyO3"                     # Default value, can be omitted
 features = ["pyo3/extension-module"]
 
 [tool.cibuildwheel]
@@ -72,13 +72,12 @@ xfail_strict = true
 addopts = [
     "--doctest-modules",
     "--doctest-mdcodeblocks",
-    "--doctest-glob=*.md",
-    "--doctest-glob=*.pyi",
+    "--doctest-glob='*.md'",
 ]
 
 [tool.coverage.run]
 branch = true
-omit = ["test_*", "tests/*"]
+omit = ["test_*"]
 dynamic_context = "test_function"
 
 [tool.ruff]

diff --git a/python/fizzbuzz/__init__.py b/python/fizzbuzz/__init__.py
diff --git a/python/fizzbuzz/fizzbuzzo3/__init__.pyi b/python/fizzbuzz/fizzbuzzo3/__init__.pyi
diff --git a/python/fizzbuzz/fizzbuzzo3/repl_notes.txt b/python/fizzbuzz/fizzbuzzo3/repl_notes.txt